Skip to content

Commit

Permalink
🧹 Hyrax 5 get additional specs passing (#2062)
Browse files Browse the repository at this point in the history
* 🧹 Get chrome.hyku.test working

* 🧹 Get SitesControllerSpecs working

 File fixtures were broken.
 Ref scientist-softserv/hykuup_knapsack#56

* 🧹 Remove google analytics from config reload

This is a piece of a fix for analytics that came in via
scientist-softserv/palni-palci#946

Additional backporting of analytics work is still needed, but this
fixes numerous specs so it is being pulled in earlier.

* 🧹 Update ruby version for circleci

* 🧹 Update rails version for circleci
  • Loading branch information
laritakr authored Dec 15, 2023
1 parent 1bfe119 commit 76010a4
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 22 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ jobs:
parameters:
ruby_version:
type: string
default: 2.7.8
default: 3.2.2
bundler_version:
type: string
default: 2.4.8
rails_version:
type: string
default: '5.1.6'
default: '6.1.7.6'
solr_config_path:
type: string
fcrepo_version:
Expand Down Expand Up @@ -95,6 +95,6 @@ workflows:
ci:
jobs:
- bundle:
ruby_version: "2.7.8"
name: "ruby2-7-8"
ruby_version: "3.2.2"
name: "ruby3-2-2"
solr_config_path: 'solr/conf'
2 changes: 0 additions & 2 deletions app/models/concerns/account_settings.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,8 +161,6 @@ def set_smtp_settings
def reload_library_config
Hyrax.config do |config|
config.contact_email = contact_email
config.analytics = google_analytics_id.present?
config.google_analytics_id = google_analytics_id if google_analytics_id.present?
config.geonames_username = geonames_username
config.uploader[:maxFileSize] = file_size_limit
end
Expand Down
5 changes: 2 additions & 3 deletions spec/rails_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@
ENV['WEB_HOST'] ||= `hostname -s`.strip

if ENV['CHROME_HOSTNAME'].present?
options = Selenium::WebDriver::Options.chrome(args: ["headless",
"disable-gpu",
options = Selenium::WebDriver::Options.chrome(args: ["disable-gpu",
"no-sandbox",
"whitelisted-ips",
"window-size=1400,1400"])
Expand Down Expand Up @@ -105,6 +104,7 @@
RSpec.configure do |config|
# Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
config.fixture_path = "#{::Rails.root}/spec/fixtures"
config.file_fixture_path = "#{::Rails.root}/spec/fixtures"

# If you're not using ActiveRecord, or you'd prefer not to run each of your
# examples within a transaction, remove the following line or assign false
Expand Down Expand Up @@ -132,7 +132,6 @@
# config.filter_gems_from_backtrace("gem name")

config.include Devise::Test::ControllerHelpers, type: :controller
config.include Fixtures::FixtureFileUpload
config.include FactoryBot::Syntax::Methods
config.include ApplicationHelper, type: :view
config.include Warden::Test::Helpers, type: :feature
Expand Down
13 changes: 0 additions & 13 deletions spec/support/fixtures.rb

This file was deleted.

0 comments on commit 76010a4

Please sign in to comment.