rspec-expectations 3.5.0.beta1 → 3.5.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72c2b975192766df01f56f479ba2bf0ded3d6d4a
-  data.tar.gz: da2cd30524e919d4a790636f81ff1e785d876474
+  metadata.gz: 78f6f9a82ac0ab92dc9ad76030846c26f2f614d8
+  data.tar.gz: ff97acba6c6cc32e8390f68e41d4986da7328323
 SHA512:
-  metadata.gz: 0af3c1a4f19bcd46ecbb103e235db61c518307ef410e33574151cd3fa1c6774db6cad1efb3120c4921e59fb609145a09864ee558abf80141ccd08753655a0448
-  data.tar.gz: cf16751b9bc189992934d343c557ed21964d54991d70619babe415fd724f305749cddb960a9d1346f36417b62f912ec6526b0f8cfa9ff1e417fa214771d2930f
+  metadata.gz: 0ed056aabff3b938a44a25e11160435561730eda169a5ef34a2cf0849a08bbf1a4c926e7715529179f2c9c2eb7735972d634d8c2f364fda0b1106945e8d5a442
+  data.tar.gz: 6e4167883a703dcb4486ad9a9061b2c00535d60c96c04d486eccf37beb13ecde7edcf75f422e357d7359afd2064e2d44d552357604aca33ef7720644ed017ce0

data/Changelog.md

@@ -1,6 +1,19 @@
 ### 3.5.0 Development
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta1...master)
 
+Enhancements:
+
+* Add the ability to raise an error on encountering false positives via
+  `RSpec::Configuration#on_potential_false_positives = :raise`. (Jon Rowe, #900)
+* When using the custom matcher DSL, support new
+  `notify_expectation_failures: true` option for the `match` method to
+  allow expectation failures to be raised as normal instead of being
+  converted into a `false` return value for `matches?`. (Jon Rowe, #892)
+
+Bug Fixes:
+
+* Allow `should` deprecation check to work on `BasicObject`s. (James Coleman, #898)
+
 ### 3.5.0.beta1 / 2016-02-06
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.4.0...v3.5.0.beta1)
 

data/lib/rspec/expectations/configuration.rb

@@ -18,8 +18,16 @@ module RSpec
     #
     #   RSpec::Expectations.configuration
     class Configuration
+      # @private
+      FALSE_POSITIVE_BEHAVIOURS =
+        {
+          :warn    => lambda { |message| RSpec.warning message },
+          :raise   => lambda { |message| raise ArgumentError, message },
+          :nothing => lambda { |_| true },
+        }
+
       def initialize
-        @warn_about_potential_false_positives = true
+        @on_potential_false_positives = :warn
       end
 
       # Configures the supported syntax.
@@ -141,14 +149,43 @@ module RSpec
       # Configures whether RSpec will warn about matcher use which will
       # potentially cause false positives in tests.
       #
-      # @param value [Boolean]
-      attr_writer :warn_about_potential_false_positives
+      # @param [Boolean] boolean
+      def warn_about_potential_false_positives=(boolean)
+        if boolean
+          self.on_potential_false_positives = :warn
+        elsif warn_about_potential_false_positives?
+          self.on_potential_false_positives = :nothing
+        else
+          # no-op, handler is something else
+        end
+      end
+      #
+      # Configures what RSpec will do about matcher use which will
+      # potentially cause false positives in tests.
+      #
+      # @param [Symbol] behavior can be set to :warn, :raise or :nothing
+      def on_potential_false_positives=(behavior)
+        unless FALSE_POSITIVE_BEHAVIOURS.key?(behavior)
+          raise ArgumentError, "Supported values are: #{FALSE_POSITIVE_BEHAVIOURS.keys}"
+        end
+        @on_potential_false_positives = behavior
+      end
+
+      # Indicates what RSpec will do about matcher use which will
+      # potentially cause false positives in tests, generally you want to
+      # avoid such scenarios so this defaults to `true`.
+      attr_reader :on_potential_false_positives
 
       # Indicates whether RSpec will warn about matcher use which will
       # potentially cause false positives in tests, generally you want to
       # avoid such scenarios so this defaults to `true`.
       def warn_about_potential_false_positives?
-        @warn_about_potential_false_positives
+        on_potential_false_positives == :warn
+      end
+
+      # @private
+      def false_positives_handler
+        FALSE_POSITIVE_BEHAVIOURS.fetch(@on_potential_false_positives)
       end
     end
 

data/lib/rspec/expectations/syntax.rb

@@ -41,12 +41,12 @@ module RSpec
 
         syntax_host.module_exec do
           def should(matcher=nil, message=nil, &block)
-            ::RSpec::Expectations::Syntax.warn_about_should_unless_configured(__method__)
+            ::RSpec::Expectations::Syntax.warn_about_should_unless_configured(::Kernel.__method__)
             ::RSpec::Expectations::PositiveExpectationHandler.handle_matcher(self, matcher, message, &block)
           end
 
           def should_not(matcher=nil, message=nil, &block)
-            ::RSpec::Expectations::Syntax.warn_about_should_unless_configured(__method__)
+            ::RSpec::Expectations::Syntax.warn_about_should_unless_configured(::Kernel.__method__)
             ::RSpec::Expectations::NegativeExpectationHandler.handle_matcher(self, matcher, message, &block)
           end
         end

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,7 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '3.5.0.beta1'
+      STRING = '3.5.0.beta2'
     end
   end
 end

data/lib/rspec/matchers/built_in/raise_error.rb

@@ -12,8 +12,7 @@ module RSpec
         def initialize(expected_error_or_message=nil, expected_message=nil, &block)
           @block = block
           @actual_error = nil
-          @warn_about_bare_error = warn_about_potential_false_positives? &&
-            expected_error_or_message.nil?
+          @warn_about_bare_error = expected_error_or_message.nil?
 
           case expected_error_or_message
           when nil
@@ -133,7 +132,6 @@ module RSpec
         end
 
         def warn_for_false_positives
-          return unless warn_about_potential_false_positives?
           expression = if expecting_specific_exception? && @expected_message
                          "`expect { }.not_to raise_error(SpecificErrorClass, message)`"
                        elsif expecting_specific_exception?
@@ -147,8 +145,8 @@ module RSpec
           warn_about_negative_false_positive expression
         end
 
-        def warn_about_potential_false_positives?
-          RSpec::Expectations.configuration.warn_about_potential_false_positives?
+        def handle_warning(message)
+          RSpec::Expectations.configuration.false_positives_handler.call(message)
         end
 
         def warning_about_bare_error
@@ -156,28 +154,28 @@ module RSpec
         end
 
         def warn_about_bare_error
-          RSpec.warning("Using the `raise_error` matcher without providing a specific " \
-                        "error or message risks false positives, since `raise_error` " \
-                        "will match when Ruby raises a `NoMethodError`, `NameError` or " \
-                        "`ArgumentError`, potentially allowing the expectation to pass " \
-                        "without even executing the method you are intending to call. " \
-                        "#{warning}"\
-                        "Instead consider providing a specific error class or message. " \
-                        "This message can be suppressed by setting: " \
-                        "`RSpec::Expectations.configuration.warn_about_potential_false" \
-                        "_positives = false`")
+          handle_warning("Using the `raise_error` matcher without providing a specific " \
+                         "error or message risks false positives, since `raise_error` " \
+                         "will match when Ruby raises a `NoMethodError`, `NameError` or " \
+                         "`ArgumentError`, potentially allowing the expectation to pass " \
+                         "without even executing the method you are intending to call. " \
+                         "#{warning}"\
+                         "Instead consider providing a specific error class or message. " \
+                         "This message can be suppressed by setting: " \
+                         "`RSpec::Expectations.configuration.on_potential_false" \
+                         "_positives = :nothing`")
         end
 
         def warn_about_negative_false_positive(expression)
-          RSpec.warning("Using #{expression} risks false positives, since literally " \
-                        "any other error would cause the expectation to pass, " \
-                        "including those raised by Ruby (e.g. NoMethodError, NameError " \
-                        "and ArgumentError), meaning the code you are intending to test " \
-                        "may not even get reached. Instead consider using " \
-                        "`expect {}.not_to raise_error` or `expect { }.to raise_error" \
-                        "(DifferentSpecificErrorClass)`. This message can be suppressed by " \
-                        "setting: `RSpec::Expectations.configuration.warn_about_potential_false" \
-                        "_positives = false`")
+          handle_warning("Using #{expression} risks false positives, since literally " \
+                         "any other error would cause the expectation to pass, " \
+                         "including those raised by Ruby (e.g. NoMethodError, NameError " \
+                         "and ArgumentError), meaning the code you are intending to test " \
+                         "may not even get reached. Instead consider using " \
+                         "`expect {}.not_to raise_error` or `expect { }.to raise_error" \
+                         "(DifferentSpecificErrorClass)`. This message can be suppressed by " \
+                         "setting: `RSpec::Expectations.configuration.on_potential_false" \
+                         "_positives = :nothing`")
         end
 
         def expected_error

data/lib/rspec/matchers/dsl.rb

@@ -55,16 +55,23 @@ module RSpec
         #     expect(3).to be_even     # fails
         #     expect(4).not_to be_even # fails
         #
+        # By default the match block will swallow expectation errors (e.g.
+        # caused by using an expectation such as `expect(1).to eq 2`), if you
+        # with to allow these to bubble up, pass in the option
+        # `:notify_expectation_failures => true`.
+        #
+        # @param [Hash] options for defining the behavior of the match block.
         # @yield [Object] actual the actual value (i.e. the value wrapped by `expect`)
-        def match(&match_block)
+        def match(options={}, &match_block)
           define_user_override(:matches?, match_block) do |actual|
-            begin
-              @actual = actual
-              RSpec::Support.with_failure_notifier(RAISE_NOTIFIER) do
+            @actual = actual
+            RSpec::Support.with_failure_notifier(RAISE_NOTIFIER) do
+              begin
                 super(*actual_arg_for(match_block))
+              rescue RSpec::Expectations::ExpectationNotMetError
+                raise if options[:notify_expectation_failures]
+                false
               end
-            rescue RSpec::Expectations::ExpectationNotMetError
-              false
             end
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-expectations
 version: !ruby/object:Gem::Version
-  version: 3.5.0.beta1
+  version: 3.5.0.beta2
 platform: ruby
 authors:
 - Steven Baker
@@ -45,7 +45,7 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-support
@@ -53,14 +53,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta1
+        version: 3.5.0.beta2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.5.0.beta1
+        version: 3.5.0.beta2
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -217,9 +217,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-3.5.0.beta1
+summary: rspec-expectations-3.5.0.beta2
 test_files: []
 has_rdoc: