Skip to content

Commit

Permalink
Merge branch 'main' into dependabot/npm_and_yarn/postcss-8.4.47
Browse files Browse the repository at this point in the history
  • Loading branch information
CEdwardsBlasikiewicz authored Sep 25, 2024
2 parents 9b641dc + e7a84be commit 55c75e6
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 28 deletions.
4 changes: 2 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ group :development, :test do
gem "rubocop-factory_bot", require: false
gem "solr_wrapper", ">= 0.3"

gem "rspec-rails", "~> 6.1"
gem "rspec-rails", "~> 7.0"
gem "fuubar"
gem "shoulda-matchers"
gem "factory_bot_rails"
Expand Down Expand Up @@ -144,7 +144,7 @@ end
group :test do
# Use system testing [https://guides.rubyonrails.org/testing.html#system-testing]
gem "capybara"
gem "selenium-webdriver", "~> 4.23"
gem "selenium-webdriver", "~> 4.25"
gem "rails-controller-testing", "~> 1.0", ">= 1.0.5"
gem "webmock"
gem "cuprite"
Expand Down
50 changes: 24 additions & 26 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -325,7 +325,7 @@ GEM
domain_name (~> 0.5)
http-form_data (2.3.0)
httpclient (2.8.3)
i18n (1.14.5)
i18n (1.14.6)
concurrent-ruby (~> 1.0)
io-console (0.7.2)
irb (1.14.0)
Expand Down Expand Up @@ -364,7 +364,7 @@ GEM
llhttp-ffi (0.5.0)
ffi-compiler (~> 1.0)
rake (~> 13.0)
logger (1.6.0)
logger (1.6.1)
lograge (0.14.0)
actionpack (>= 4)
activesupport (>= 4)
Expand Down Expand Up @@ -453,7 +453,7 @@ GEM
orm_adapter (0.5.0)
ostruct (0.6.0)
parallel (1.26.3)
parser (3.3.4.2)
parser (3.3.5.0)
ast (~> 2.4.1)
racc
parslet (2.0.0)
Expand All @@ -463,7 +463,7 @@ GEM
psych (5.1.2)
stringio
public_suffix (4.0.7)
puma (6.4.2)
puma (6.4.3)
nio4r (~> 2.0)
raabro (1.4.0)
racc (1.8.1)
Expand Down Expand Up @@ -524,41 +524,40 @@ GEM
actionpack (>= 5.2)
railties (>= 5.2)
retriable (3.1.2)
rexml (3.3.6)
strscan
rexml (3.3.7)
rouge (4.3.0)
rsolr (2.6.0)
builder (>= 2.1.2)
faraday (>= 0.9, < 3, != 2.0.0)
rspec-core (3.13.0)
rspec-core (3.13.1)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.2)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.1)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.13.0)
rspec-rails (6.1.4)
actionpack (>= 6.1)
activesupport (>= 6.1)
railties (>= 6.1)
rspec-rails (7.0.1)
actionpack (>= 7.0)
activesupport (>= 7.0)
railties (>= 7.0)
rspec-core (~> 3.13)
rspec-expectations (~> 3.13)
rspec-mocks (~> 3.13)
rspec-support (~> 3.13)
rspec-support (3.13.1)
rubocop (1.64.1)
rubocop (1.65.1)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
parallel (~> 1.10)
parser (>= 3.3.0.2)
rainbow (>= 2.2.2, < 4.0)
regexp_parser (>= 1.8, < 3.0)
regexp_parser (>= 2.4, < 3.0)
rexml (>= 3.2.5, < 4.0)
rubocop-ast (>= 1.31.1, < 2.0)
ruby-progressbar (~> 1.7)
unicode-display_width (>= 2.4.0, < 3.0)
rubocop-ast (1.32.1)
rubocop-ast (1.32.3)
parser (>= 3.3.1.0)
rubocop-capybara (2.21.0)
rubocop (~> 1.41)
Expand All @@ -572,7 +571,7 @@ GEM
rack (>= 1.1)
rubocop (>= 1.33.0, < 2.0)
rubocop-ast (>= 1.31.1, < 2.0)
rubocop-rspec (3.0.4)
rubocop-rspec (3.0.5)
rubocop (~> 1.61)
ruby-next-core (1.0.3)
ruby-progressbar (1.13.0)
Expand All @@ -582,7 +581,7 @@ GEM
rufus-scheduler (3.9.1)
fugit (~> 1.1, >= 1.1.6)
scrub_rb (1.0.1)
selenium-webdriver (4.23.0)
selenium-webdriver (4.25.0)
base64 (~> 0.2)
logger (~> 1.4)
rexml (~> 3.2, >= 3.2.5)
Expand Down Expand Up @@ -616,10 +615,10 @@ GEM
activesupport (>= 6.1)
sprockets (>= 3.0.0)
stackprof (0.2.26)
standard (1.39.2)
standard (1.40.0)
language_server-protocol (~> 3.17.0.2)
lint_roller (~> 1.0)
rubocop (~> 1.64.0)
rubocop (~> 1.65.0)
standard-custom (~> 1.0.0)
standard-performance (~> 1.4)
standard-custom (1.0.2)
Expand All @@ -633,10 +632,9 @@ GEM
stringio (3.1.1)
strong_migrations (2.0.0)
activerecord (>= 6.1)
strscan (3.1.0)
summon (2.0.5)
json
thor (1.3.1)
thor (1.3.2)
timeout (0.4.1)
traject (3.8.2)
concurrent-ruby (>= 0.8.0)
Expand All @@ -656,7 +654,7 @@ GEM
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unf (0.2.0)
unicode-display_width (2.5.0)
unicode-display_width (2.6.0)
version_gem (1.1.4)
view_component (3.14.0)
activesupport (>= 5.2.0, < 8.0)
Expand All @@ -673,7 +671,7 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
webrick (1.8.1)
webrick (1.8.2)
websocket (1.2.11)
websocket-driver (0.7.6)
websocket-extensions (>= 0.1.0)
Expand All @@ -698,7 +696,7 @@ GEM
railties
yabeda (~> 0.8)
yell (2.2.2)
zeitwerk (2.6.17)
zeitwerk (2.6.18)
zk (1.10.0)
zookeeper (~> 1.5.0)
zookeeper (1.5.5)
Expand Down Expand Up @@ -759,14 +757,14 @@ DEPENDENCIES
rails (~> 7.0)
rails-controller-testing (~> 1.0, >= 1.0.5)
redis (~> 5.3)
rspec-rails (~> 6.1)
rspec-rails (~> 7.0)
rubocop-capybara
rubocop-factory_bot
rubocop-performance
rubocop-rails
rubocop-rspec
rufus-scheduler (~> 3.8)
selenium-webdriver (~> 4.23)
selenium-webdriver (~> 4.25)
shoulda-matchers
simplecov (~> 0.22.0)
simplecov-json (~> 0.2.3)
Expand Down

0 comments on commit 55c75e6

Please sign in to comment.