rspec-expectations 3.4.0 → 3.5.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecfc9ad6573cbd51308c24b96e60534b430370e8
-  data.tar.gz: ee7aec158266ec8c5902def9e5777d0f47a4eb18
+  metadata.gz: 72c2b975192766df01f56f479ba2bf0ded3d6d4a
+  data.tar.gz: da2cd30524e919d4a790636f81ff1e785d876474
 SHA512:
-  metadata.gz: 747ae15f2866456d52996626be3ce0f131beac9c92ab447d865c052e9c6211b0eacac9f1c80d2140ef8185e6c1d3f45e88ac49d48c0b23346df325f00f84678c
-  data.tar.gz: 55853e5d95bf9019031a1652cf6d8b553d65ebea517b309514275faab04b66a2a713d07ab6021eb96df3d537a106d39bde239933722f2f76f236ae7518aa84a3
+  metadata.gz: 0af3c1a4f19bcd46ecbb103e235db61c518307ef410e33574151cd3fa1c6774db6cad1efb3120c4921e59fb609145a09864ee558abf80141ccd08753655a0448
+  data.tar.gz: cf16751b9bc189992934d343c557ed21964d54991d70619babe415fd724f305749cddb960a9d1346f36417b62f912ec6526b0f8cfa9ff1e417fa214771d2930f

data/Changelog.md

@@ -1,3 +1,21 @@
+### 3.5.0 Development
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.5.0.beta1...master)
+
+### 3.5.0.beta1 / 2016-02-06
+[Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.4.0...v3.5.0.beta1)
+
+Enhancements:
+
+* Make `match_when_negated` in custom matcher DSL support use of
+  expectations within the match logic. (Chris Arcand, #789)
+
+Bug Fixes:
+
+* Return `true` as expected from passing negated expectations
+  (such as `expect("foo").not_to eq "bar"`), so they work
+  properly when used within a `match` or `match_when_negated`
+  block. (Chris Arcand, #789)
+
 ### 3.4.0 / 2015-11-11
 [Full Changelog](http://github.com/rspec/rspec-expectations/compare/v3.3.1...v3.4.0)
 

data/lib/rspec/expectations/handler.rb

@@ -69,7 +69,7 @@ module RSpec
       def self.handle_matcher(actual, initial_matcher, message=nil, &block)
         ExpectationHelper.with_matcher(self, initial_matcher, message) do |matcher|
           return ::RSpec::Matchers::BuiltIn::NegativeOperatorMatcher.new(actual) unless initial_matcher
-          !(does_not_match?(matcher, actual, &block) || ExpectationHelper.handle_failure(matcher, message, :failure_message_when_negated))
+          does_not_match?(matcher, actual, &block) || ExpectationHelper.handle_failure(matcher, message, :failure_message_when_negated)
         end
       end
 

data/lib/rspec/expectations/version.rb

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

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

@@ -137,7 +137,8 @@ module RSpec
         include BeHelpers
 
         def initialize(operand, operator)
-          @expected, @operator = operand, operator
+          @expected = operand
+          @operator = operator
           @args = []
         end
 
@@ -151,13 +152,15 @@ module RSpec
         # @api private
         # @return [String]
         def failure_message
-          "expected: #{@operator} #{expected_formatted}\n     got: #{@operator.to_s.gsub(/./, ' ')} #{actual_formatted}"
+          "expected: #{@operator} #{expected_formatted}\n" \
+          "     got: #{@operator.to_s.gsub(/./, ' ')} #{actual_formatted}"
         end
 
         # @api private
         # @return [String]
         def failure_message_when_negated
-          message = "`expect(#{actual_formatted}).not_to be #{@operator} #{expected_formatted}`"
+          message = "`expect(#{actual_formatted}).not_to " \
+                    "be #{@operator} #{expected_formatted}`"
           if [:<, :>, :<=, :>=].include?(@operator)
             message + " not only FAILED, it is a bit confusing."
           else

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

@@ -12,7 +12,8 @@ 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 = warn_about_potential_false_positives? &&
+            expected_error_or_message.nil?
 
           case expected_error_or_message
           when nil
@@ -162,8 +163,9 @@ module RSpec
                         "without even executing the method you are intending to call. " \
                         "#{warning}"\
                         "Instead consider providing a specific error class or message. " \
-                        "This message can be supressed by setting: " \
-                        "`RSpec::Expectations.configuration.warn_about_potential_false_positives = false`")
+                        "This message can be suppressed by setting: " \
+                        "`RSpec::Expectations.configuration.warn_about_potential_false" \
+                        "_positives = false`")
         end
 
         def warn_about_negative_false_positive(expression)
@@ -172,8 +174,10 @@ module RSpec
                         "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`. This message can be supressed by setting: " \
-                        "`RSpec::Expectations.configuration.warn_about_potential_false_positives = false`")
+                        "`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`")
         end
 
         def expected_error

data/lib/rspec/matchers/dsl.rb

@@ -80,8 +80,14 @@ module RSpec
         # @yield [Object] actual the actual value (i.e. the value wrapped by `expect`)
         def match_when_negated(&match_block)
           define_user_override(:does_not_match?, match_block) do |actual|
-            @actual = actual
-            super(*actual_arg_for(match_block))
+            begin
+              @actual = actual
+              RSpec::Support.with_failure_notifier(RAISE_NOTIFIER) do
+                super(*actual_arg_for(match_block))
+              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.4.0
+  version: 3.5.0.beta1
 platform: ruby
 authors:
 - Steven Baker
@@ -45,22 +45,22 @@ cert_chain:
   ZsVDj6a7lH3cNqtWXZxrb2wO38qV5AkYj8SQK7Hj3/Yui9myUX3crr+PdetazSqQ
   F3MdtaDehhjC
   -----END CERTIFICATE-----
-date: 2015-11-12 00:00:00.000000000 Z
+date: 2016-02-06 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.4.0
+        version: 3.5.0.beta1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 3.4.0
+        version: 3.5.0.beta1
 - !ruby/object:Gem::Dependency
   name: diff-lcs
   requirement: !ruby/object:Gem::Requirement
@@ -212,14 +212,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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
-summary: rspec-expectations-3.4.0
+summary: rspec-expectations-3.5.0.beta1
 test_files: []
 has_rdoc: