Merge pull request #1055 from pod4lib/update-dependencies

Update dependencies

.rubocop.yml

@@ -4,6 +4,9 @@ require:
   - rubocop-rails
   - rubocop-rspec
   - rubocop-performance
+  - rubocop-capybara
+  - rubocop-factory_bot
+  - rubocop-rspec_rails
 
 AllCops:
   TargetRubyVersion: 3.0
@@ -325,25 +328,25 @@ RSpec/SubjectDeclaration: # new in 2.5
   Enabled: true
 RSpec/VerifiedDoubleReference: # new in 2.10.0
   Enabled: true
-RSpec/Capybara/NegationMatcher: # new in 2.14
+Capybara/NegationMatcher: # new in 2.14
   Enabled: true
-RSpec/Capybara/SpecificActions: # new in 2.14
+Capybara/SpecificActions: # new in 2.14
   Enabled: true
-RSpec/Capybara/SpecificFinders: # new in 2.13
+Capybara/SpecificFinders: # new in 2.13
   Enabled: true
-RSpec/Capybara/SpecificMatcher: # new in 2.12
+Capybara/SpecificMatcher: # new in 2.12
   Enabled: true
-RSpec/FactoryBot/ConsistentParenthesesStyle: # new in 2.14
+FactoryBot/ConsistentParenthesesStyle: # new in 2.14
   Enabled: true
-RSpec/FactoryBot/FactoryNameStyle: # new in 2.16
+FactoryBot/FactoryNameStyle: # new in 2.16
   Enabled: true
-RSpec/FactoryBot/SyntaxMethods: # new in 2.7
+FactoryBot/SyntaxMethods: # new in 2.7
   Enabled: true
-RSpec/Rails/AvoidSetupHook: # new in 2.4
+RSpecRails/AvoidSetupHook: # new in 2.4
   Enabled: true
-RSpec/Rails/HaveHttpStatus: # new in 2.12
+RSpecRails/HaveHttpStatus: # new in 2.12
   Enabled: true
-RSpec/Rails/InferredSpecType: # new in 2.14
+RSpecRails/InferredSpecType: # new in 2.14
   Enabled: true
 Performance/AncestorsInclude: # new in 1.7
   Enabled: true

.rubocop_todo.yml

@@ -1,34 +1,42 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2022-09-19 13:26:53 UTC using RuboCop version 1.36.0.
+# on 2024-06-17 13:11:25 UTC using RuboCop version 1.64.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
+# Offense count: 2
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'spec/views/dashboard/summary.html.erb_spec.rb'
+
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowConsecutiveOneLiners.
 RSpec/EmptyLineAfterHook:
   Exclude:
     - 'spec/factories/users.rb'
 
-# Offense count: 26
+# Offense count: 13
+# Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
+RSpec/IndexedLet:
+  Exclude:
+    - 'spec/features/homepage_summary_spec.rb'
+    - 'spec/models/ability_spec.rb'
+    - 'spec/models/stream_spec.rb'
+    - 'spec/models/user_spec.rb'
+    - 'spec/views/organizations/index.html.erb_spec.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedPatterns.
+# AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
   Exclude:
     - 'spec/jobs/attach_remote_file_to_upload_job_spec.rb'
-    - 'spec/views/allowlisted_jwts/index.html.erb_spec.rb'
-    - 'spec/views/allowlisted_jwts/new.html.erb_spec.rb'
-    - 'spec/views/data/index.html.erb_spec.rb'
-    - 'spec/views/organization_users/index.html.erb_spec.rb'
-    - 'spec/views/organizations/index.html.erb_spec.rb'
-    - 'spec/views/organizations/new.html.erb_spec.rb'
-    - 'spec/views/organizations/organization_details.html.erb_spec.rb'
-    - 'spec/views/organizations/provider_details.html.erb_spec.rb'
-    - 'spec/views/shared/nav.html.erb_spec.rb'
-    - 'spec/views/site_users/index.html.erb_spec.rb'
-    - 'spec/views/uploads/index.html.erb_spec.rb'
-    - 'spec/views/uploads/new.html.erb_spec.rb'
 
 # Offense count: 11
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -50,8 +58,8 @@ Rails/I18nLocaleTexts:
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, IgnoredMethods, AllowComments.
-# AllowedMethods: respond_to, define_method
+# Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
+# AllowedMethods: define_method, mail, respond_to
 Style/SymbolProc:
   Exclude:
     - 'spec/factories/users.rb'

Gemfile

@@ -52,6 +52,9 @@ group :development, :test do
   gem 'rubocop-performance', require: false
   gem 'rubocop-rails', require: false
   gem 'rubocop-rspec', require: false
+  gem 'rubocop-capybara', require: false
+  gem 'rubocop-factory_bot', require: false
+  gem 'rubocop-rspec_rails', require: false
 
   gem 'simplecov'
   gem 'timecop'

Gemfile.lock

@@ -81,6 +81,7 @@ GEM
     base64 (0.2.0)
     bcrypt (3.1.20)
     bcrypt_pbkdf (1.1.1)
+    bcrypt_pbkdf (1.1.1-arm64-darwin)
     bcrypt_pbkdf (1.1.1-x86_64-darwin)
     bigdecimal (3.1.8)
     bindex (0.8.1)
@@ -103,8 +104,6 @@ GEM
       capistrano-bundler (>= 1.4)
     capistrano-bundler (2.1.0)
       capistrano (~> 3.1)
-    capistrano-one_time_key (0.1.0)
-      capistrano (~> 3.0)
     capistrano-passenger (0.2.1)
       capistrano (~> 3.0)
     capistrano-rails (1.6.3)
@@ -148,23 +147,24 @@ GEM
       actionmailer (>= 5.0)
       devise (>= 4.6)
     diff-lcs (1.5.1)
-    dlss-capistrano (4.4.1)
+    dlss-capistrano (5.0.0)
       bcrypt_pbkdf
       capistrano (~> 3.0)
       capistrano-bundle_audit (>= 0.3.0)
-      capistrano-one_time_key
       capistrano-shared_configs
       ed25519
+      net-ssh-krb
     docile (1.4.0)
     domain_name (0.6.20240107)
     ed25519 (1.3.0)
-    erubi (1.12.0)
+    erubi (1.13.0)
     factory_bot (6.2.1)
       activesupport (>= 5.0.0)
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
     ffi (1.17.0)
+    ffi (1.17.0-arm64-darwin)
     ffi-compiler (1.3.2)
       ffi (>= 1.15.5)
       rake
@@ -174,9 +174,11 @@ GEM
       activesupport (>= 6.1)
     groupdate (6.4.0)
       activesupport (>= 6.1)
+    gssapi (1.3.1)
+      ffi (>= 1.0.1)
     hashdiff (1.1.0)
     highline (3.0.1)
-    honeybadger (5.11.1)
+    honeybadger (5.11.2)
     http (5.2.0)
       addressable (~> 2.8)
       base64 (~> 0.1)
@@ -206,7 +208,7 @@ GEM
       activesupport (>= 3.0)
       nokogiri (>= 1.6)
     io-console (0.7.2)
-    irb (1.13.1)
+    irb (1.13.2)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jbuilder (2.12.0)
@@ -250,7 +252,7 @@ GEM
     mini_mime (1.1.5)
     minitest (5.23.1)
     mutex_m (0.2.0)
-    net-imap (0.4.12)
+    net-imap (0.4.13)
       date
       net-protocol
     net-pop (0.1.2)
@@ -264,24 +266,29 @@ GEM
     net-smtp (0.5.0)
       net-protocol
     net-ssh (7.2.3)
+    net-ssh-krb (0.5.1)
+      gssapi (~> 1.3.0)
+      net-ssh (>= 2.0)
     nio4r (2.7.3)
-    nokogiri (1.16.5-x86_64-darwin)
+    nokogiri (1.16.6-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.16.6-x86_64-darwin)
       racc (~> 1.4)
-    nokogiri (1.16.5-x86_64-linux)
+    nokogiri (1.16.6-x86_64-linux)
       racc (~> 1.4)
     okcomputer (1.18.5)
     orm_adapter (0.5.0)
     paper_trail (15.1.0)
       activerecord (>= 6.1)
       request_store (~> 1.4)
     parallel (1.25.1)
-    parser (3.3.2.0)
+    parser (3.3.3.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.6)
     psych (5.1.2)
       stringio
-    public_suffix (5.0.5)
+    public_suffix (5.1.1)
     puma (5.6.8)
       nio4r (~> 2.0)
     racc (1.8.0)
@@ -334,19 +341,19 @@ GEM
     redis-client (0.22.2)
       connection_pool
     regexp_parser (2.9.2)
-    reline (0.5.8)
+    reline (0.5.9)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
     responders (3.1.1)
       actionpack (>= 5.2)
       railties (>= 5.2)
-    rexml (3.2.9)
+    rexml (3.3.0)
       strscan
     rolify (6.0.1)
     rspec-core (3.13.0)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.0)
+    rspec-expectations (3.13.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-mocks (3.13.1)
@@ -376,23 +383,21 @@ GEM
       parser (>= 3.3.1.0)
     rubocop-capybara (2.21.0)
       rubocop (~> 1.41)
-    rubocop-factory_bot (2.26.0)
-      rubocop (~> 1.41)
-    rubocop-performance (1.21.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-performance (1.21.1)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     rubocop-rails (2.25.0)
       activesupport (>= 4.2.0)
       rack (>= 1.1)
       rubocop (>= 1.33.0, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (2.31.0)
-      rubocop (~> 1.40)
-      rubocop-capybara (~> 2.17)
-      rubocop-factory_bot (~> 2.22)
-      rubocop-rspec_rails (~> 2.28)
-    rubocop-rspec_rails (2.29.0)
-      rubocop (~> 1.40)
+    rubocop-rspec (3.0.1)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
     ruby-progressbar (1.13.0)
     rubyzip (2.3.2)
     safely_block (0.4.0)
@@ -420,6 +425,7 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
+    sqlite3 (1.7.3-arm64-darwin)
     sqlite3 (1.7.3-x86_64-darwin)
     sqlite3 (1.7.3-x86_64-linux)
     sshkit (1.22.2)
@@ -428,12 +434,12 @@ GEM
       net-scp (>= 1.1.2)
       net-sftp (>= 2.1.2)
       net-ssh (>= 2.8.0)
-    stringio (3.1.0)
+    stringio (3.1.1)
     strscan (3.1.0)
     terminal-table (3.0.2)
       unicode-display_width (>= 1.1.1, < 3)
     thor (1.3.1)
-    timecop (0.9.9)
+    timecop (0.9.10)
     timeout (0.4.1)
     turbolinks (5.2.1)
       turbolinks-source (~> 5.2)
@@ -467,9 +473,10 @@ GEM
       chronic (>= 0.6.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.6.15)
+    zeitwerk (2.6.16)
 
 PLATFORMS
+  arm64-darwin-23
   x86_64-darwin-19
   x86_64-darwin-22
   x86_64-linux
@@ -518,9 +525,12 @@ DEPENDENCIES
   rolify
   rspec-rails
   rubocop
+  rubocop-capybara
+  rubocop-factory_bot
   rubocop-performance
   rubocop-rails
   rubocop-rspec
+  rubocop-rspec_rails
   selenium-webdriver
   sidekiq (~> 7.0)
   simplecov

spec/views/dashboard/summary.html.erb_spec.rb

@@ -16,15 +16,13 @@
     assign(:uploads, Kaminari.paginate_array(uploads1).page(1))
     assign(:dashboard, dashboard)
 
-    allow(view).to receive(:files_status).and_return(:completed)
-    allow(view).to receive(:count_roles).and_return({ admin: 1, owner: 2, member: 3 })
+    allow(view).to receive_messages(files_status: :completed, count_roles: { admin: 1, owner: 2, member: 3 })
 
-    allow(dashboard).to receive(:recent_uploads_by_provider).and_return({ provider1 => uploads1 })
-
-    allow(dashboard).to receive(:job_status_groups_by_provider).and_return({ provider1 => { active: [job_tracker_active],
-                                                                                            needs_attention: [job_tracker_attention] } }) # rubocop:disable Layout/LineLength
-    allow(dashboard).to receive(:normalized_data_by_provider).and_return({ provider1 => normalized_data })
-    allow(dashboard).to receive(:users_by_organization).and_return({ provider1 => { admin: 1, owner: 2, member: 3 } })
+    allow(dashboard).to receive_messages(recent_uploads_by_provider: { provider1 => uploads1 },
+                                         job_status_groups_by_provider: { provider1 => { active: [job_tracker_active],
+                                                                                         needs_attention: [job_tracker_attention] } },
+                                         normalized_data_by_provider: { provider1 => normalized_data },
+                                         users_by_organization: { provider1 => { admin: 1, owner: 2, member: 3 } })
   end
 
   # rubocop:disable RSpec/ExampleLength, RSpec/MultipleExpectations

yarn.lock

@@ -150,9 +150,9 @@ readdirp@~3.6.0:
     picomatch "^2.2.1"
 
 sass@^1.57.1:
-  version "1.77.4"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.4.tgz#92059c7bfc56b827c56eb116778d157ec017a5cd"
-  integrity sha512-vcF3Ckow6g939GMA4PeU7b2K/9FALXk2KF9J87txdHzXbUF9XRQRwSxcAs/fGaTnJeBFd7UoV22j3lzMLdM0Pw==
+  version "1.77.5"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.77.5.tgz#5f9009820297521356e962c0bed13ee36710edfe"
+  integrity sha512-oDfX1mukIlxacPdQqNb6mV2tVCrnE+P3nVYioy72V5tlk56CPNcO4TCuFcaCRKKfJ1M3lH95CleRS+dVKL2qMg==
   dependencies:
     chokidar ">=3.0.0 <4.0.0"
     immutable "^4.0.0"