Skip to content

Commit

Permalink
Merge pull request #2336 from sul-dlss/update-dependencies
Browse files Browse the repository at this point in the history
Merged by automated merge script
  • Loading branch information
mjgiarlo authored Jun 17, 2024
2 parents 952af0c + fbbaae4 commit 1632934
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 40 deletions.
19 changes: 10 additions & 9 deletions .rubocop.yml
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
# Turn on RSpec cops
require:
- rubocop-rails
- rubocop-rspec
- rubocop-capybara
- rubocop-factory_bot
- rubocop-rails
- rubocop-rspec
- rubocop-rspec_rails

inherit_from: .rubocop_todo.yml
inherit_mode:
Expand Down Expand Up @@ -317,7 +318,7 @@ Style/QuotedSymbols: # (new in 1.16)
Enabled: true
RSpec/IdenticalEqualityAssertion: # (new in 2.4)
Enabled: true
RSpec/Rails/AvoidSetupHook: # (new in 2.4)
RSpecRails/AvoidSetupHook: # (new in 2.4)
Enabled: true

Naming/InclusiveLanguage: # (new in 1.18)
Expand Down Expand Up @@ -470,7 +471,7 @@ Capybara/SpecificFinders: # new in 2.13
Enabled: true
Capybara/SpecificMatcher: # new in 2.12
Enabled: true
RSpec/Rails/HaveHttpStatus: # new in 2.12
RSpecRails/HaveHttpStatus: # new in 2.12
Enabled: true

Lint/DuplicateMagicComment: # new in 1.37
Expand All @@ -493,7 +494,7 @@ Capybara/SpecificActions: # new in 2.14
Enabled: true
FactoryBot/ConsistentParenthesesStyle: # new in 2.14
Enabled: true
RSpec/Rails/InferredSpecType: # new in 2.14
RSpecRails/InferredSpecType: # new in 2.14
Enabled: true
Style/RedundantEach: # new in 1.38
Enabled: true
Expand Down Expand Up @@ -523,7 +524,7 @@ Lint/UselessRescue: # new in 1.43
Enabled: true
Capybara/MatchStyle: # new in <<next>>
Enabled: true
RSpec/Rails/MinitestAssertions: # new in 2.17
RSpecRails/MinitestAssertions: # new in 2.17
Enabled: true
Gemspec/DevelopmentDependencies: # new in 1.44
Enabled: true
Expand Down Expand Up @@ -553,7 +554,7 @@ RSpec/RedundantAround: # new in 2.19
Enabled: true
RSpec/SkipBlockInsideExample: # new in 2.19
Enabled: true
RSpec/Rails/TravelAround: # new in 2.19
RSpecRails/TravelAround: # new in 2.19
Enabled: true

Rails/UniqueValidationWithoutIndex:
Expand Down Expand Up @@ -596,7 +597,7 @@ Style/YAMLFileRead: # new in 1.53
Enabled: true
RSpec/ReceiveMessages: # new in 2.23
Enabled: true
RSpec/Rails/NegationBeValid: # new in 2.23
RSpecRails/NegationBeValid: # new in 2.23
Enabled: true

Rails/DangerousColumnNames: # new in 2.21
Expand Down Expand Up @@ -648,4 +649,4 @@ RSpec/RemoveConst: # new in 2.26
RSpec/IsExpectedSpecify: # new in 2.27
Enabled: true
RSpec/RepeatedSubjectCall: # new in 2.27
Enabled: true
Enabled: true
3 changes: 3 additions & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,11 @@ group :development, :test do
gem 'rspec-rails'
# Ruby static code analyzer https://rubocop.readthedocs.io/en/latest/
gem 'rubocop', '~> 1.0'
gem 'rubocop-capybara'
gem 'rubocop-factory_bot'
gem 'rubocop-rails'
gem 'rubocop-rspec'
gem 'rubocop-rspec_rails'
gem 'rspec_junit_formatter' # used by CircleCI
end

Expand Down
66 changes: 35 additions & 31 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -80,16 +80,16 @@ GEM
amq-protocol (2.3.2)
ast (2.4.2)
aws-eventstream (1.3.0)
aws-partitions (1.941.0)
aws-partitions (1.944.0)
aws-sdk-core (3.197.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.651.0)
aws-sigv4 (~> 1.8)
jmespath (~> 1, >= 1.6.1)
aws-sdk-kms (1.83.0)
aws-sdk-kms (1.84.0)
aws-sdk-core (~> 3, >= 3.197.0)
aws-sigv4 (~> 1.1)
aws-sdk-s3 (1.152.0)
aws-sdk-s3 (1.152.3)
aws-sdk-core (~> 3, >= 3.197.0)
aws-sdk-kms (~> 1)
aws-sigv4 (~> 1.8)
Expand Down Expand Up @@ -119,8 +119,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)
Expand Down Expand Up @@ -158,13 +156,13 @@ GEM
deprecation (1.1.0)
activesupport
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)
dor-event-client (1.0.0)
activesupport (>= 4.2, < 8)
Expand All @@ -179,7 +177,7 @@ GEM
zeitwerk (~> 2.1)
druid-tools (3.0.0)
ed25519 (1.3.0)
erubi (1.12.0)
erubi (1.13.0)
factory_bot (6.4.6)
activesupport (>= 5.0.0)
factory_bot_rails (6.4.3)
Expand All @@ -198,16 +196,18 @@ GEM
ffi (1.17.0-x86_64-linux-gnu)
globalid (1.2.1)
activesupport (>= 6.1)
gssapi (1.3.1)
ffi (>= 1.0.1)
hashdiff (1.1.0)
honeybadger (5.11.1)
honeybadger (5.11.2)
i18n (1.14.5)
concurrent-ruby (~> 1.0)
importmap-rails (1.2.3)
actionpack (>= 6.0.0)
activesupport (>= 6.0.0)
railties (>= 6.0.0)
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)
Expand Down Expand Up @@ -248,7 +248,7 @@ GEM
mutex_m (0.2.0)
net-http (0.4.1)
uri
net-imap (0.4.12)
net-imap (0.4.13)
date
net-protocol
net-pop (0.1.2)
Expand All @@ -262,21 +262,24 @@ 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-aarch64-linux)
nokogiri (1.16.6-aarch64-linux)
racc (~> 1.4)
nokogiri (1.16.5-arm64-darwin)
nokogiri (1.16.6-arm64-darwin)
racc (~> 1.4)
nokogiri (1.16.5-x86_64-darwin)
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)
nokogiri-happymapper (0.10.0)
nokogiri (~> 1.5)
okcomputer (1.18.5)
openapi_parser (2.1.0)
parallel (1.25.1)
parser (3.3.2.0)
parser (3.3.3.0)
ast (~> 2.4.1)
racc
pg (1.5.6)
Expand All @@ -295,7 +298,7 @@ GEM
pry (>= 0.13, < 0.15)
psych (5.1.2)
stringio
public_suffix (5.0.5)
public_suffix (5.1.1)
puma (6.4.2)
nio4r (~> 2.0)
racc (1.8.0)
Expand Down Expand Up @@ -347,15 +350,15 @@ 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)
rexml (3.2.9)
rexml (3.3.0)
strscan
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)
Expand Down Expand Up @@ -387,20 +390,18 @@ GEM
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.26.0)
rubocop (~> 1.41)
rubocop-factory_bot (2.26.1)
rubocop (~> 1.61)
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)
set (1.1.0)
shoulda-matchers (6.2.0)
Expand All @@ -425,7 +426,7 @@ 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)
thor (1.3.1)
timeout (0.4.1)
Expand All @@ -452,7 +453,7 @@ GEM
chronic (>= 0.6.3)
xpath (3.2.0)
nokogiri (~> 1.8)
zeitwerk (2.6.15)
zeitwerk (2.6.16)

PLATFORMS
aarch64-linux
Expand Down Expand Up @@ -497,8 +498,11 @@ DEPENDENCIES
rspec-rails
rspec_junit_formatter
rubocop (~> 1.0)
rubocop-capybara
rubocop-factory_bot
rubocop-rails
rubocop-rspec
rubocop-rspec_rails
shoulda-matchers
sidekiq (~> 7.0)
sidekiq-pro!
Expand Down

0 comments on commit 1632934

Please sign in to comment.