rspec-rails 5.0.3 → 5.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 829e7ddefdd0596e8b0015b56de40850a711f970ed3bebbe541f34a415b46a40
-  data.tar.gz: cb3a76cc3cb01705a92c1679473d3a0a488041fb47933a513bee90c91fc2da5c
+  metadata.gz: be221e5df3386cb55e14f8047e02628bc11098596dcce06749701ac0b7497782
+  data.tar.gz: 56b12531541ff18599c13618ba2937859bb4cd860cc814b3350046ec4949e870
 SHA512:
-  metadata.gz: f84c6e4ad2c9d546c3d305daf8c6ef4a65f3559fdbea88bd148e3f25503e0b9c1bd520df473a6c0ae2579a40bce2d937edbb7e7b6cada7ad43320f7c7a124303
-  data.tar.gz: d6e2f6ad0a19e7b821149c0df545f39a0529fd8660bac992b365ec60015a1e2cb0aec7f54cd99ebd8ee6a60eead7aa9fead5c5ade5d7df380304268d630ecc2f
+  metadata.gz: a1786502c478ab9de29fbd59ce16371178776a7283698ba048b203f62aa614fc6c28e4c72b5064595f4eacd2cf309443de8d0d6803ac604e9d11a641c6f86c4b
+  data.tar.gz: 5860654b1926c2f2cdd998d2b84ac075167f7107bd687b74dae5bb9e17d7e76ef6b0c96dd022ec7a9be5dc0fe008e845808187080e97b400bec18b35d1872e76

data/Changelog.md

@@ -1,5 +1,28 @@
 ### Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.0.3...5-0-maintenance)
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.1.1...5-1-maintenance)
+
+Bug Fixes:
+
+* Fix controller scaffold templates parameter name.  (Taketo Takashima, #2591)
+* Include generator specs in the inferred list of specs. (Jason Karns, #2597)
+
+### 5.1.1 / 2022-03-07
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.1.0...v5.1.1)
+
+Bug Fixes:
+
+* Properly handle global id serialised arguments in `have_enqueued_mail`.
+  (Jon Rowe, #2578)
+
+### 5.1.0 / 2022-01-26
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.0.3...v5.1.0)
+
+Enhancements:
+
+* Make the API request scaffold template more consistent and compatible with
+  Rails 6.1. (Naoto Hamada, #2484)
+* Change the scaffold `rails_helper.rb` template to use `require_relative`.
+  (Jon Dufresne, #2528)
 
 ### 5.0.3 / 2022-01-26
 [Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.0.2...v5.0.3)

data/README.md

@@ -30,8 +30,8 @@ According to [RSpec Rails new versioning strategy][] use:
 
 ## Installation
 
-**IMPORTANT** This README / branch refers to the 5.0.x series of releases.
-See the [`main` branch on Github](https://github.com/rspec/rspec-rails/tree/main) for more up to date releases.
+**IMPORTANT** This README / branch refers to the current development build.
+See the [`5-0-maintenance` branch on Github](https://github.com/rspec/rspec-rails/tree/5-0-maintenance) if you want or require the latest stable release.
 
 1. Add `rspec-rails` to **both** the `:development` and `:test` groups
    of your app’s `Gemfile`:

data/lib/generators/rspec/scaffold/scaffold_generator.rb

@@ -127,6 +127,10 @@ module Rspec
       def banner
         self.class.banner
       end
+
+      def show_helper(resource_name = file_name)
+        "#{singular_route_name}_url(#{resource_name})"
+      end
     end
   end
 end

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

@@ -100,7 +100,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
 
       it "renders a JSON response with the <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: valid_attributes}, session: valid_session
+        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: new_attributes}, session: valid_session
         expect(response).to have_http_status(:ok)
         expect(response.content_type).to eq('application/json')
       end

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

@@ -46,7 +46,7 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
   describe "GET /show" do
     it "renders a successful response" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
-      get <%= show_helper.tr('@', '') %>, as: :json
+      get <%= show_helper %>, as: :json
       expect(response).to be_successful
     end
   end
@@ -80,7 +80,7 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
         post <%= index_helper %>_url,
              params: { <%= singular_table_name %>: invalid_attributes }, headers: valid_headers, as: :json
         expect(response).to have_http_status(:unprocessable_entity)
-        expect(response.content_type).to eq("application/json")
+        expect(response.content_type).to match(a_string_including("application/json"))
       end
     end
   end
@@ -93,7 +93,7 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
 
       it "updates the requested <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        patch <%= show_helper.tr('@', '') %>,
+        patch <%= show_helper %>,
               params: { <%= singular_table_name %>: new_attributes }, headers: valid_headers, as: :json
         <%= file_name %>.reload
         skip("Add assertions for updated state")
@@ -101,7 +101,7 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
 
       it "renders a JSON response with the <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        patch <%= show_helper.tr('@', '') %>,
+        patch <%= show_helper %>,
               params: { <%= singular_table_name %>: new_attributes }, headers: valid_headers, as: :json
         expect(response).to have_http_status(:ok)
         expect(response.content_type).to match(a_string_including("application/json"))
@@ -111,10 +111,10 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
     context "with invalid parameters" do
       it "renders a JSON response with errors for the <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        patch <%= show_helper.tr('@', '') %>,
+        patch <%= show_helper %>,
               params: { <%= singular_table_name %>: invalid_attributes }, headers: valid_headers, as: :json
         expect(response).to have_http_status(:unprocessable_entity)
-        expect(response.content_type).to eq("application/json")
+        expect(response.content_type).to match(a_string_including("application/json"))
       end
     end
   end
@@ -123,7 +123,7 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
     it "destroys the requested <%= singular_table_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {
-        delete <%= show_helper.tr('@', '') %>, headers: valid_headers, as: :json
+        delete <%= show_helper %>, headers: valid_headers, as: :json
       }.to change(<%= class_name %>, :count).by(-1)
     end
   end

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

@@ -112,7 +112,7 @@ RSpec.describe <%= controller_class_name %>Controller, <%= type_metatag(:control
 
       it "redirects to the <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: valid_attributes}, session: valid_session
+        put :update, params: {id: <%= file_name %>.to_param, <%= singular_table_name %>: new_attributes}, session: valid_session
         expect(response).to redirect_to(<%= file_name %>)
       end
     end

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

@@ -18,6 +18,7 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
     include Engine.routes.url_helpers
   <% end -%>
 
+  # This should return the minimal set of attributes required to create a valid
   # <%= class_name %>. As you add validations to <%= class_name %>, be sure to
   # adjust the attributes here as well.
   let(:valid_attributes) {
@@ -41,7 +42,7 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
   describe "GET /show" do
     it "renders a successful response" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
-      get <%= show_helper.tr('@', '') %>
+      get <%= show_helper %>
       expect(response).to be_successful
     end
   end
@@ -54,9 +55,9 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
   end
 
   describe "GET /edit" do
-    it "render a successful response" do
+    it "renders a successful response" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
-      get <%= edit_helper.tr('@','') %>
+      get <%= edit_helper %>
       expect(response).to be_successful
     end
   end
@@ -71,7 +72,7 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
 
       it "redirects to the created <%= singular_table_name %>" do
         post <%= index_helper %>_url, params: { <%= singular_table_name %>: valid_attributes }
-        expect(response).to redirect_to(<%= show_helper.gsub("\@#{file_name}", class_name+".last") %>)
+        expect(response).to redirect_to(<%= show_helper(class_name+".last") %>)
       end
     end
 
@@ -97,14 +98,14 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
 
       it "updates the requested <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        patch <%= show_helper.tr('@', '') %>, params: { <%= singular_table_name %>: new_attributes }
+        patch <%= show_helper %>, params: { <%= singular_table_name %>: new_attributes }
         <%= file_name %>.reload
         skip("Add assertions for updated state")
       end
 
       it "redirects to the <%= singular_table_name %>" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        patch <%= show_helper.tr('@', '') %>, params: { <%= singular_table_name %>: new_attributes }
+        patch <%= show_helper %>, params: { <%= singular_table_name %>: new_attributes }
         <%= file_name %>.reload
         expect(response).to redirect_to(<%= singular_table_name %>_url(<%= file_name %>))
       end
@@ -113,7 +114,7 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
     context "with invalid parameters" do
       it "renders a successful response (i.e. to display the 'edit' template)" do
         <%= file_name %> = <%= class_name %>.create! valid_attributes
-        patch <%= show_helper.tr('@', '') %>, params: { <%= singular_table_name %>: invalid_attributes }
+        patch <%= show_helper %>, params: { <%= singular_table_name %>: invalid_attributes }
         expect(response).to be_successful
       end
     end
@@ -123,13 +124,13 @@ RSpec.describe "/<%= name.underscore.pluralize %>", <%= type_metatag(:request) %
     it "destroys the requested <%= singular_table_name %>" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
       expect {
-        delete <%= show_helper.tr('@', '') %>
+        delete <%= show_helper %>
       }.to change(<%= class_name %>, :count).by(-1)
     end
 
     it "redirects to the <%= table_name %> list" do
       <%= file_name %> = <%= class_name %>.create! valid_attributes
-      delete <%= show_helper.tr('@', '') %>
+      delete <%= show_helper %>
       expect(response).to redirect_to(<%= index_helper %>_url)
     end
   end

data/lib/rspec/rails/configuration.rb

@@ -28,6 +28,7 @@ module RSpec
     DIRECTORY_MAPPINGS = {
       channel:    %w[spec channels],
       controller: %w[spec controllers],
+      generator:  %w[spec generator],
       helper:     %w[spec helpers],
       job:        %w[spec jobs],
       mailer:     %w[spec mailers],

data/lib/rspec/rails/matchers/have_enqueued_mail.rb

@@ -145,7 +145,7 @@ module RSpec
           if hash.key?("_aj_ruby2_keywords")
             keywords = hash["_aj_ruby2_keywords"]
 
-            original_hash = keywords.each_with_object({}) { |new_hash, keyword| new_hash[keyword.to_sym] = hash[keyword] }
+            original_hash = keywords.each_with_object({}) { |keyword, new_hash| new_hash[keyword.to_sym] = hash[keyword] }
 
             args + [original_hash]
           elsif hash.key?(:args) && hash.key?(:params)

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 = '5.0.3'
+      STRING = '5.1.2'
     end
   end
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 5.0.3
+  version: 5.1.2
 platform: ruby
 authors:
 - David Chelimsky
 - Andy Lindeman
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain:
 - |
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2022-01-26 00:00:00.000000000 Z
+date: 2022-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -308,11 +308,11 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/rspec/rspec-rails/issues
-  changelog_uri: https://github.com/rspec/rspec-rails/blob/v5.0.3/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-rails/blob/v5.1.2/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
-post_install_message:
+post_install_message: 
 rdoc_options:
 - "--charset=UTF-8"
 require_paths:
@@ -328,8 +328,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: RSpec for Rails
 test_files: []