rspec-mocks 3.6.0.beta1 → 3.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8dc8b700a6acee68e71a9a6d76459b12a975c818
-  data.tar.gz: b6a18ff9aed7115428b4011af1a7d060a856fef9
+  metadata.gz: 0194543e201f9d8cb6c477dcdeaf678b3f5ce442
+  data.tar.gz: bd1e7cae196ec0d61c4dd714c4371b27e3d8c9f1
 SHA512:
-  metadata.gz: c78d4ae88eb1df7fc1b6d5f91da6f14723a9033cbefe482673bed82a4dd9f74042ced61b9c06301f8d159b42401adaaf85a071884f56661b7a35c2f8308976b5
-  data.tar.gz: 49a87bccd1d7d8bbe7b60225dd353bee56d41d2603e1060f887d9f70379fe15056ea8f7f417593a88a62dfe210b954d057d4b255bbf7600bda1894e8472551f2
+  metadata.gz: 13bfadb0ccb5f89efaa761ab93de080a4d9da94568965e55b03c53e104fb57ec283311e4395ecdb497fcff11f648b6649daaf117b1e486eced3040b1b8b04268
+  data.tar.gz: 627998b4615c8de8e236ac46788da589e9f16acbcfe75d310af7119dff3ee69a0e1eb2981b9947e2b102d546a0c5b2fd06780fc191fb3b2362b102dbb16dc400

data/Changelog.md

@@ -1,3 +1,24 @@
+### 3.6.0 / 2017-05-04
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.6.0.beta2...v3.6.0)
+
+Bug Fixes:
+
+* Fix "instance variable @color not initialized" warning when using
+  rspec-mocks without rspec-core. (Myron Marston, #1142)
+* Restore aliased module methods properly when stubbing on 1.8.7.
+  (Samuel Giddins, #1144)
+* Allow a message chain expectation to be constrained by argument(s).
+  (Jon Rowe, #1156)
+
+### 3.6.0.beta2 / 2016-12-12
+[Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.6.0.beta1...v3.6.0.beta2)
+
+Enhancements:
+
+* Add new `without_partial_double_verification { }` API that lets you
+  temporarily turn off partial double verification for an example.
+  (Jon Rowe, #1104)
+
 ### 3.6.0.beta1 / 2016-10-09
 [Full Changelog](http://github.com/rspec/rspec-mocks/compare/v3.5.0...v3.6.0.beta1)
 

data/README.md

@@ -101,6 +101,21 @@ that iterates through them:
 order.calculate_total_price(double(:price => 1.99), double(:price => 2.99))
 ```
 
+### Stubbing a chain of methods
+
+You can use `receive_message_chain` in place of `receive` to stub a chain of messages:
+
+```ruby
+allow(double).to receive_message_chain("foo.bar") { :baz }
+allow(double).to receive_message_chain(:foo, :bar => :baz)
+allow(double).to receive_message_chain(:foo, :bar) { :baz }
+
+# Given any of the above forms:
+double.foo.bar # => :baz
+```
+
+Chains can be arbitrarily long, which makes it quite painless to violate the Law of Demeter in violent ways, so you should consider any use of `receive_message_chain` a code smell. Even though not all code smells indicate real problems (think fluent interfaces), `receive_message_chain` still results in brittle examples. For example, if you write `allow(foo).to receive_message_chain(:bar, :baz => 37)` in a spec and then the implementation calls `foo.baz.bar`, the stub will not work.
+
 ## Consecutive return values
 
 When a stub might be invoked more than once, you can provide additional

data/lib/rspec/mocks/any_instance/expect_chain_chain.rb

@@ -23,11 +23,7 @@ module RSpec
         end
 
         def invocation_order
-          @invocation_order ||= {
-            :and_return => [nil],
-            :and_raise => [nil],
-            :and_yield => [nil]
-          }
+          EmptyInvocationOrder
         end
       end
     end

data/lib/rspec/mocks/any_instance/expectation_chain.rb

@@ -35,12 +35,14 @@ module RSpec
           me
         end
 
-        def invocation_order
-          @invocation_order ||= {
-            :with => [nil],
+        ExpectationInvocationOrder =
+          {
             :and_return => [:with, nil],
-            :and_raise => [:with, nil]
-          }
+            :and_raise => [:with, nil],
+          }.freeze
+
+        def invocation_order
+          ExpectationInvocationOrder
         end
       end
     end

data/lib/rspec/mocks/any_instance/stub_chain.rb

@@ -25,20 +25,24 @@ module RSpec
           stub
         end
 
-        def invocation_order
-          @invocation_order ||= {
-            :with => [nil],
+        InovcationOrder =
+          {
             :and_return => [:with, nil],
             :and_raise => [:with, nil],
             :and_yield => [:with, :and_yield, nil],
             :and_throw => [:with, nil],
             :and_call_original => [:with, nil],
             :and_wrap_original => [:with, nil]
-          }
+          }.freeze
+
+        EmptyInvocationOrder = {}.freeze
+
+        def invocation_order
+          InovcationOrder
         end
 
         def verify_invocation_order(rspec_method_name, *_args, &_block)
-          return if invocation_order[rspec_method_name].include?(last_message)
+          return if invocation_order.fetch(rspec_method_name, [nil]).include?(last_message)
           raise NoMethodError, "Undefined method #{rspec_method_name}"
         end
       end

data/lib/rspec/mocks/any_instance/stub_chain_chain.rb

@@ -15,12 +15,7 @@ module RSpec
         end
 
         def invocation_order
-          @invocation_order ||= {
-            :with => [nil],
-            :and_return => [nil],
-            :and_raise => [nil],
-            :and_yield => [nil]
-          }
+          EmptyInvocationOrder
         end
       end
     end

data/lib/rspec/mocks/configuration.rb

@@ -8,6 +8,8 @@ module RSpec
         @verify_doubled_constant_names = false
         @transfer_nested_constants = false
         @verify_partial_doubles = false
+        @temporarily_suppress_partial_double_verification = false
+        @color = false
       end
 
       # Sets whether RSpec will warn, ignore, or fail a test when
@@ -153,6 +155,11 @@ module RSpec
         @verify_partial_doubles
       end
 
+      # @private
+      # Used to track wether we are temporarily suppressing verifying partial
+      # doubles with `without_partial_double_verification { ... }`
+      attr_accessor :temporarily_suppress_partial_double_verification
+
       if ::RSpec.respond_to?(:configuration)
         def color?
           ::RSpec.configuration.color_enabled?

data/lib/rspec/mocks/error_generator.rb

@@ -214,8 +214,8 @@ module RSpec
 
       def expectation_on_nil_message(method_name)
         "An expectation of `:#{method_name}` was set on `nil`. " \
-        "To allow expectations on `nil` and suppress this message, set `config.allow_message_expectations_on_nil` to `true`. " \
-        "To disallow expectations on `nil`, set `config.allow_message_expectations_on_nil` to `false`"
+        "To allow expectations on `nil` and suppress this message, set `RSpec::Mocks.configuration.allow_message_expectations_on_nil` to `true`. " \
+        "To disallow expectations on `nil`, set `RSpec::Mocks.configuration.allow_message_expectations_on_nil` to `false`"
       end
 
       # @private

data/lib/rspec/mocks/example_methods.rb

@@ -282,6 +282,18 @@ module RSpec
         Matchers::HaveReceived.new(method_name, &block)
       end
 
+      # Turns off the verifying of partial doubles for the duration of the
+      # block, this is useful in situations where methods are defined at run
+      # time and you wish to define stubs for them but not turn off partial
+      # doubles for the entire run suite. (e.g. view specs in rspec-rails).
+      def without_partial_double_verification
+        original_state = Mocks.configuration.temporarily_suppress_partial_double_verification
+        Mocks.configuration.temporarily_suppress_partial_double_verification = true
+        yield
+      ensure
+        Mocks.configuration.temporarily_suppress_partial_double_verification = original_state
+      end
+
       # @method expect
       # Used to wrap an object in preparation for setting a mock expectation
       # on it.
@@ -380,7 +392,7 @@ module RSpec
       def self.included(klass)
         klass.class_exec do
           # This gets mixed in so that if `RSpec::Matchers` is included in
-          # `klass` later, it's definition of `expect` will take precedence.
+          # `klass` later, its definition of `expect` will take precedence.
           include ExpectHost unless method_defined?(:expect)
         end
       end
@@ -388,7 +400,7 @@ module RSpec
       # @private
       def self.extended(object)
         # This gets extended in so that if `RSpec::Matchers` is included in
-        # `klass` later, it's definition of `expect` will take precedence.
+        # `klass` later, its definition of `expect` will take precedence.
         object.extend ExpectHost unless object.respond_to?(:expect)
       end
 

data/lib/rspec/mocks/instance_method_stasher.rb

@@ -128,6 +128,17 @@ module RSpec
         # Hence, we verify that the owner actually has the method defined.
         # If the given owner does not have the method defined, we assume
         # that the method is actually owned by @klass.
+        #
+        # On 1.8, aliased methods can also report the wrong owner. Example:
+        # module M
+        #   def a; end
+        #   module_function :a
+        #   alias b a
+        #   module_function :b
+        # end
+        # The owner of M.b is the raw Module object, instead of the expected
+        # singleton class of the module
+        return true if RUBY_VERSION < '1.9' && owner == @object
         owner == @klass || !(method_defined_on_klass?(owner))
       end
     end

data/lib/rspec/mocks/message_expectation.rb

@@ -330,7 +330,7 @@ module RSpec
       def ordered(&block)
         if type == :stub
           RSpec.warning(
-            "`allow(...).to receive(..).ordered` is not supported and will" \
+            "`allow(...).to receive(..).ordered` is not supported and will " \
             "have no effect, use `and_return(*ordered_values)` instead."
           )
         end

data/lib/rspec/mocks/method_double.rb

@@ -207,8 +207,8 @@ module RSpec
 
       # In Ruby 2.0.0 and above prepend will alter the method lookup chain.
       # We use an object's singleton class to define method doubles upon,
-      # however if the object has had it's singleton class (as opposed to
-      # it's actual class) prepended too then the the method lookup chain
+      # however if the object has had its singleton class (as opposed to
+      # its actual class) prepended too then the the method lookup chain
       # will look in the prepended module first, **before** the singleton
       # class.
       #

data/lib/rspec/mocks/mutate_const.rb

@@ -105,6 +105,10 @@ module RSpec
       #  so you can stub constants in other contexts (e.g. helper
       #  classes).
       def self.stub(constant_name, value, options={})
+        unless String === constant_name
+          raise ArgumentError, "`stub_const` requires a String, but you provided a #{constant_name.class.name}"
+        end
+
         mutator = if recursive_const_defined?(constant_name, &raise_on_invalid_const)
                     DefinedConstantReplacer
                   else

data/lib/rspec/mocks/verifying_proxy.rb

@@ -120,6 +120,11 @@ module RSpec
         optional_callback_invocation_strategy.call(@doubled_module)
       end
 
+      def ensure_implemented(_method_name)
+        return if Mocks.configuration.temporarily_suppress_partial_double_verification
+        super
+      end
+
       def method_reference
         @method_doubles
       end
@@ -193,6 +198,8 @@ module RSpec
       def self.for(object, method_name, proxy)
         if ClassNewMethodReference.applies_to?(method_name) { object }
           VerifyingExistingClassNewMethodDouble
+        elsif Mocks.configuration.temporarily_suppress_partial_double_verification
+          MethodDouble
         else
           self
         end.new(object, method_name, proxy)

data/lib/rspec/mocks/version.rb

@@ -3,7 +3,7 @@ module RSpec
     # Version information for RSpec mocks.
     module Version
       # Version of RSpec mocks currently in use in SemVer format.
-      STRING = '3.6.0.beta1'
+      STRING = '3.6.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  version: 3.6.0.beta1
+  version: 3.6.0
 platform: ruby
 authors:
 - Steven Baker
@@ -45,22 +45,22 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2017-05-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta1
+        version: 3.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0.beta1
+        version: 3.6.0
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -205,14 +205,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.2
 signing_key: 
 specification_version: 4
-summary: rspec-mocks-3.6.0.beta1
+summary: rspec-mocks-3.6.0
 test_files: []
 has_rdoc: