From d0e2d0fe7bdd603348ac2f55e0975260fa739698 Mon Sep 17 00:00:00 2001 From: Mike Korcynski Date: Fri, 25 Aug 2023 09:59:01 -0400 Subject: [PATCH 1/2] prepping project for new work, doing cleanup --- .gitignore | 1 + config/tufts_export.yml.sample | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 config/tufts_export.yml.sample diff --git a/.gitignore b/.gitignore index 8f1c96f..4f48b30 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ config/secrets.yml config/solr.yml config/sidekiq.yml config/tufts.yml +config/tufts_export.yml public/assets/ public/branding/ fits.log diff --git a/config/tufts_export.yml.sample b/config/tufts_export.yml.sample new file mode 100644 index 0000000..a15fbad --- /dev/null +++ b/config/tufts_export.yml.sample @@ -0,0 +1,6 @@ +development: + export_path: '' +test: + export_path: '' +production: + export_path: '/usr/local/hydra/mira-data/exports' From 19da17ee057189f802e6bc61f94114a36ff6afdc Mon Sep 17 00:00:00 2001 From: Mike Korcynski Date: Tue, 29 Aug 2023 08:41:39 -0400 Subject: [PATCH 2/2] chrome/chromedriver fixes --- .github/workflows/ci.yml | 7 ++++++- spec/rails_helper.rb | 5 +++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ee8f468..da5c4ec 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -43,6 +43,11 @@ jobs: experimental: true steps: + - name: Pin chrome + uses: abhi1693/setup-browser@v0.3.4 + with: + browser: chrome + version: 1036826 - name: Install OS packages run: | sudo apt-get update @@ -112,4 +117,4 @@ jobs: - name: Coveralls uses: coverallsapp/github-action@master with: - github-token: ${{ secrets.GITHUB_TOKEN }} \ No newline at end of file + github-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/spec/rails_helper.rb b/spec/rails_helper.rb index 7716f4d..7154051 100644 --- a/spec/rails_helper.rb +++ b/spec/rails_helper.rb @@ -1,4 +1,5 @@ require 'simplecov' +require 'webdrivers' SimpleCov.start 'rails' do if ENV['CI'] @@ -29,11 +30,15 @@ Capybara.server = :webrick +Webdrivers::Chromedriver.required_version = '106.0.5249.21' +custom_chrome_path = '/opt/hostedtoolcache/chromium/1036826/x64/chrome' + # Adding chromedriver for js testing. Capybara.register_driver :headless_chrome do |app| browser_options = ::Selenium::WebDriver::Chrome::Options.new browser_options.headless! browser_options.args << '--window-size=1920,1080' + browser_options.binary = custom_chrome_path Capybara::Selenium::Driver.new(app, browser: :chrome, options: browser_options) end