Test with released Rails 7

rails · Dec 10, 2021 · a766ced · a766ced
1 parent 2988f37
commit a766ced
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -7,7 +7,7 @@ jobs:
       fail-fast: false
       matrix:
         ruby: [ '2.7', '3.0.2', 'head' ]
-        rails: [ '6.0', '6.1', 'edge' ]
+        rails: [ '6.0', '6.1', '7.0', 'edge' ]
 
     env:
       RAILS_VERSION: ${{ matrix.rails }}

diff --git a/Gemfile b/Gemfile
@@ -5,6 +5,9 @@ gemspec
 
 if ENV["RAILS_VERSION"] == "edge"
   gem "activesupport", github: "rails/rails", branch: "main"
+elsif ENV['RAILS_VERSION'] == "7.0"
+  gem "activesupport", ">= 7.0.0.alpha"
+  ">= 7.0.0.alpha"
 elsif ENV["RAILS_VERSION"]
-  gem "activesupport", "~> #{ENV["RAILS_VERSION"] || "6.1"}.0"
+  gem "activesupport", "~> #{ENV["RAILS_VERSION"]}.0"
 end
diff --git a/test/support/acceptance_test.rb b/test/support/acceptance_test.rb
@@ -12,7 +12,9 @@ class AcceptanceTest < ActiveSupport::TestCase
 
       def rails_version
         if ENV['RAILS_VERSION'] == "edge"
-          "7.0.0.alpha"
+          "7.1.0.alpha"
+        elsif ENV['RAILS_VERSION'] == "7.0"
+          ">= 7.0.0.alpha"
         else
           "~> #{ENV['RAILS_VERSION'] || "6.1"}.0"
         end
@@ -157,7 +159,7 @@ def without_gem(name)
       end
 
       test "code changes in pre-referenced app files are picked up" do
-        File.write(app.path("config/initializers/load_posts_controller.rb"), "PostsController\n")
+        File.write(app.path("config/initializers/load_posts_controller.rb"), "Rails.application.config.to_prepare { PostsController }\n")
 
         assert_speedup do
           assert_success app.spring_test_command, stdout: "0 failures"
@@ -519,7 +521,8 @@ def exec_name
       test "changing the Gemfile works" do
         assert_success %(bin/rails runner 'require "sqlite3"')
 
-        File.write(app.gemfile, app.gemfile.read.gsub(%{gem 'sqlite3'}, %{# gem 'sqlite3'}))
+        File.write(app.gemfile, app.gemfile.read.gsub(%r{gem ['"]sqlite3['"]}, %{# gem "sqlite3"}))
+        puts app.gemfile.read
         app.await_reload
 
         assert_failure %(bin/rails runner 'require "sqlite3"'), stderr: "sqlite3"
@@ -531,7 +534,7 @@ def exec_name
 
         assert_success %(bin/rails runner 'require "sqlite3"')
 
-        File.write(app.gems_rb, app.gems_rb.read.sub(%{gem 'sqlite3'}, %{# gem 'sqlite3'}))
+        File.write(app.gems_rb, app.gems_rb.read.gsub(%r{gem ['"]sqlite3['"]}, %{# gem "sqlite3"}))
         app.await_reload
 
         assert_failure %(bin/rails runner 'require "sqlite3"'), stderr: "sqlite3"