From 6e2c479ac31242ba3521eb35e1132c0a1427028b Mon Sep 17 00:00:00 2001 From: Kirk Wang Date: Thu, 15 Aug 2024 16:28:56 -0700 Subject: [PATCH 1/2] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20submodule?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This update will bring in a fix for WillowSword's service document. Ref: - https://github.com/scientist-softserv/willow_sword/commit/8fe4f5399fcbc783cab272ac6225fbd90702bd0b --- hyrax-webapp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hyrax-webapp b/hyrax-webapp index 64effd4..8ae0acb 160000 --- a/hyrax-webapp +++ b/hyrax-webapp @@ -1 +1 @@ -Subproject commit 64effd42ed6ca275bc2b67f61b0255d09e732a16 +Subproject commit 8ae0acb2245f06fdda63422c3523ac4c344ec7af From a30b4195c133452c6abf9d4b672817c50c3fd005 Mon Sep 17 00:00:00 2001 From: Kirk Wang Date: Thu, 15 Aug 2024 23:01:04 -0700 Subject: [PATCH 2/2] =?UTF-8?q?=E2=9C=85=20fix=20rubocop=20and=20spec?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/application_controller_decorator.rb | 2 +- spec/hyku_knapsack/application_spec.rb | 4 ++-- spec/models/concerns/account_settings_spec.rb | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/controllers/application_controller_decorator.rb b/app/controllers/application_controller_decorator.rb index 1312637..00271b0 100644 --- a/app/controllers/application_controller_decorator.rb +++ b/app/controllers/application_controller_decorator.rb @@ -82,7 +82,7 @@ def global_request_logging def set_sentry_context Sentry.set_user(id: session[:current_user_id]) # Set user context - Sentry.set_extras(params: params.to_unsafe_h, url: request.url) # Set extra context + Sentry.set_extras(params: params.to_unsafe_h, url: request.url) # Set extra context end end diff --git a/spec/hyku_knapsack/application_spec.rb b/spec/hyku_knapsack/application_spec.rb index b68808e..831c366 100644 --- a/spec/hyku_knapsack/application_spec.rb +++ b/spec/hyku_knapsack/application_spec.rb @@ -7,8 +7,8 @@ let(:hyku_knapsack_root) { HykuKnapsack::Engine.root } describe '.theme_view_path_roots' do - it 'includes the Rails root and the Hyku Knapsack root' do - expect(described_class.theme_view_path_roots).to eq([rails_root.to_s, hyku_knapsack_root.to_s]) + it 'includes the Hyku Knapsack root and the Rails root' do + expect(described_class.theme_view_path_roots).to eq([hyku_knapsack_root.to_s, rails_root.to_s]) end end diff --git a/spec/models/concerns/account_settings_spec.rb b/spec/models/concerns/account_settings_spec.rb index dcaafa8..48a7c69 100644 --- a/spec/models/concerns/account_settings_spec.rb +++ b/spec/models/concerns/account_settings_spec.rb @@ -36,6 +36,7 @@ end context 'when is_superadmin is false' do + # rubocop:disable RSpec/ExampleLength it 'returns all settings except private, disabled, and superadmin settings' do expect(Account.superadmin_settings.size).to eq 7 expect(account.public_settings(is_superadmin: false).keys.sort).to eq %i[allow_downloads @@ -56,6 +57,7 @@ ssl_configured] expect(account.public_settings(is_superadmin: false).size).to eq 16 end + # rubocop:enable RSpec/ExampleLength end end end