Merge pull request #2790 from mjankowski/cell-selector-rails-version

Drop support for rails versions < 7 in scaffold generator
rspec · Sep 2, 2024 · 0beb36e · 0beb36e
1 parent a124bb7
commit 0beb36e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/lib/generators/rspec/scaffold/templates/index_spec.rb b/lib/generators/rspec/scaffold/templates/index_spec.rb
@@ -18,7 +18,7 @@
 
   it "renders a list of <%= ns_table_name %>" do
     render
-    cell_selector = <%= Rails::VERSION::STRING >= '7' ? "'div>p'" : "'tr>td'" %>
+    cell_selector = 'div>p'
 <% for attribute in output_attributes -%>
     assert_select cell_selector, text: Regexp.new(<%= value_for(attribute) %>.to_s), count: 2
 <% end -%>

diff --git a/spec/generators/rspec/scaffold/scaffold_generator_spec.rb b/spec/generators/rspec/scaffold/scaffold_generator_spec.rb
@@ -269,11 +269,7 @@
                              .and(contain(/assign\(:posts, /))
                              .and(contain(/it "renders a list of (.*)"/))
 
-          if ::Rails::VERSION::STRING >= '7.0.0'
-            expect(filename).to contain(/'div>p'/)
-          else
-            expect(filename).to contain(/'tr>td'/)
-          end
+          expect(filename).to contain(/'div>p'/)
         end
       end