rspec-expectations 2.12.1 → 2.13.0

data/spec/rspec/matchers/match_array_spec.rb

@@ -14,11 +14,50 @@ class UnsortableObject
   end
 end
 
-describe "using match_array with expect" do
-  it_behaves_like "an RSpec matcher", :valid_value => [1, 2], :invalid_value => [1] do
-    let(:matcher) { match_array([2, 1]) }
+describe "should =~ array", :uses_should do
+  it "passes a valid positive expectation" do
+    [1, 2].should =~ [2, 1]
+  end
+
+  it "fails an invalid positive expectation" do
+    expect {
+      [1, 2, 3].should =~ [2, 1]
+    }.to fail_with(/expected collection contained/)
   end
 
+  context "when the array defines a `=~` method" do
+    it 'delegates to that method rather than using the match_array matcher' do
+      array = []
+      def array.=~(other)
+        other == :foo
+      end
+
+      array.should =~ :foo
+      expect {
+        array.should =~ :bar
+      }.to fail_with(/expected: :bar/)
+    end
+  end
+
+  context 'when the array defines a `send` method' do
+    it 'still works' do
+      array = [1, 2]
+      def array.send; :sent; end
+
+      array.should =~ array
+    end
+  end
+end
+
+describe "should_not =~ [:with, :multiple, :args]", :uses_should do
+  it "is not supported" do
+    expect {
+      [1,2,3].should_not =~ [1,2,3]
+    }.to fail_with(/Matcher does not support should_not/)
+  end
+end
+
+describe "using match_array with expect" do
   it "passes a valid positive expectation" do
     expect([1, 2]).to match_array [2, 1]
   end
@@ -30,19 +69,23 @@ describe "using match_array with expect" do
   end
 end
 
-describe "array.should =~ other_array" do
+describe "expect(array).to match_array other_array" do
+  it_behaves_like "an RSpec matcher", :valid_value => [1, 2], :invalid_value => [1] do
+    let(:matcher) { match_array([2, 1]) }
+  end
+
   it "passes if target contains all items" do
-    [1,2,3].should =~ [1,2,3]
+    expect([1,2,3]).to match_array [1,2,3]
   end
 
   it "passes if target contains all items out of order" do
-    [1,3,2].should =~ [1,2,3]
+    expect([1,3,2]).to match_array [1,2,3]
   end
 
   it "fails if target includes extra items" do
-    lambda {
-      [1,2,3,4].should =~ [1,2,3]
-    }.should fail_with(<<-MESSAGE)
+    expect {
+      expect([1,2,3,4]).to match_array [1,2,3]
+    }.to fail_with(<<-MESSAGE)
 expected collection contained:  [1, 2, 3]
 actual collection contained:    [1, 2, 3, 4]
 the extra elements were:        [4]
@@ -50,9 +93,9 @@ MESSAGE
   end
 
   it "fails if target is missing items" do
-    lambda {
-      [1,2].should =~ [1,2,3]
-    }.should fail_with(<<-MESSAGE)
+    expect {
+      expect([1,2]).to match_array [1,2,3]
+    }.to fail_with(<<-MESSAGE)
 expected collection contained:  [1, 2, 3]
 actual collection contained:    [1, 2]
 the missing elements were:      [3]
@@ -60,10 +103,9 @@ MESSAGE
   end
 
   it "fails if target is missing items and has extra items" do
-
-    lambda {
-      [1,2,4].should =~ [1,2,3]
-    }.should fail_with(<<-MESSAGE)
+    expect {
+      expect([1,2,4]).to match_array [1,2,3]
+    }.to fail_with(<<-MESSAGE)
 expected collection contained:  [1, 2, 3]
 actual collection contained:    [1, 2, 4]
 the missing elements were:      [3]
@@ -72,9 +114,9 @@ MESSAGE
   end
 
   it "sorts items in the error message if they all respond to <=>" do
-    lambda {
-      [6,2,1,5].should =~ [4,1,2,3]
-    }.should fail_with(<<-MESSAGE)
+    expect {
+      expect([6,2,1,5]).to match_array [4,1,2,3]
+    }.to fail_with(<<-MESSAGE)
 expected collection contained:  [1, 2, 3, 4]
 actual collection contained:    [1, 2, 5, 6]
 the missing elements were:      [3, 4]
@@ -83,9 +125,9 @@ MESSAGE
   end
 
     it "does not sort items in the error message if they don't all respond to <=>" do
-      lambda {
-        [UnsortableObject.new(2), UnsortableObject.new(1)].should =~ [UnsortableObject.new(4), UnsortableObject.new(3)]
-      }.should fail_with(<<-MESSAGE)
+      expect {
+        expect([UnsortableObject.new(2), UnsortableObject.new(1)]).to match_array [UnsortableObject.new(4), UnsortableObject.new(3)]
+      }.to fail_with(<<-MESSAGE)
 expected collection contained:  [4, 3]
 actual collection contained:    [2, 1]
 the missing elements were:      [4, 3]
@@ -94,9 +136,9 @@ MESSAGE
     end
 
   it "accurately reports extra elements when there are duplicates" do
-    lambda {
-      [1,1,1,5].should =~ [1,5]
-    }.should fail_with(<<-MESSAGE)
+    expect {
+      expect([1,1,1,5]).to match_array [1,5]
+    }.to fail_with(<<-MESSAGE)
 expected collection contained:  [1, 5]
 actual collection contained:    [1, 1, 1, 5]
 the extra elements were:        [1, 1]
@@ -104,50 +146,49 @@ MESSAGE
   end
 
   it "accurately reports missing elements when there are duplicates" do
-    lambda {
-      [1,5].should =~ [1,1,5]
-    }.should fail_with(<<-MESSAGE)
+    expect {
+      expect([1,5]).to match_array [1,1,5]
+    }.to fail_with(<<-MESSAGE)
 expected collection contained:  [1, 1, 5]
 actual collection contained:    [1, 5]
 the missing elements were:      [1]
 MESSAGE
   end
-
-  context "when the array defines a `=~` method" do
-    it 'delegates to that method rather than using the match_array matcher' do
-      array = []
-      def array.=~(other)
-        other == :foo
-      end
-
-      array.should =~ :foo
-      expect { array.should =~ :bar }.to fail_with(/expected: :bar/)
-    end
-  end
 end
 
-describe "should_not =~ [:with, :multiple, :args]" do
+describe "expect(...).to_not match_array [:with, :multiple, :args]" do
   it "is not supported" do
-    lambda {
-      [1,2,3].should_not =~ [1,2,3]
-    }.should fail_with(/Matcher does not support should_not/)
+    expect {
+      expect([1,2,3]).not_to match_array [1,2,3]
+    }.to fail_with(/Matcher does not support should_not/)
   end
 end
 
 describe "matching against things that aren't arrays" do
   it "fails with nil and the expected error message is given" do
-    expect { nil.should match_array([1,2,3]) }.to fail_with(/expected an array/)
+    expect {
+      expect(nil).to match_array([1,2,3])
+    }.to fail_with(/expected an array/)
   end
 
   it "fails with a float and the expected error message is given" do
-    expect { (3.7).should match_array([1,2,3]) }.to fail_with(/expected an array/)
+    expect {
+      expect((3.7)).to match_array([1,2,3])
+    }.to fail_with(/expected an array/)
   end
 
   it "fails with a string and the expected error message is given" do
-    expect { "I like turtles".should match_array([1,2,3]) }.to fail_with(/expected an array/)
+    expect {
+      expect("I like turtles").to match_array([1,2,3])
+    }.to fail_with(/expected an array/)
   end
 
-  it 'fails with a clear message when given a hash using the `should =~` syntax' do
-    expect { {}.should =~ {} }.to fail_with(/expected an array/)
+  context "when using the `should =~` syntax", :uses_should do
+    it 'fails with a clear message when given a hash' do
+      expect {
+        {}.should =~ {}
+      }.to fail_with(/expected an array/)
+    end
   end
 end
+

data/spec/rspec/matchers/match_spec.rb

@@ -1,61 +1,61 @@
 require 'spec_helper'
 
-describe "should match(expected)" do
+describe "expect(...).to match(expected)" do
   it_behaves_like "an RSpec matcher", :valid_value => 'ab', :invalid_value => 'bc' do
     let(:matcher) { match(/a/) }
   end
 
   it "passes when target (String) matches expected (Regexp)" do
-    "string".should match(/tri/)
+    expect("string").to match(/tri/)
   end
 
   it "passes when target (String) matches expected (String)" do
-    "string".should match("tri")
+    expect("string").to match("tri")
   end
 
   it "fails when target (String) does not match expected (Regexp)" do
-    lambda {
-      "string".should match(/rings/)
-    }.should fail
+    expect {
+      expect("string").to match(/rings/)
+    }.to fail
   end
 
   it "fails when target (String) does not match expected (String)" do
-    lambda {
-      "string".should match("rings")
-    }.should fail
+    expect {
+      expect("string").to match("rings")
+    }.to fail
   end
-  
+
   it "provides message, expected and actual on failure" do
     matcher = match(/rings/)
     matcher.matches?("string")
-    matcher.failure_message_for_should.should == "expected \"string\" to match /rings/"
+    expect(matcher.failure_message_for_should).to eq "expected \"string\" to match /rings/"
   end
 end
 
-describe "should_not match(expected)" do
+describe "expect(...).to_not match(expected)" do
   it "passes when target (String) matches does not match (Regexp)" do
-    "string".should_not match(/rings/)
+    expect("string").not_to match(/rings/)
   end
 
   it "passes when target (String) matches does not match (String)" do
-    "string".should_not match("rings")
+    expect("string").not_to match("rings")
   end
 
   it "fails when target (String) matches expected (Regexp)" do
-    lambda {
-      "string".should_not match(/tri/)
-    }.should fail
+    expect {
+      expect("string").not_to match(/tri/)
+    }.to fail
   end
 
   it "fails when target (String) matches expected (String)" do
-    lambda {
-      "string".should_not match("tri")
-    }.should fail
+    expect {
+      expect("string").not_to match("tri")
+    }.to fail
   end
 
   it "provides message, expected and actual on failure" do
     matcher = match(/tri/)
     matcher.matches?("string")
-    matcher.failure_message_for_should_not.should == "expected \"string\" not to match /tri/"
+    expect(matcher.failure_message_for_should_not).to eq "expected \"string\" not to match /tri/"
   end
 end

data/spec/rspec/matchers/matcher_spec.rb

@@ -33,8 +33,8 @@ module RSpec::Matchers::DSL
       m1 = example_matcher(1)
       m2 = example_matcher(2)
 
-      m1.matches?(1).should be_true
-      m2.matches?(2).should be_true
+      expect(m1.matches?(1)).to be_true
+      expect(m2.matches?(2)).to be_true
     end
 
     context "with an included module" do
@@ -50,19 +50,19 @@ module RSpec::Matchers::DSL
       end
 
       it "runs the module's included hook" do
-        matcher.should respond_to(:included_method)
+        expect(matcher).to respond_to(:included_method)
       end
 
       it "does not run the module's extended hook" do
-        matcher.should_not respond_to(:extended_method)
+        expect(matcher).not_to respond_to(:extended_method)
       end
 
       it 'allows multiple modules to be included at once' do
         m = RSpec::Matchers::DSL::Matcher.new(:multiple_modules) do
           include Enumerable, Comparable
         end.for_expected
-        m.should be_a(Enumerable)
-        m.should be_a(Comparable)
+        expect(m).to be_a(Enumerable)
+        expect(m).to be_a(Comparable)
       end
     end
 
@@ -76,17 +76,17 @@ module RSpec::Matchers::DSL
       end
 
       it "provides a default description" do
-        @matcher.description.should == "be a multiple of 3"
+        expect(@matcher.description).to eq "be a multiple of 3"
       end
 
       it "provides a default failure message for #should" do
         @matcher.matches?(8)
-        @matcher.failure_message_for_should.should == "expected 8 to be a multiple of 3"
+        expect(@matcher.failure_message_for_should).to eq "expected 8 to be a multiple of 3"
       end
 
       it "provides a default failure message for #should_not" do
         @matcher.matches?(9)
-        @matcher.failure_message_for_should_not.should == "expected 9 not to be a multiple of 3"
+        expect(@matcher.failure_message_for_should_not).to eq "expected 9 not to be a multiple of 3"
       end
     end
 
@@ -104,18 +104,18 @@ module RSpec::Matchers::DSL
       end
 
       it "invokes the match_for_should block for #matches?" do
-        matcher.matches?(77).should be_true
-        matcher.matches?(18).should be_false
+        expect(matcher.matches?(77)).to be_true
+        expect(matcher.matches?(18)).to be_false
       end
 
       it "invokes the match_for_should_not block for #does_not_match?" do
-        matcher.does_not_match?(77).should be_false
-        matcher.does_not_match?(18).should be_true
+        expect(matcher.does_not_match?(77)).to be_false
+        expect(matcher.does_not_match?(18)).to be_true
       end
 
       it "provides a default failure message for #should_not" do
         matcher.does_not_match?(77)
-        matcher.failure_message_for_should_not.should == "expected 77 not to to be composed of 7 and 11"
+        expect(matcher.failure_message_for_should_not).to eq "expected 77 not to to be composed of 7 and 11"
       end
     end
 
@@ -124,22 +124,22 @@ module RSpec::Matchers::DSL
         define_method(:sum) { a + b }
       end.for_expected(3,4)
 
-      matcher.sum.should == 7
+      expect(matcher.sum).to eq 7
     end
 
     it "is not diffable by default" do
       matcher = RSpec::Matchers::DSL::Matcher.new(:name) {}
-      matcher.should_not be_diffable
+      expect(matcher).not_to be_diffable
     end
 
     it "is diffable when told to be" do
       matcher = RSpec::Matchers::DSL::Matcher.new(:name) { diffable }.for_expected
-      matcher.should be_diffable
+      expect(matcher).to be_diffable
     end
 
     it "provides expected" do
       matcher = RSpec::Matchers::DSL::Matcher.new(:name) {}.for_expected('expected string')
-      matcher.expected.should == ['expected string']
+      expect(matcher.expected).to eq ['expected string']
     end
 
     it "provides actual" do
@@ -149,26 +149,26 @@ module RSpec::Matchers::DSL
 
       matcher.matches?('actual string')
 
-      matcher.actual.should == 'actual string'
+      expect(matcher.actual).to eq 'actual string'
     end
 
     context "wrapping another expectation (should == ...)" do
       it "returns true if the wrapped expectation passes" do
         matcher = RSpec::Matchers::DSL::Matcher.new(:name) do |expected|
           match do |actual|
-            actual.should == expected
+            expect(actual).to eq expected
           end
         end.for_expected('value')
-        matcher.matches?('value').should be_true
+        expect(matcher.matches?('value')).to be_true
       end
 
       it "returns false if the wrapped expectation fails" do
         matcher = RSpec::Matchers::DSL::Matcher.new(:name) do |expected|
           match do |actual|
-            actual.should == expected
+            expect(actual).to eq expected
           end
         end.for_expected('value')
-        matcher.matches?('other value').should be_false
+        expect(matcher.matches?('other value')).to be_false
       end
     end
 
@@ -191,25 +191,25 @@ module RSpec::Matchers::DSL
       end
 
       it "does not hide result of match block when true" do
-        @matcher.matches?(true).should be_true
+        expect(@matcher.matches?(true)).to be_true
       end
 
       it "does not hide result of match block when false" do
-        @matcher.matches?(false).should be_false
+        expect(@matcher.matches?(false)).to be_false
       end
 
       it "overrides the description" do
-        @matcher.description.should == "be the boolean true"
+        expect(@matcher.description).to eq "be the boolean true"
       end
 
       it "overrides the failure message for #should" do
         @matcher.matches?(false)
-        @matcher.failure_message_for_should.should == "expected false to be the boolean true"
+        expect(@matcher.failure_message_for_should).to eq "expected false to be the boolean true"
       end
 
       it "overrides the failure message for #should_not" do
         @matcher.matches?(true)
-        @matcher.failure_message_for_should_not.should == "expected true not to be the boolean true"
+        expect(@matcher.failure_message_for_should_not).to eq "expected true not to be the boolean true"
       end
     end
 
@@ -220,7 +220,7 @@ module RSpec::Matchers::DSL
             actual == 5
           end
         end.for_expected
-        matcher.matches?(5).should be_true
+        expect(matcher.matches?(5)).to be_true
       end
 
       it "exposes arg submitted through #new to matcher block" do
@@ -229,7 +229,7 @@ module RSpec::Matchers::DSL
             actual > expected
           end
         end.for_expected(4)
-        matcher.matches?(5).should be_true
+        expect(matcher.matches?(5)).to be_true
       end
     end
 
@@ -243,11 +243,11 @@ module RSpec::Matchers::DSL
       end
 
       it "matches" do
-        @matcher.matches?(5).should be_true
+        expect(@matcher.matches?(5)).to be_true
       end
 
       it "describes" do
-        @matcher.description.should == "matcher name"
+        expect(@matcher.description).to eq "matcher name"
       end
     end
 
@@ -261,11 +261,11 @@ module RSpec::Matchers::DSL
       end
 
       it "matches" do
-        @matcher.matches?(5).should be_true
+        expect(@matcher.matches?(5)).to be_true
       end
 
       it "describes" do
-        @matcher.description.should == "matcher name 1"
+        expect(@matcher.description).to eq "matcher name 1"
       end
     end
 
@@ -279,11 +279,11 @@ module RSpec::Matchers::DSL
       end
 
       it "matches" do
-        @matcher.matches?(10).should be_true
+        expect(@matcher.matches?(10)).to be_true
       end
 
       it "describes" do
-        @matcher.description.should == "matcher name 1, 2, 3, and 4"
+        expect(@matcher.description).to eq "matcher name 1, 2, 3, and 4"
       end
     end
 
@@ -298,7 +298,7 @@ module RSpec::Matchers::DSL
         end
       end.for_expected([1,2,3])
 
-      matcher.matches?([2,3,1]).should be_true
+      expect(matcher.matches?([2,3,1])).to be_true
     end
 
     it "supports fluent interface" do
@@ -308,7 +308,7 @@ module RSpec::Matchers::DSL
         end
       end.for_expected
 
-      matcher.second_word.should == matcher
+      expect(matcher.second_word).to eq matcher
     end
 
     it "treats method missing normally for undeclared methods" do
@@ -320,11 +320,49 @@ module RSpec::Matchers::DSL
       matcher = RSpec::Matchers::DSL::Matcher.new(:ignore) do |expected|
         match do |actual|
           extend RSpec::Matchers
-          actual.should eql(5 + expected)
+          expect(actual).to eql(5 + expected)
         end
       end.for_expected(3)
 
-      matcher.matches?(8).should be_true
+      expect(matcher.matches?(8)).to be_true
+    end
+
+    context 'when multiple instances of the same matcher are used in the same example' do
+      RSpec::Matchers.define(:be_like_a) do |expected|
+        match { |actual| actual == expected }
+        description { "be like a #{expected}" }
+        failure_message_for_should { "expected to be like a #{expected}" }
+        failure_message_for_should_not { "expected not to be like a #{expected}" }
+      end
+
+      # Note: these bugs were only exposed when creating both instances
+      # first, then checking their descriptions/failure messages.
+      #
+      # That's why we eager-instantiate them here.
+      let!(:moose) { be_like_a("moose") }
+      let!(:horse) { be_like_a("horse") }
+
+      it 'allows them to use the expected value in the description' do
+        expect(horse.description).to eq("be like a horse")
+        expect(moose.description).to eq("be like a moose")
+      end
+
+      it 'allows them to use the expected value in the positive failure message' do
+        expect(moose.failure_message_for_should).to eq("expected to be like a moose")
+        expect(horse.failure_message_for_should).to eq("expected to be like a horse")
+      end
+
+      it 'allows them to use the expected value in the negative failure message' do
+        expect(moose.failure_message_for_should_not).to eq("expected not to be like a moose")
+        expect(horse.failure_message_for_should_not).to eq("expected not to be like a horse")
+      end
+
+      it 'allows them to match separately' do
+        expect("moose").to moose
+        expect("horse").to horse
+        expect("horse").not_to moose
+        expect("moose").not_to horse
+      end
     end
 
     describe "#match_unless_raises" do
@@ -348,19 +386,18 @@ module RSpec::Matchers::DSL
 
         context "with passing assertion" do
           it "passes" do
-            matcher.matches?(4).should be_true
+            expect(matcher.matches?(4)).to be_true
           end
         end
 
         context "with failing assertion" do
           it "fails" do
-            matcher.matches?(5).should be_false
+            expect(matcher.matches?(5)).to be_false
           end
 
           it "provides the raised exception" do
             matcher.matches?(5)
-            matcher.rescued_exception.message.
-              should eq("5 does not equal 4")
+            expect(matcher.rescued_exception.message).to eq("5 does not equal 4")
           end
         end
       end
@@ -391,8 +428,8 @@ module RSpec::Matchers::DSL
         match { |actual| actual == @expected_value }
       end.for_expected
 
-      matcher.expecting('value').matches?('value').should be_true
-      matcher.expecting('value').matches?('other value').should be_false
+      expect(matcher.expecting('value').matches?('value')).to be_true
+      expect(matcher.expecting('value').matches?('other value')).to be_false
     end
 
     it "prevents name collisions on chainable methods from different matchers" do
@@ -414,7 +451,7 @@ module RSpec::Matchers::DSL
             a_method_in_the_example == "method defined in the example"
           end
         end
-        example.should __access_running_example
+        expect(example).to __access_running_example
       end
 
       it "raises NoMethodError for methods not in the running_example" do
@@ -425,7 +462,7 @@ module RSpec::Matchers::DSL
         end
 
         expect do
-          example.should __raise_no_method_error
+          expect(example).to __raise_no_method_error
         end.to raise_error(/RSpec::Matchers::DSL::Matcher/)
       end
     end