Update to Rails 7.0.8.4

This commit updates Rails from version 6.1.7.8 to 7.0.8.4. Ref: - https://rubyonrails.org/2024/6/4/Rails-Versions-6-1-7-8-7-0-8-4-and-7-1-3-4-have-been-released
thoughtbot · Aug 26, 2024 · 49ea628 · 49ea628
1 parent 96edadf
commit 49ea628
Show file tree

Hide file tree

Showing 9 changed files with 82 additions and 70 deletions.
diff --git a/Gemfile b/Gemfile
@@ -43,7 +43,7 @@ gem "pry-rails"
 gem "psych", "< 6"
 gem "puma"
 gem "rack-rewrite"
-gem "rails", "~> 6.1", ">= 6.1.7.8"
+gem "rails", "7.0.8.4"
 gem "rails_admin"
 gem "recipient_interceptor"
 gem "redcarpet"

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -6,40 +6,47 @@ GEM
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actioncable (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionmailbox (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activejob (= 7.0.8.4)
+      activerecord (= 7.0.8.4)
+      activestorage (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       mail (>= 2.7.1)
-    actionmailer (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+      net-imap
+      net-pop
+      net-smtp
+    actionmailer (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      actionview (= 7.0.8.4)
+      activejob (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       mail (~> 2.5, >= 2.5.4)
+      net-imap
+      net-pop
+      net-smtp
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.7.8)
-      actionview (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-      rack (~> 2.0, >= 2.0.9)
+    actionpack (7.0.8.4)
+      actionview (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
+      rack (~> 2.0, >= 2.2.4)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actiontext (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activerecord (= 7.0.8.4)
+      activestorage (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    actionview (7.0.8.4)
+      activesupport (= 7.0.8.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
@@ -49,31 +56,30 @@ GEM
       activemodel (>= 4.1)
       case_transform (>= 0.2)
       jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
-    activejob (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activejob (7.0.8.4)
+      activesupport (= 7.0.8.4)
       globalid (>= 0.3.6)
-    activemodel (6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activemodel (7.0.8.4)
+      activesupport (= 7.0.8.4)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
       builder (~> 3.1)
-    activerecord (6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
-    activestorage (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    activerecord (7.0.8.4)
+      activemodel (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
+    activestorage (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activejob (= 7.0.8.4)
+      activerecord (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       marcel (~> 1.0)
       mini_mime (>= 1.1.0)
-    activesupport (6.1.7.8)
+    activesupport (7.0.8.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
     acts_as_list (1.2.2)
       activerecord (>= 6.1)
       activesupport (>= 6.1)
@@ -265,7 +271,7 @@ GEM
     launchy (2.5.0)
       addressable (~> 2.7)
     lint_roller (1.1.0)
-    listen (3.3.3)
+    listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.6.0)
@@ -386,21 +392,20 @@ GEM
     rack-rewrite (1.5.1)
     rack-test (2.1.0)
       rack (>= 1.3)
-    rails (6.1.7.8)
-      actioncable (= 6.1.7.8)
-      actionmailbox (= 6.1.7.8)
-      actionmailer (= 6.1.7.8)
-      actionpack (= 6.1.7.8)
-      actiontext (= 6.1.7.8)
-      actionview (= 6.1.7.8)
-      activejob (= 6.1.7.8)
-      activemodel (= 6.1.7.8)
-      activerecord (= 6.1.7.8)
-      activestorage (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    rails (7.0.8.4)
+      actioncable (= 7.0.8.4)
+      actionmailbox (= 7.0.8.4)
+      actionmailer (= 7.0.8.4)
+      actionpack (= 7.0.8.4)
+      actiontext (= 7.0.8.4)
+      actionview (= 7.0.8.4)
+      activejob (= 7.0.8.4)
+      activemodel (= 7.0.8.4)
+      activerecord (= 7.0.8.4)
+      activestorage (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       bundler (>= 1.15.0)
-      railties (= 6.1.7.8)
-      sprockets-rails (>= 2.0.0)
+      railties (= 7.0.8.4)
     rails-controller-testing (1.0.5)
       actionpack (>= 5.0.1.rc1)
       actionview (>= 5.0.1.rc1)
@@ -419,16 +424,17 @@ GEM
       rails (>= 6.0, < 8)
       turbo-rails (~> 1.0)
     rails_stdout_logging (0.0.5)
-    railties (6.1.7.8)
-      actionpack (= 6.1.7.8)
-      activesupport (= 6.1.7.8)
+    railties (7.0.8.4)
+      actionpack (= 7.0.8.4)
+      activesupport (= 7.0.8.4)
       method_source
       rake (>= 12.2)
       thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.1.1)
     rake (13.2.1)
-    rb-fsevent (0.10.4)
-    rb-inotify (0.10.1)
+    rb-fsevent (0.11.2)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
     recipient_interceptor (0.3.2)
       mail
@@ -656,7 +662,7 @@ DEPENDENCIES
   rack-livereload
   rack-mini-profiler
   rack-rewrite
-  rails (~> 6.1, >= 6.1.7.8)
+  rails (= 7.0.8.4)
   rails-assets-lodash!
   rails-controller-testing
   rails_admin

diff --git a/bin/setup b/bin/setup
@@ -59,6 +59,11 @@ if [ ! -f .env ]; then
   cp .sample.env .env
 fi
 
+# Set up Puma's process ID folder
+if [ ! -d tmp/pids ]; then
+  mkdir -p tmp/pids
+fi
+
 # Pick a port for Foreman
 if ! command -v foreman > /dev/null; then
   printf 'Foreman is not installed.\n'

diff --git a/spec/models/classification_spec.rb b/spec/models/classification_spec.rb
@@ -5,6 +5,7 @@
   it { should belong_to(:topic) }
 
   context "validations" do
+    subject { Classification.new(classifiable_id: 1, classifiable_type: Topic) }
     it { should validate_uniqueness_of(:topic_id).scoped_to([:classifiable_id, :classifiable_type]) }
   end
 end
diff --git a/spec/views/layouts/_footer.html.erb_spec.rb b/spec/views/layouts/_footer.html.erb_spec.rb
@@ -5,15 +5,15 @@
     it "does not show the repositories link" do
       view_stub_with_return(signed_in?: false)
 
-      render
+      render template: "layouts/_footer"
 
       expect(rendered).not_to have_content("Upcase source code")
     end
 
     it "does show the contact us link" do
       view_stub_with_return(signed_in?: false)
 
-      render
+      render template: "layouts/_footer"
 
       expect(rendered).to have_content("Contact us")
     end
@@ -22,7 +22,7 @@
       it "does not show a sign out link" do
         view_stub_with_return(signed_in?: false)
 
-        render
+        render template: "layouts/_footer"
 
         expect(rendered).not_to have_content("Sign out")
       end
@@ -34,7 +34,7 @@
       view_stub_with_return(signed_in?: true)
       view_stub_with_return(current_user: create(:user))
 
-      render
+      render template: "layouts/_footer"
 
       expect(rendered).to have_content("Upcase source code")
     end
@@ -43,7 +43,7 @@
       view_stub_with_return(signed_in?: true)
       view_stub_with_return(current_user: create(:user))
 
-      render
+      render template: "layouts/_footer"
 
       expect(rendered).to have_content("Sign out")
     end

diff --git a/spec/views/layouts/_header_application_links.html.erb_spec.rb b/spec/views/layouts/_header_application_links.html.erb_spec.rb
@@ -13,7 +13,7 @@
     view_stub_with_return(
       current_user: double("user", email: email)
     )
-    render
+    render template: "layouts/_header_application_links"
 
     expect(rendered).to have_css(<<-CSS.strip)
       img[src='#{gravatar_url(email, size: "30")}']

diff --git a/spec/views/pages/landing.html.erb_spec.rb b/spec/views/pages/landing.html.erb_spec.rb
@@ -2,7 +2,7 @@
 
 RSpec.describe "pages/landing.html.erb" do
   it "renders links to the practice page" do
-    render
+    render template: "pages/landing"
 
     expect(rendered).to have_link href: "/upcase/practice", count: 3
   end

diff --git a/spec/views/shared/_flashes.html.erb_spec.rb b/spec/views/shared/_flashes.html.erb_spec.rb
@@ -12,7 +12,7 @@
     end
 
     it "loads the Segment.io JavaScript library" do
-      render
+      render template: "shared/_flashes"
 
       expect(rendered).to include("Thank you")
       expect(rendered).not_to include("29")

diff --git a/spec/views/twitter_player_cards/show.html.erb_spec.rb b/spec/views/twitter_player_cards/show.html.erb_spec.rb
@@ -6,7 +6,7 @@
     video = double("video", preview_wistia_id: preview_wistia_id)
 
     assign :video, video
-    render
+    render template: "twitter_player_cards/show"
 
     expect(rendered)
       .to have_css("source[src='https://thoughtbotlearn.wistia.com/medias/#{preview_wistia_id}/download?asset=hd_mp4']")