rspec · petergoldstein · Jan 8, 2022 · Jan 18, 2022 · Jan 23, 2022 · Jan 23, 2022
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -30,6 +30,10 @@ jobs:
       matrix:
        include:
          # Edge Rails (7.1) builds >= 2.7
+         - ruby: 3.1
+           allow_failure: true
+           env:
+             RAILS_VERSION: 'main'
          - ruby: '3.0'
            allow_failure: true
            env:
@@ -41,19 +45,19 @@ jobs:
 
          # Rails 7.0 builds >= 2.7
          - ruby: 3.1
-           allow_failure: true
            env:
              RAILS_VERSION: '~> 7.0.0'
          - ruby: '3.0'
-           allow_failure: true
            env:
              RAILS_VERSION: '~> 7.0.0'
          - ruby: 2.7
-           allow_failure: true
            env:
              RAILS_VERSION: '~> 7.0.0'
 
          # Rails 6.1 builds >= 2.5
+         - ruby: 3.1
+           env:
+             RAILS_VERSION: '~> 6.1.0'
          - ruby: '3.0'
            env:
              RAILS_VERSION: '~> 6.1.0'

diff --git a/Rakefile b/Rakefile
@@ -160,7 +160,7 @@ namespace :no_active_record do
         sh "rm -f #{bindir}/rails"
         sh "bundle exec rails new #{example_app_dir} --no-rc --skip-active-record --skip-javascript --skip-bootsnap " \
            "--skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --skip-spring " \
-           "--template=example_app_generator/generate_app.rb"
+           "--skip-action-text --template=example_app_generator/generate_app.rb"
 
         in_example_app(app_dir: example_app_dir) do
           sh "./ci_retry_bundle_install.sh 2>&1"

diff --git a/example_app_generator/generate_action_mailer_specs.rb b/example_app_generator/generate_action_mailer_specs.rb
@@ -31,6 +31,7 @@
   if skip_active_record?
     comment_lines 'spec/support/default_preview_path', /active_record/
     comment_lines 'spec/support/default_preview_path', /active_storage/
+    comment_lines 'spec/support/default_preview_path', /action_mailbox/
   end
   copy_file 'spec/verify_mailer_preview_path_spec.rb'
 end
diff --git a/example_app_generator/generate_stuff.rb b/example_app_generator/generate_stuff.rb
@@ -167,4 +167,5 @@ def using_source_path(path)
 gsub_file 'spec/controllers/uploads_controller_spec.rb',
           'skip("Add a hash of attributes valid for your model")',
           '{}'
+
 final_tasks
diff --git a/example_app_generator/no_active_record/app/models/in_memory/model.rb b/example_app_generator/no_active_record/app/models/in_memory/model.rb
@@ -1,5 +1,7 @@
 raise "ActiveRecord is defined but should not be!" if defined?(::ActiveRecord)
 
+require 'active_model'
+
 module InMemory
   module Persistence
     def all

diff --git a/example_app_generator/spec/support/default_preview_path b/example_app_generator/spec/support/default_preview_path
@@ -26,6 +26,11 @@ require_file_stub 'config/environment' do
     require "action_controller/railtie"
     require "action_mailer/railtie" unless ENV['NO_ACTION_MAILER']
     require "action_view/railtie"
+    if Rails::VERSION::STRING >= '6'
+      require "action_cable/engine"
+      require "active_job/railtie"
+      require "action_mailbox/engine"
+    end
 
     # Require the gems listed in Gemfile, including any gems
     # you've limited to :test, :development, or :production.
@@ -44,6 +49,8 @@ require_file_stub 'config/environment' do
         if ENV['SHOW_PREVIEWS']
           config.action_mailer.show_previews = (ENV['SHOW_PREVIEWS'] == 'true')
         end
+
+        config.active_record.legacy_connection_handling = false if Rails::VERSION::STRING >= '7'
       end
     end
 

diff --git a/example_app_generator/spec/verify_mailer_preview_path_spec.rb b/example_app_generator/spec/verify_mailer_preview_path_spec.rb
@@ -22,6 +22,9 @@ def capture_exec(*ops)
     out =  io.readlines
               .reject { |line| line =~ /warning: circular argument reference/ }
               .reject { |line| line =~ /Gem::Specification#rubyforge_project=/ }
+              .reject { |line| line =~ /DEPRECATION WARNING/ }
+              .reject { |line| line =~ /warning: previous/ }
+              .reject { |line| line =~ /warning: already/ }
               .join
               .chomp
     CaptureExec.new(out, $?.exitstatus)
@@ -108,6 +111,8 @@ def have_no_preview
       end
 
       it 'handles action mailer not being available' do
+        skip "Rails 7 forces eager loading on CI, loads app/mailers and fails" if Rails::VERSION::STRING.to_f >= 7.0
+
         expect(
           capture_exec(
             custom_env.merge('NO_ACTION_MAILER' => 'true'),

diff --git a/lib/generators/rspec/scaffold/templates/index_spec.rb b/lib/generators/rspec/scaffold/templates/index_spec.rb
@@ -18,8 +18,9 @@
 
   it "renders a list of <%= ns_table_name %>" do
     render
+    cell_selector = Rails::VERSION::STRING >= '7' ? 'div>p' : 'tr>td'
 <% for attribute in output_attributes -%>
-    assert_select "tr>td", text: <%= value_for(attribute) %>.to_s, count: 2
+    assert_select cell_selector, text: Regexp.new(<%= value_for(attribute) %>.to_s), count: 2
 <% end -%>
   end
 end
diff --git a/lib/rspec/rails/feature_check.rb b/lib/rspec/rails/feature_check.rb
@@ -43,8 +43,11 @@ def has_action_mailbox?
         defined?(::ActionMailbox)
       end
 
-      def ruby_3_1?
-        RUBY_VERSION >= "3.1"
+      # TODO: add a self-explanatory method name. See https://github.com/rspec/rspec-rails/pull/2552#issuecomment-1009508693 for hints
+      def rails_6_1_and_ruby_3_1?
+        return false if RUBY_VERSION < "3.1"
+
+        ::Rails::VERSION::STRING >= "6.1" && ::Rails::VERSION::STRING < "7"
       end
 
       def type_metatag(type)

diff --git a/lib/rspec/rails/matchers/have_enqueued_mail.rb b/lib/rspec/rails/matchers/have_enqueued_mail.rb
@@ -102,7 +102,7 @@ def process_arguments(job, given_mail_args)
 
         def use_given_mail_args?(job)
           return true if FeatureCheck.has_action_mailer_parameterized? && job[:job] <= ActionMailer::Parameterized::DeliveryJob
-          return false if FeatureCheck.ruby_3_1?
+          return false if FeatureCheck.rails_6_1_and_ruby_3_1?
 
           !(FeatureCheck.has_action_mailer_unified_delivery? && job[:job] <= ActionMailer::MailDeliveryJob)
         end

diff --git a/spec/generators/rspec/scaffold/scaffold_generator_spec.rb b/spec/generators/rspec/scaffold/scaffold_generator_spec.rb
@@ -208,16 +208,16 @@
       before { run_generator %w[posts upvotes:integer downvotes:integer] }
       subject { file("spec/views/posts/index.html.erb_spec.rb") }
       it { is_expected.to exist }
-      it { is_expected.to contain('assert_select "tr>td", text: 2.to_s, count: 2') }
-      it { is_expected.to contain('assert_select "tr>td", text: 3.to_s, count: 2') }
+      it { is_expected.to contain('assert_select cell_selector, text: Regexp.new(2.to_s), count: 2') }
+      it { is_expected.to contain('assert_select cell_selector, text: Regexp.new(3.to_s), count: 2') }
     end
 
     describe 'with multiple float attributes index' do
       before { run_generator %w[posts upvotes:float downvotes:float] }
       subject { file("spec/views/posts/index.html.erb_spec.rb") }
       it { is_expected.to exist }
-      it { is_expected.to contain('assert_select "tr>td", text: 2.5.to_s, count: 2') }
-      it { is_expected.to contain('assert_select "tr>td", text: 3.5.to_s, count: 2') }
+      it { is_expected.to contain('assert_select cell_selector, text: Regexp.new(2.5.to_s), count: 2') }
+      it { is_expected.to contain('assert_select cell_selector, text: Regexp.new(3.5.to_s), count: 2') }
     end
 
     describe 'with reference attribute' do