rspec-rails 6.0.1 → 6.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5168244eb73c17800e3ab180f39a65e3400e31fd559cb4f9d44f132f4cecd7f5
-  data.tar.gz: e11a77cd0bb1dca2d8f4ad2c1e521e6f7e25fd7d73f564aeaa570bdcd6dbf59c
+  metadata.gz: 6cc4960b18d7043396b3d315d96dc7646ba74726e3300792f014426b45223294
+  data.tar.gz: 571e7d23f8907eddb31b5bf31a84b2e08446b4fa47720fffe824def4ffad7256
 SHA512:
-  metadata.gz: 218fc008c49a73cde670d9b1141d47e4b5541ec409fee39dfe5ba864613a5c02862139a55647ef92032eebf2e429597e4e202376e4529761494250efe50f98e6
-  data.tar.gz: ef02cdf73abce39f27b84b26f43b40c102a9ba52893de8831666c1f1688ee588320998155c88a8284e576a2a53b76eb29e4be8ef62c232382da46e946dec5ca1
+  metadata.gz: de670f309abdc64066d5e813ae24df0729ad37277646092c696ac8c2f87ad173bbd6c37f89b46870a8f03cb1ba1eed72e58e06f98503f92841f7a106faf92474
+  data.tar.gz: 04eee3afe0bd756a9098faa0593b9761f99582d32d39f024dcf61d461075eda49b121230918f5bc994004d7fbd7bdb4d70049fc784e859b595ece7d18816266e

data/Changelog.md

@@ -1,15 +1,27 @@
 ### Development
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.0...6-0-maintenance)
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.2...6-0-maintenance)
+
+### 6.0.2 / 2023-05-04
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.1...v6.0.2)
+
+Bug Fixes:
+
+* Fix ActionView::PathSet when `render_views` is off for Rails 7.1.
+  (Eugene Kenny, Iliana, #2631)
+* Support Rails 7.1's `#fixtures_paths` in example groups (removes a deprecation warning).
+  (Nicholas Simmons, #2664)
+* Fix `have_enqueued_job` to properly detect enqueued jobs when other jobs were
+  performed inside the expectation block. (Slava Kardakov, Phil Pirozhkov, #2573)
 
 ### 6.0.1 / 2022-10-18
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.0...6.0.1)
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v6.0.0...v6.0.1)
 
 Bug Fixes:
 
 * Prevent tagged logged support in Rails 7 calling `#name`. (Jon Rowe, #2625)
 
 ### 6.0.0 / 2022-10-10
-[Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.1.2...6.0.0)
+[Full Changelog](https://github.com/rspec/rspec-rails/compare/v5.1.2...v6.0.0)
 
 Enhancements:
 

data/README.md

@@ -15,8 +15,6 @@ According to [RSpec Rails new versioning strategy][] use:
 * **[`rspec-rails` 3.x][]** for Rails earlier than 5.0.
 * **[`rspec-rails` 1.x][]** for Rails 2.x.
 
-[Build Status]: https://secure.travis-ci.org/rspec/rspec-rails.svg?branch=main
-[travis-ci]: https://travis-ci.org/rspec/rspec-rails
 [Code Climate]: https://codeclimate.com/github/rspec/rspec-rails.svg
 [code-climate]: https://codeclimate.com/github/rspec/rspec-rails
 [Gem Version]: https://badge.fury.io/rb/rspec-rails.svg
@@ -88,8 +86,8 @@ read the [`rspec-rails` upgrade notes][] to find out what to watch out for.
 
 Be sure to check the general [RSpec upgrade notes][] as well.
 
-[`rspec-rails` upgrade notes]: https://www.relishapp.com/rspec/rspec-rails/docs/upgrade
-[RSpec upgrade notes]: https://relishapp.com/rspec/docs/upgrade
+[`rspec-rails` upgrade notes]: https://rspec.info/features/6-0/rspec-rails/upgrade
+[RSpec upgrade notes]: https://rspec.info/upgrading-from-rspec-2/
 
 ## Usage
 
@@ -183,7 +181,7 @@ rspec ./spec/models/post_spec.rb:3 # Post before publication cannot have comment
 For an in-depth look at the RSpec DSL, including lots of examples,
 read the official Cucumber documentation for [RSpec Core][].
 
-[RSpec Core]: https://relishapp.com/rspec/rspec-core/docs
+[RSpec Core]: https://rspec.info/features/3-12/rspec-core
 
 ### Helpful Rails Matchers
 
@@ -209,23 +207,23 @@ to test the various parts of a Rails system:
 
 Follow the links above for examples of how each matcher is used.
 
-[the matchers that come standard in RSpec]: https://relishapp.com/rspec/rspec-expectations/docs/built-in-matchers
-[`be_a_new`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/be-a-new-matcher
-[`render_template`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/render-template-matcher
-[`redirect_to`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/redirect-to-matcher
-[`route_to`]: https://relishapp.com/rspec/rspec-rails/docs/routing-specs/route-to-matcher
-[`be_routable`]: https://relishapp.com/rspec/rspec-rails/docs/routing-specs/be-routable-matcher
-[`have_http_status`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/have-http-status-matcher
-[`match_array`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/activerecord-relation-match-array
-[`have_been_enqueued`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/have-been-enqueued-matcher
-[`have_enqueued_job`]: https://relishapp.com/rspec/rspec-rails/docs/matchers/have-enqueued-job-matcher
+[the matchers that come standard in RSpec]: https://rspec.info/features/3-12/rspec-expectations/built-in-matchers
+[`be_a_new`]: https://rspec.info/features/6-0/rspec-rails/matchers/new-record-matcher
+[`render_template`]: https://rspec.info/features/6-0/rspec-rails/matchers/render-template-matcher
+[`redirect_to`]: https://rspec.info/features/6-0/rspec-rails/matchers/redirect-to-matcher
+[`route_to`]: https://rspec.info/features/6-0/rspec-rails/routing-specs/route-to-matcher
+[`be_routable`]: https://rspec.info/features/6-0/rspec-rails/routing-specs/be-routable-matcher
+[`have_http_status`]: https://rspec.info/features/6-0/rspec-rails/matchers/have-http-status-matcher
+[`match_array`]: https://rspec.info/features/6-0/rspec-rails/matchers/relation-match-array
+[`have_been_enqueued`]: https://rspec.info/features/6-0/rspec-rails/matchers/have-been-enqueued-matcher
+[`have_enqueued_job`]: https://rspec.info/features/6-0/rspec-rails/matchers/have-enqueued-job-matcher
 
 ### What else does RSpec Rails add?
 
 For a comprehensive look at RSpec Rails’ features,
 read the [official Cucumber documentation][].
 
-[official Cucumber documentation]: https://relishapp.com/rspec/rspec-rails/docs
+[official Cucumber documentation]: https://rspec.info/features/6-0/rspec-rails
 
 ## What tests should I write?
 
@@ -270,20 +268,20 @@ RSpec.describe User, type: :model do
 ...
 ```
 
-[request]: https://relishapp.com/rspec/rspec-rails/docs/request-specs/request-spec
-[feature]: https://www.relishapp.com/rspec/rspec-rails/docs/feature-specs/feature-spec
-[system]: https://relishapp.com/rspec/rspec-rails/docs/system-specs/system-spec
-[model]: https://www.relishapp.com/rspec/rspec-rails/docs/model-specs
-[controller]: https://www.relishapp.com/rspec/rspec-rails/docs/controller-specs
-[mailer]: https://relishapp.com/rspec/rspec-rails/docs/mailer-specs
-[job]: https://relishapp.com/rspec/rspec-rails/docs/job-specs/job-spec
-[view]: https://www.relishapp.com/rspec/rspec-rails/docs/view-specs/view-spec
-[routing]: https://www.relishapp.com/rspec/rspec-rails/docs/routing-specs
-[helper]: https://www.relishapp.com/rspec/rspec-rails/docs/helper-specs/helper-spec
+[request]: https://rspec.info/features/6-0/rspec-rails/request-specs/request-spec
+[feature]: https://rspec.info/features/6-0/rspec-rails/feature-specs/feature-spec
+[system]: https://rspec.info/features/6-0/rspec-rails/system-specs/system-specs
+[model]: https://rspec.info/features/6-0/rspec-rails/model-specs
+[controller]: https://rspec.info/features/6-0/rspec-rails/controller-specs
+[mailer]: https://rspec.info/features/6-0/rspec-rails/mailer-specs
+[job]: https://rspec.info/features/6-0/rspec-rails/job-specs/job-spec
+[view]: https://rspec.info/features/6-0/rspec-rails/view-specs/view-spec
+[routing]: https://rspec.info/features/6-0/rspec-rails/routing-specs
+[helper]: https://rspec.info/features/6-0/rspec-rails/helper-specs/helper-spec
 [`ActionDispatch::IntegrationTest`]: https://api.rubyonrails.org/classes/ActionDispatch/IntegrationTest.html
 [`ActionDispatch::SystemTestCase`]: https://api.rubyonrails.org/classes/ActionDispatch/SystemTestCase.html
 [`ActionController::TestCase`]: https://api.rubyonrails.org/classes/ActionController/TestCase.html
-[in the appropriate folder]: https://relishapp.com/rspec/rspec-rails/docs/directory-structure
+[in the appropriate folder]: https://rspec.info/features/6-0/rspec-rails/directory-structure
 
 ### System specs, feature specs, request specs–what’s the difference?
 
@@ -366,10 +364,10 @@ you can run the specs and Cucumber features, or submit a pull request.
 
 ### RSpec base libraries
 
-* <https://github.com/rspec/rspec>
-* <https://github.com/rspec/rspec-core>
-* <https://github.com/rspec/rspec-expectations>
-* <https://github.com/rspec/rspec-mocks>
+* https://github.com/rspec/rspec
+* https://github.com/rspec/rspec-core
+* https://github.com/rspec/rspec-expectations
+* https://github.com/rspec/rspec-mocks
 
 ### Recommended third-party extensions
 

data/lib/generators/rspec/install/templates/spec/rails_helper.rb

@@ -68,7 +68,7 @@ RSpec.configure do |config|
   #     end
   #
   # The different available types are documented in the features, such as in
-  # https://relishapp.com/rspec/rspec-rails/docs
+  # https://rspec.info/features/6-0/rspec-rails
   config.infer_spec_type_from_file_location!
 
   # Filter lines from Rails gems in backtraces.

data/lib/rspec/rails/fixture_support.rb

@@ -21,7 +21,12 @@ module RSpec
           if RSpec.configuration.use_active_record?
             include Fixtures
 
-            self.fixture_path = RSpec.configuration.fixture_path
+            # TestFixtures#fixture_path is deprecated and will be removed in Rails 7.2
+            if respond_to?(:fixture_paths=)
+              fixture_paths << RSpec.configuration.fixture_path
+            else
+              self.fixture_path = RSpec.configuration.fixture_path
+            end
             self.use_transactional_tests = RSpec.configuration.use_transactional_fixtures
             self.use_instantiated_fixtures = RSpec.configuration.use_instantiated_fixtures
 

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

@@ -230,11 +230,11 @@ module RSpec
           def matches?(proc)
             raise ArgumentError, "have_enqueued_job and enqueue_job only support block expectations" unless Proc === proc
 
-            original_enqueued_jobs_count = queue_adapter.enqueued_jobs.count
+            original_enqueued_jobs = Set.new(queue_adapter.enqueued_jobs)
             proc.call
-            in_block_jobs = queue_adapter.enqueued_jobs.drop(original_enqueued_jobs_count)
+            enqueued_jobs = Set.new(queue_adapter.enqueued_jobs)
 
-            check(in_block_jobs)
+            check(enqueued_jobs - original_enqueued_jobs)
           end
 
           def does_not_match?(proc)

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 = '6.0.1'
+      STRING = '6.0.2'
     end
   end
 end

data/lib/rspec/rails/view_rendering.rb

@@ -71,7 +71,15 @@ module RSpec
         # templates with modified source
         #
         # @private
-        class ResolverDecorator
+        class ResolverDecorator < ::ActionView::Resolver
+          (::ActionView::Resolver.instance_methods - Object.instance_methods).each do |method|
+            undef_method method
+          end
+
+          (::ActionView::Resolver.methods - Object.methods).each do |method|
+            singleton_class.undef_method method
+          end
+
           def initialize(resolver)
             @resolver = resolver
           end
@@ -119,11 +127,11 @@ module RSpec
       # @private
       module EmptyTemplates
         def prepend_view_path(new_path)
-          lookup_context.view_paths.unshift(*_path_decorator(*new_path))
+          super(_path_decorator(*new_path))
         end
 
         def append_view_path(new_path)
-          lookup_context.view_paths.push(*_path_decorator(*new_path))
+          super(_path_decorator(*new_path))
         end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-rails
 version: !ruby/object:Gem::Version
-  version: 6.0.1
+  version: 6.0.2
 platform: ruby
 authors:
 - David Chelimsky
@@ -44,7 +44,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2022-10-18 00:00:00.000000000 Z
+date: 2023-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack
@@ -94,56 +94,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.11'
+        version: '3.12'
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
@@ -296,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/v6.0.1/Changelog.md
+  changelog_uri: https://github.com/rspec/rspec-rails/blob/v6.0.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