rspec-sleeping_king_studios 2.8.1 → 2.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd26d7230b6ba21fe8db04f56e853295255bc89d7262124421f22f3cf66cb061
-  data.tar.gz: f67b6b6ddd2230663f0b8bcc993418a73d07175916a3fcabe1c152853f0f5a4f
+  metadata.gz: 03545cc0d69863c5f6310c8ed1e5a8c9541bf1d1a0a44649935ab4a1ca578e2e
+  data.tar.gz: 240b273a4ca9e75bd00ccea3c084c47e5eb03ea6e7f4b20bfeb404d49c0e923c
 SHA512:
-  metadata.gz: dc9403a7440e73895753e59ab57b1f595d5ddd5e47c628a61fb56f12980bd0238572449544c82acda3e6260e8a4cf95e20fa472e7a873006c2ab519859faa29a
-  data.tar.gz: 2a525ea9556c622bdad0631559585c562d83e223a8b987236cb7a0a2a22bc055fd1ef65375e5860425fc2d3b543e31a0ae7eb09c4605e31907974e5a741d568e
+  metadata.gz: ac7ba672468c1e1f2a95f0cd3863fdaa5cbf07f1fa86e8e2cf427debf9735fad6899e299a138669e7dd362d017257013feafa654f5fc1a16f65fd7e37b1796a0
+  data.tar.gz: 79d398756f2a19af6885906b4ad57fe064a9393fec2b0c6fbd1cdef6827f4c029c2bb71aa688e804c25f663ad9d9816d7d982bfb0b2c3521889d76cbf564a02e

data/CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## 2.8.2
+
+### Deferred Examples
+
+Fixed behavior of deferred examples when defining and including deferred examples in the same scope.
+
+### Matchers
+
+Fixed `HaveAliasedMethod` matching when the original method is from an included module.
+
 ## 2.8.1
 
 ### Matchers

data/lib/rspec/sleeping_king_studios/deferred/dsl/shared_examples.rb

@@ -78,18 +78,27 @@ module RSpec::SleepingKingStudios::Deferred::Dsl # rubocop:disable Style/Documen
     #
     #     @return [void]
 
+    # @!macro define_included_examples_method
+    define_included_examples_method :finclude_deferred
+
     # @!macro define_included_examples_method
     define_included_examples_method :finclude_examples
 
     # @!macro define_included_examples_method
     define_included_examples_method :fwrap_context
 
+    # @!macro define_included_examples_method
+    define_included_examples_method :fwrap_deferred
+
     # @!macro define_included_examples_method
     define_included_examples_method :fwrap_examples
 
     # @!macro define_included_examples_method
     define_included_examples_method :include_context
 
+    # @!macro define_included_examples_method
+    define_included_examples_method :include_deferred
+
     # @!macro define_included_examples_method
     define_included_examples_method :include_examples
 
@@ -111,15 +120,24 @@ module RSpec::SleepingKingStudios::Deferred::Dsl # rubocop:disable Style/Documen
     # @!macro define_included_examples_method
     define_included_examples_method :wrap_context
 
+    # @!macro define_included_examples_method
+    define_included_examples_method :wrap_deferred
+
     # @!macro define_included_examples_method
     define_included_examples_method :wrap_examples
 
+    # @!macro define_included_examples_method
+    define_included_examples_method :xinclude_deferred
+
     # @!macro define_included_examples_method
     define_included_examples_method :xinclude_examples
 
     # @!macro define_included_examples_method
     define_included_examples_method :xwrap_context
 
+    # @!macro define_included_examples_method
+    define_included_examples_method :xwrap_deferred
+
     # @!macro define_included_examples_method
     define_included_examples_method :xwrap_examples
   end

data/lib/rspec/sleeping_king_studios/deferred/examples.rb

@@ -73,7 +73,6 @@ module RSpec::SleepingKingStudios::Deferred
       other.extend  RSpec::SleepingKingStudios::Deferred::Definitions
       other.extend  RSpec::SleepingKingStudios::Deferred::Dsl
       other.include RSpec::SleepingKingStudios::Deferred::Provider
-      other.include RSpec::SleepingKingStudios::Deferred::Consumer
 
       location = caller_locations(1, 1).first
 

data/lib/rspec/sleeping_king_studios/deferred.rb

@@ -71,7 +71,7 @@ module RSpec::SleepingKingStudios
         return false unless example_group.is_a?(Module)
         return false if example_group.is_a?(Class)
 
-        example_group < RSpec::SleepingKingStudios::Deferred::Consumer
+        example_group < RSpec::SleepingKingStudios::Deferred::Examples
       end
 
       def each_ancestor_group_for(example, &) # rubocop:disable Metrics/MethodLength

data/lib/rspec/sleeping_king_studios/matchers/built_in/include_matcher.rb

@@ -53,7 +53,7 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
     # @api private
     #
     # @return [Boolean]
-    def does_not_match?(actual) # rubocop:disable Naming/PredicateName
+    def does_not_match?(actual) # rubocop:disable Naming/PredicatePrefix
       @actual = actual
 
       perform_match(actual, &:!)
@@ -159,7 +159,7 @@ module RSpec::SleepingKingStudios::Matchers::BuiltIn
       excluded_items << expected_item
     end
 
-    def perform_match(actual, &)
+    def perform_match(actual, &) # rubocop:disable Naming/PredicateMethod
       @actual = actual
       @divergent_items = find_excluded_items(&)
       actual.respond_to?(:include?) && @divergent_items.empty?

data/lib/rspec/sleeping_king_studios/matchers/core/deep_matcher.rb

@@ -32,7 +32,7 @@ module RSpec::SleepingKingStudios::Matchers::Core
     #   expectation, otherwise true.
     #
     # @see #matches?
-    def does_not_match?(actual) # rubocop:disable Metrics/MethodLength, Naming/PredicateName
+    def does_not_match?(actual) # rubocop:disable Metrics/MethodLength, Naming/PredicatePrefix
       super
 
       if matcher?(@expected)
@@ -159,7 +159,7 @@ module RSpec::SleepingKingStudios::Matchers::Core
         "#{format_expected(@actual)}`"
     end
 
-    def equality_matcher
+    def equality_matcher # rubocop:disable Naming/PredicateMethod
       matchers_delegate.be == @expected
     end
 

data/lib/rspec/sleeping_king_studios/matchers/core/have_aliased_method_matcher.rb

@@ -16,6 +16,8 @@ module RSpec::SleepingKingStudios::Matchers::Core
     # @param [String, Symbol] original_name The name of the method that is
     #   expected to have an alias.
     def initialize(original_name)
+      super()
+
       @original_name = original_name.intern
     end
 
@@ -40,7 +42,7 @@ module RSpec::SleepingKingStudios::Matchers::Core
     end
 
     # (see BaseMatcher#failure_message)
-    def failure_message
+    def failure_message # rubocop:disable Metrics/MethodLength
       message = "expected #{@actual.inspect} to alias :#{original_name}"
 
       message += " as #{aliased_name.inspect}" if aliased_name
@@ -59,8 +61,8 @@ module RSpec::SleepingKingStudios::Matchers::Core
 
       if @errors[:does_not_alias_method]
         message +=
-          ", but :#{original_name} and :#{aliased_name} are different "\
-          "methods"
+          ", but :#{original_name} and :#{aliased_name} are different " \
+          'methods'
 
         return message
       end
@@ -74,27 +76,30 @@ module RSpec::SleepingKingStudios::Matchers::Core
 
       @errors = {}
 
-      if aliased_name.nil?
-        raise ArgumentError.new('must specify a new method name')
-      end
+      raise ArgumentError, 'must specify a new method name' if aliased_name.nil?
 
       responds_to_methods? && aliases_method?
     end
 
     private
 
-    attr_reader :aliased_name
-
-    attr_reader :original_name
+    attr_reader \
+      :aliased_name,
+      :original_name
 
     def aliases_method?
-      unless @actual.method(original_name) == @actual.method(aliased_name)
-        @errors[:does_not_alias_method] = true
+      original_method = @actual.method(original_name)
+      aliased_method  = @actual.method(aliased_name)
 
-        return false
+      return true if original_method == aliased_method
+
+      if original_method.source_location == aliased_method.source_location
+        return true
       end
 
-      true
+      @errors[:does_not_alias_method] = true
+
+      false
     end
 
     def responds_to_methods?

data/lib/rspec/sleeping_king_studios/version.rb

@@ -13,7 +13,7 @@ module RSpec
       # Minor version.
       MINOR = 8
       # Patch version.
-      PATCH = 1
+      PATCH = 2
       # Prerelease version.
       PRERELEASE = nil
       # Build metadata.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: rspec-sleeping_king_studios
 version: !ruby/object:Gem::Version
-  version: 2.8.1
+  version: 2.8.2
 platform: ruby
 authors:
 - Rob "Merlin" Smith
 bindir: bin
 cert_chain: []
-date: 2025-04-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashdiff
@@ -190,7 +190,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.5
+rubygems_version: 3.6.9
 specification_version: 4
 summary: A collection of RSpec patches and custom matchers.
 test_files: []