rspec-expectations 2.14.1 → 2.14.2

data/Changelog.md

@@ -1,3 +1,19 @@
+### 2.14.2 / 2013-08-14
+[full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.1...v2.14.2)
+
+Bug fixes
+
+* Fix `be_<predicate>` matcher to not support operator chaining like the
+  `be` matcher does (e.g. `be == 5`). This led to some odd behaviors
+  since `be_<predicate> == anything` returned a `BeComparedTo` matcher
+  and was thus always truthy. This was a consequence of the implementation
+  (e.g. subclassing the basic `Be` matcher) and was not intended behavior.
+  (Myron Marston).
+* Fix `change` matcher to compare using `==` in addition to `===`. This
+  is important for an expression like:
+  `expect {}.to change { a.class }.from(ClassA).to(ClassB)` because
+  `SomeClass === SomeClass` returns false. (Myron Marston)
+
 ### 2.14.1 / 2013-08-08
 [full changelog](http://github.com/rspec/rspec-expectations/compare/v2.14.0...2.14.1)
 

data/lib/rspec/expectations/version.rb

@@ -2,7 +2,8 @@ module RSpec
   module Expectations
     # @private
     module Version
-      STRING = '2.14.1'
+      STRING = '2.14.2'
     end
   end
 end
+

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

@@ -45,7 +45,33 @@ module RSpec
         end
       end
 
+      module BeHelpers
+        private
+
+        def args_to_s
+          @args.empty? ? "" : parenthesize(inspected_args.join(', '))
+        end
+
+        def parenthesize(string)
+          "(#{string})"
+        end
+
+        def inspected_args
+          @args.collect{|a| a.inspect}
+        end
+
+        def expected_to_sentence
+          split_words(@expected)
+        end
+
+        def args_to_sentence
+          to_sentence(@args)
+        end
+      end
+
       class Be < BaseMatcher
+        include BeHelpers
+
         def initialize(*args, &block)
           @args = args
         end
@@ -67,28 +93,6 @@ module RSpec
             BeComparedTo.new(operand, operator)
           end
         end
-
-        private
-
-        def args_to_s
-          @args.empty? ? "" : parenthesize(inspected_args.join(', '))
-        end
-
-        def parenthesize(string)
-          "(#{string})"
-        end
-
-        def inspected_args
-          @args.collect{|a| a.inspect}
-        end
-
-        def expected_to_sentence
-          split_words(@expected)
-        end
-
-        def args_to_sentence
-          to_sentence(@args)
-        end
       end
 
       class BeComparedTo < Be
@@ -126,7 +130,9 @@ it is a bit confusing.
         end
       end
 
-      class BePredicate < Be
+      class BePredicate < BaseMatcher
+        include BeHelpers
+
         def initialize(*args, &block)
           @expected = parse_expected(args.shift)
           @args = args

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

@@ -133,7 +133,7 @@ MESSAGE
         end
 
         def expected_matches_actual?(expected, actual)
-          expected === actual
+          expected === actual || actual == expected
         end
       end
     end

data/spec/rspec/matchers/be_spec.rb

@@ -46,6 +46,12 @@ describe "expect(...).to be_predicate" do
       expect(actual).to be_foo
     }.to raise_error(/aaaah/)
   end
+
+  it "does not support operator chaining like a basic `be` matcher does" do
+    matcher = be_happy
+    value = double(:happy? => false)
+    expect(be_happy == value).to be false
+  end
 end
 
 describe "expect(...).not_to be_predicate" do

data/spec/rspec/matchers/change_spec.rb

@@ -28,6 +28,20 @@ describe "expect { ... }.to change(actual, message)" do
     end
   end
 
+  it "can specify the change of a variable's class" do
+    val = nil
+
+    expect {
+      val = 42
+    }.to change { val.class }.from(NilClass).to(Fixnum)
+
+    expect {
+      expect {
+        val = "string"
+      }.to change { val.class }.from(Fixnum).to(NilClass)
+    }.to fail_with(/but is now String/)
+  end
+
   context "with boolean values" do
     before(:each) do
       @instance = SomethingExpected.new

metadata

@@ -2,7 +2,7 @@
 name: rspec-expectations
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 2.14.1
+  version: 2.14.2
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-09 00:00:00.000000000 Z
+date: 2013-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -234,7 +234,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1211748927981190592
+      hash: 2244321019137391681
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
@@ -243,14 +243,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1211748927981190592
+      hash: 2244321019137391681
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-expectations-2.14.1
+summary: rspec-expectations-2.14.2
 test_files:
 - features/README.md
 - features/Upgrade.md