rspec-rails 7.0.0 → 7.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e12619053ed39f2f0fed4bc0aed2b2e552e400315663632d97cf9a82e2eaa5d3
-  data.tar.gz: 7bde5b94d9f990a0d9d08143529ce3e25b9df1df2cf62c216515c0cc6e96cd4c
+  metadata.gz: e5f52b2377b281190553090f208b2d03f030aefb03395fb46afd8af1c63df3a1
+  data.tar.gz: 1a7c088f8ee631d5f9756277724554ccc30247719849a1dd0b6d03bfd8279e11
 SHA512:
-  metadata.gz: fa5533f32e4ffaf30b13d83677aff9170bf57c42a2c6ec9a591de3f422f73f719a6b575fb14efe8e54f7b8fbc389aa7c7e0f39710017dc8b02834f8dbb6b0aa3
-  data.tar.gz: '094c02d867dba7258ea54da266403929508f2601c0ba1e8a8c579e01c6a2b200aaa688b5a8fed58145c2bf6cd53ed4799fecba36dc9acdb23e06d75eea5b2323'
+  metadata.gz: 5dbf49c52a590a8ce6d91ced03bfc78ebeb4737b8cfcc11932e8959b38c0428eca4414da31a82172ca965db65fed36e490e8c85e761f1fed0f2ef555b9b75210
+  data.tar.gz: c47326924297943c4d0704f3da54f8ef13a849a73d3a023405cf290347698c0b486a8c692a8774cc022bbf92a80c424197bca1d44a1cd46c1a613cb0ffca3e79

data/Changelog.md

@@ -1,5 +1,15 @@
 ### Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v7.0.0...7-0-maintenance)
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v7.0.1...7-0-maintenance)
+
+### 7.0.1 / 2024-09-03
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v7.0.0...v7.0.1)
+
+Bug Fixes:
+
+* Remove mutation of Rails constant in favour of public api. (Petrik de Heus, #2789)
+* Cleanup Rails scaffold for unsupported versions. (Matt Jankowski, #2790)
+* Remove deprecated scaffold that was unintentionally included in 7.0.0
+  (Jon Rowe, #2791)
 
 ### 7.0.0 / 2024-09-02
 [Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.1.5...v7.0.0)

data/lib/generators/rspec/scaffold/templates/controller_spec.rb

@@ -90,17 +90,10 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     end
 
     context "with invalid params" do
-    <% if Rails.version.to_f < 7.0 %>
-      it "returns a success response (i.e. to display the 'new' template)" do
-        post :create, params: {<%= singular_table_name %>: invalid_attributes}, session: valid_session
-        expect(response).to be_successful
-      end
-    <% else %>
       it "renders a response with 422 status (i.e. to display the 'new' template)" do
         post :create, params: {<%= singular_table_name %>: invalid_attributes}, session: valid_session
         expect(response).to have_http_status(:unprocessable_entity)
       end
-    <% end %>
     end
   end
 
@@ -125,19 +118,11 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
     end
 
     context "with invalid params" do
-    <% if Rails.version.to_f < 7.0 %>
-      it "returns a success response (i.e. to display the 'edit' template)" do
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
-        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: invalid_attributes}, session: valid_session
-        expect(response).to be_successful
-      end
-    <% else %>
       it "renders a response with 422 status (i.e. to display the 'edit' template)" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: invalid_attributes}, session: valid_session
         expect(response).to have_http_status(:unprocessable_entity)
       end
-    <% end %>
     end
   end
 

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

@@ -18,7 +18,7 @@ RSpec.describe "<%= ns_table_name %>/index", <%= type_metatag(:view) %> do
 
   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 -%>

data/lib/generators/rspec/scaffold/templates/request_spec.rb

@@ -83,17 +83,10 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
         }.to change(<%= class_name %>, :count).by(0)
       end
 
-    <% if Rails.version.to_f < 7.0 %>
-      it "renders a successful response (i.e. to display the 'new' template)" do
-        post <%= index_helper %>_url, params: { <%= singular_table_name %>: invalid_attributes }
-        expect(response).to be_successful
-      end
-    <% else %>
       it "renders a response with 422 status (i.e. to display the 'new' template)" do
         post <%= index_helper %>_url, params: { <%= singular_table_name %>: invalid_attributes }
         expect(response).to have_http_status(:unprocessable_entity)
       end
-    <% end %>
     end
   end
 
@@ -119,19 +112,11 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
     end
 
     context "with invalid parameters" do
-    <% if Rails.version.to_f < 7.0 %>
-      it "renders a successful response (i.e. to display the 'edit' template)" do
-        <%= file_name %> = <%= class_name %>.create! valid_attributes
-        patch <%= show_helper %>, params: { <%= singular_table_name %>: invalid_attributes }
-        expect(response).to be_successful
-      end
-    <% else %>
       it "renders a response with 422 status (i.e. to display the 'edit' template)" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
         patch <%= show_helper %>, params: { <%= singular_table_name %>: invalid_attributes }
         expect(response).to have_http_status(:unprocessable_entity)
       end
-    <% end %>
     end
   end
 

data/lib/rspec/rails/example/rails_example_group.rb

@@ -2,10 +2,8 @@
 # suite and ammeter.
 require 'rspec/rails/matchers'
 
-if ::Rails::VERSION::MAJOR >= 7
-  require 'active_support/current_attributes/test_helper'
-  require 'active_support/execution_context/test_helper'
-end
+require 'active_support/current_attributes/test_helper'
+require 'active_support/execution_context/test_helper'
 
 module RSpec
   module Rails
@@ -17,11 +15,9 @@ module RSpec
       include RSpec::Rails::MinitestLifecycleAdapter
       include RSpec::Rails::MinitestAssertionAdapter
       include RSpec::Rails::FixtureSupport
-      if ::Rails::VERSION::MAJOR >= 7
-        include RSpec::Rails::TaggedLoggingAdapter
-        include ActiveSupport::CurrentAttributes::TestHelper
-        include ActiveSupport::ExecutionContext::TestHelper
-      end
+      include RSpec::Rails::TaggedLoggingAdapter
+      include ActiveSupport::CurrentAttributes::TestHelper
+      include ActiveSupport::ExecutionContext::TestHelper
     end
   end
 end

data/lib/rspec/rails/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec Rails.
     module Version
       # Current version of RSpec Rails, in semantic versioning format.
-      STRING = '7.0.0'
+      STRING = '7.0.1'
     end
   end
 end

data/lib/rspec-rails.rb

@@ -22,8 +22,7 @@ module RSpec
         Hash[dirs.map { |d| [d.split('/').last, d] }].each do |type, dir|
           name = type.singularize.capitalize
 
-          ::Rails::CodeStatistics.register_directory "#{name} specs", dir
-          ::Rails::CodeStatistics::TEST_TYPES << "#{name} specs"
+          ::Rails::CodeStatistics.register_directory "#{name} specs", dir, test_directory: true
         end
       end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.0.1
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2024-09-02 00:00:00.000000000 Z
+date: 2024-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -215,7 +215,6 @@ files:
 - lib/generators/rspec/helper/templates/helper_spec.rb
 - lib/generators/rspec/install/install_generator.rb
 - lib/generators/rspec/install/templates/spec/rails_helper.rb
-- lib/generators/rspec/integration/integration_generator.rb
 - lib/generators/rspec/job/job_generator.rb
 - lib/generators/rspec/job/templates/job_spec.rb.erb
 - lib/generators/rspec/mailbox/mailbox_generator.rb
@@ -297,7 +296,7 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-rails/issues
-  changelog_uri: https://github.com/rspec/rspec-rails/blob/v7.0.0/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-rails/blob/v7.0.1/Changelog.md
   documentation_uri: https://rspec.info/documentation/
   mailing_list_uri: https://groups.google.com/forum/#!forum/rspec
   source_code_uri: https://github.com/rspec/rspec-rails

data/lib/generators/rspec/integration/integration_generator.rb

@@ -1,29 +0,0 @@
-require 'generators/rspec'
-require 'rspec/core/warnings'
-
-module Rspec
-  module Generators
-    # @private
-    class IntegrationGenerator < Base
-      class_option :request_specs,
-                   type: :boolean,
-                   default: true,
-                   desc: "Generate request specs"
-
-      source_paths << File.expand_path('../request/templates', __dir__)
-
-      def generate_request_spec
-        return unless options[:request_specs]
-
-        RSpec.warn_deprecation <<-WARNING.gsub(/\s*\|/, ' ')
-          |The integration generator is deprecated
-          |and will be deleted in RSpec-Rails 7.
-          |Please use the request generator instead.
-        WARNING
-
-        template 'request_spec.rb',
-                 target_path('requests', "#{name.underscore.pluralize}_spec.rb")
-      end
-    end
-  end
-end