diff --git a/Gemfile b/Gemfile index 0d25b563..697abcba 100644 --- a/Gemfile +++ b/Gemfile @@ -23,7 +23,7 @@ gem "rails", "~> 7.0.0" gem "raygun4ruby" gem "redis" gem "sassc-rails" -gem "shakapacker", "~> 7.0" +gem "shakapacker", "~> 8.0" gem "sidekiq" gem "sidekiq-batch" gem "sqlite3" diff --git a/Gemfile.lock b/Gemfile.lock index 451c0e9e..baf6816e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -124,7 +124,7 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) crass (1.0.6) date (3.3.4) @@ -182,14 +182,14 @@ GEM httparty (0.21.0) mini_mime (>= 1.0.0) multi_xml (>= 0.5.2) - i18n (1.14.5) + i18n (1.14.6) concurrent-ruby (~> 1.0) ice_nine (0.11.2) image_processing (1.12.2) mini_magick (>= 4.9.5, < 5) ruby-vips (>= 2.0.17, < 3) iniparse (1.5.0) - inline_svg (1.7.2) + inline_svg (1.10.0) activesupport (>= 3.0) nokogiri (>= 1.6) jmespath (1.6.1) @@ -233,7 +233,7 @@ GEM mini_magick (4.11.0) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.23.1) + minitest (5.25.1) mock_redis (0.29.0) ruby2_keywords msgpack (1.4.2) @@ -249,7 +249,7 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) orm_adapter (0.5.0) @@ -272,7 +272,7 @@ GEM nio4r (~> 2.0) pundit (2.1.1) activesupport (>= 3.0.0) - racc (1.8.0) + racc (1.8.1) rack (2.2.9) rack-canonical-host (1.1.0) addressable (> 0, < 3) @@ -388,7 +388,7 @@ GEM rubyzip (>= 1.2.2, < 3.0) websocket (~> 1.0) semantic_range (3.0.0) - shakapacker (7.2.3) + shakapacker (8.0.1) activesupport (>= 5.2) package_json rack-proxy (>= 0.6.1) @@ -485,7 +485,7 @@ DEPENDENCIES rubocop-rails sassc-rails selenium-webdriver - shakapacker (~> 7.0) + shakapacker (~> 8.0) sidekiq sidekiq-batch simplecov diff --git a/package.json b/package.json index b772ad00..76885c2a 100644 --- a/package.json +++ b/package.json @@ -66,6 +66,7 @@ "stylelint-config-recommended-scss": "^14.1.0", "webpack-dev-server": "^4.0.0" }, + "packageManager": "yarn@1.22.22", "engines": { "node": "^20.0.0", "yarn": "^1.0.0" diff --git a/spec/views/signs/_card.html.erb_spec.rb b/spec/views/signs/_card.html.erb_spec.rb index 743b0dd2..56af16f4 100644 --- a/spec/views/signs/_card.html.erb_spec.rb +++ b/spec/views/signs/_card.html.erb_spec.rb @@ -85,7 +85,7 @@ allow(view).to receive(:user_signed_in?).and_return(true) allow(view).to receive(:present).with(sign).and_return(presenter) expect(presenter).to receive(:comments_count).and_return(10) - expect(rendered).to have_selector(".sign-control--comments", text: "Comments\n\n\n\n 10") + expect(rendered).to have_selector(".sign-control--comments", text: "Comments\n\n\n 10") end it "shows an indicator on the comment icon when the user has unread comments" do @@ -97,7 +97,7 @@ expect(rendered).to have_selector( ".sign-control--comments--unread", - text: "Comments\n\n\n\n 1") + text: "Comments\n\n\n 1") end it "does not show the comment count when the user is not signed in" do diff --git a/spec/views/signs/table/_row.html.erb_spec.rb b/spec/views/signs/table/_row.html.erb_spec.rb index 77c01241..f962cfbe 100644 --- a/spec/views/signs/table/_row.html.erb_spec.rb +++ b/spec/views/signs/table/_row.html.erb_spec.rb @@ -79,7 +79,7 @@ allow(view).to receive(:user_signed_in?).and_return(true) allow(view).to receive(:present).with(sign).and_return(presenter) expect(presenter).to receive(:comments_count).and_return(10) - expect(rendered).to have_selector(".sign-control--comments", text: "Comments\n\n\n\n 10") + expect(rendered).to have_selector(".sign-control--comments", text: "Comments\n\n\n 10") end it "shows an indicator on the comment icon when the user has unread comments" do @@ -91,7 +91,7 @@ expect(rendered).to have_selector( ".sign-control--comments--unread", - text: "Comments\n\n\n\n 1") + text: "Comments\n\n\n 1") end it "does not show the comment count when the user is not signed in" do