From 4758bbf1125f76ea8cb36ea05bb86be277c118fe Mon Sep 17 00:00:00 2001 From: Matt Jankowski Date: Mon, 2 Sep 2024 16:25:41 -0400 Subject: [PATCH] Drop support for rails versions < 7 in scaffold generator --- lib/generators/rspec/scaffold/templates/index_spec.rb | 2 +- spec/generators/rspec/scaffold/scaffold_generator_spec.rb | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/generators/rspec/scaffold/templates/index_spec.rb b/lib/generators/rspec/scaffold/templates/index_spec.rb index 627b475cf..ed07d3fda 100644 --- 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 index 4e02682e3..62e6db5ef 100644 --- 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