From deaf0f0f4fc66ced00721a214a888d8c090be05a Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 4 Jan 2024 05:13:25 -0800 Subject: [PATCH 1/3] Update Ruby dependencies --- Gemfile.lock | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 231615eb..350f5dcb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -280,6 +280,7 @@ GEM method_source (1.0.0) mini_mime (1.1.5) minitest (5.20.0) + mutex_m (0.2.0) net-imap (0.4.9) date net-protocol @@ -293,9 +294,9 @@ GEM net-protocol net-ssh (7.2.1) nio4r (2.7.0) - nokogiri (1.15.5-x86_64-darwin) + nokogiri (1.16.0-x86_64-darwin) racc (~> 1.4) - nokogiri (1.15.5-x86_64-linux) + nokogiri (1.16.0-x86_64-linux) racc (~> 1.4) okcomputer (1.18.5) orm_adapter (0.5.0) @@ -401,7 +402,7 @@ GEM unicode-display_width (>= 2.4.0, < 3.0) rubocop-ast (1.30.0) parser (>= 3.2.1.0) - rubocop-capybara (2.19.0) + rubocop-capybara (2.20.0) rubocop (~> 1.41) rubocop-factory_bot (2.24.0) rubocop (~> 1.33) @@ -444,9 +445,10 @@ GEM actionpack (>= 5.2) activesupport (>= 5.2) sprockets (>= 3.0.0) - sqlite3 (1.6.9-x86_64-darwin) - sqlite3 (1.6.9-x86_64-linux) - sshkit (1.21.6) + sqlite3 (1.7.0-x86_64-darwin) + sqlite3 (1.7.0-x86_64-linux) + sshkit (1.21.7) + mutex_m net-scp (>= 1.1.2) net-ssh (>= 2.8.0) stringio (3.1.0) From 28e8ae9ca1c53a967782c88fb8c3e9bfc1df4e2e Mon Sep 17 00:00:00 2001 From: Jenkins Date: Thu, 4 Jan 2024 05:13:26 -0800 Subject: [PATCH 2/3] Update Yarn dependencies --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index b202bc1d..42f94f06 100644 --- a/yarn.lock +++ b/yarn.lock @@ -38,9 +38,9 @@ binary-extensions@^2.0.0: integrity sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA== bootstrap-icons@^1.1.0: - version "1.11.2" - resolved "https://registry.yarnpkg.com/bootstrap-icons/-/bootstrap-icons-1.11.2.tgz#e1c75daec154e25958db04c4eb3cbda6041e7118" - integrity sha512-TgdiPv+IM9tgDb+dsxrnGIyocsk85d2M7T0qIgkvPedZeoZfyeG/j+yiAE4uHCEayKef2RP05ahQ0/e9Sv75Wg== + version "1.11.3" + resolved "https://registry.yarnpkg.com/bootstrap-icons/-/bootstrap-icons-1.11.3.tgz#03f9cb754ec005c52f9ee616e2e84a82cab3084b" + integrity sha512-+3lpHrCw/it2/7lBL15VR0HEumaBss0+f/Lb6ZvHISn1mlK83jjFpooTLsMWbIjJMDjDjOExMsTxnXSIT4k4ww== bootstrap@^5.0.1: version "5.3.2" @@ -150,9 +150,9 @@ readdirp@~3.6.0: picomatch "^2.2.1" sass@^1.57.1: - version "1.69.5" - resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.5.tgz#23e18d1c757a35f2e52cc81871060b9ad653dfde" - integrity sha512-qg2+UCJibLr2LCVOt3OlPhr/dqVHWOa9XtZf2OjbLs/T4VPSJ00udtgJxH3neXZm+QqX8B+3cU7RaLqp1iVfcQ== + version "1.69.7" + resolved "https://registry.yarnpkg.com/sass/-/sass-1.69.7.tgz#6e7e1c8f51e8162faec3e9619babc7da780af3b7" + integrity sha512-rzj2soDeZ8wtE2egyLXgOOHQvaC2iosZrkF6v3EUG+tBwEvhqUCzm0VP3k9gHF9LXbSrRhT5SksoI56Iw8NPnQ== dependencies: chokidar ">=3.0.0 <4.0.0" immutable "^4.0.0" From e91d3779f724d6d8225d401ad89fc6019a69576c Mon Sep 17 00:00:00 2001 From: Justin Coyne Date: Thu, 4 Jan 2024 08:35:36 -0600 Subject: [PATCH 3/3] Fix capybara rubocop --- spec/features/nav_dropdown_spec.rb | 2 +- spec/features/providers_spec.rb | 12 ++++++------ spec/features/unprivileged_user_spec.rb | 6 +++--- spec/views/dashboard/summary.html.erb_spec.rb | 2 +- .../layout_manage_organization.html.erb_spec.rb | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/spec/features/nav_dropdown_spec.rb b/spec/features/nav_dropdown_spec.rb index 2f4f7a85..ea66651d 100644 --- a/spec/features/nav_dropdown_spec.rb +++ b/spec/features/nav_dropdown_spec.rb @@ -63,7 +63,7 @@ end it 'Does not show affiliated organization manage link' do - expect(page).not_to have_link 'Manage Best University' + expect(page).to have_no_link 'Manage Best University' end it 'Shows affiliated organization home link' do diff --git a/spec/features/providers_spec.rb b/spec/features/providers_spec.rb index b124546f..88a5170a 100644 --- a/spec/features/providers_spec.rb +++ b/spec/features/providers_spec.rb @@ -22,9 +22,9 @@ visit organizations_url # don't confuse "Edit" with "Edit Profile" in header nav - expect(page).not_to have_link('Edit', exact: true) - expect(page).not_to have_link 'Delete' - expect(page).not_to have_link 'New Organization' + expect(page).to have_no_link('Edit', exact: true) + expect(page).to have_no_link 'Delete' + expect(page).to have_no_link 'New Organization' end end @@ -51,11 +51,11 @@ it 'lists some limited information about the org' do visit organization_url(organization) - expect(page).not_to have_selector 'h2', text: 'Access Tokens' - expect(page).not_to have_selector 'h2', text: 'Users' + expect(page).to have_no_selector 'h2', text: 'Access Tokens' + expect(page).to have_no_selector 'h2', text: 'Users' expect(page).to have_content '1297245.marc' - expect(page).not_to have_link 'Download' + expect(page).to have_no_link 'Download' end end diff --git a/spec/features/unprivileged_user_spec.rb b/spec/features/unprivileged_user_spec.rb index ed6d73de..7727ee90 100644 --- a/spec/features/unprivileged_user_spec.rb +++ b/spec/features/unprivileged_user_spec.rb @@ -21,10 +21,10 @@ it 'lists some limited information about the org' do visit organization_url(organization) - expect(page).not_to have_selector 'h2', text: 'Access Tokens' - expect(page).not_to have_selector 'h2', text: 'Users' + expect(page).to have_no_selector 'h2', text: 'Access Tokens' + expect(page).to have_no_selector 'h2', text: 'Users' expect(page).to have_content '1297245.marc' - expect(page).not_to have_link 'Download' + expect(page).to have_no_link 'Download' end end diff --git a/spec/views/dashboard/summary.html.erb_spec.rb b/spec/views/dashboard/summary.html.erb_spec.rb index 2ef6b974..c57f3a2e 100644 --- a/spec/views/dashboard/summary.html.erb_spec.rb +++ b/spec/views/dashboard/summary.html.erb_spec.rb @@ -56,6 +56,6 @@ it 'does not render the activity summary tabs on page 2 of uploads' do assign(:uploads, Kaminari.paginate_array(uploads1).page(2)) - expect(rendered).not_to have_css('ul#summary-tabs') + expect(rendered).to have_no_css('ul#summary-tabs') end end diff --git a/spec/views/shared/layout_manage_organization.html.erb_spec.rb b/spec/views/shared/layout_manage_organization.html.erb_spec.rb index e3eded57..79dec0d8 100644 --- a/spec/views/shared/layout_manage_organization.html.erb_spec.rb +++ b/spec/views/shared/layout_manage_organization.html.erb_spec.rb @@ -27,7 +27,7 @@ it 'does not link to Provider home for consumer orgs' do render - expect(view.content_for(:org_header)).not_to have_link 'Provider home' + expect(view.content_for(:org_header)).to have_no_link 'Provider home' end end end