Fixed view specs for Rails 7

Author: alpaca-tc

.github/workflows/ci.yml

@@ -28,15 +28,12 @@ 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'
 

lib/generators/rspec/scaffold/templates/index_spec.rb

@@ -18,8 +18,14 @@
 
   it "renders a list of <%= ns_table_name %>" do
     render
+<% if Rails.version >= "7.0.0" %>
+<% for attribute in output_attributes -%>
+    assert_select %{p:contains(<%= raw_value_for(attribute).to_s.inspect %>)}, count: 2
+<% end -%>
+<% else -%>
 <% for attribute in output_attributes -%>
     assert_select "tr>td", text: <%= value_for(attribute) %>.to_s, count: 2
+<% end -%>
 <% end -%>
   end
 end

spec/generators/rspec/scaffold/scaffold_generator_spec.rb

@@ -208,16 +208,28 @@
       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') }
+
+      if Rails.version >= "7.0.0"
+        it { is_expected.to contain('assert_select %{p:contains("2")}, count: 2') }
+        it { is_expected.to contain('assert_select %{p:contains("3")}, count: 2') }
+      else
+        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') }
+      end
     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') }
+
+      if Rails.version >= "7.0.0"
+        it { is_expected.to contain('assert_select %{p:contains("2.5")}, count: 2') }
+        it { is_expected.to contain('assert_select %{p:contains("3.5")}, count: 2') }
+      else
+        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') }
+      end
     end
 
     describe 'with reference attribute' do