rspec-expectations 2.0.0.beta.22 → 2.6.0

data/spec/rspec/matchers/description_generation_spec.rb

@@ -9,42 +9,42 @@ describe "Matchers should be able to generate their own descriptions" do
     "this".should == "this"
     RSpec::Matchers.generated_description.should == "should == \"this\""
   end
-  
+
   it "should not == expected" do
     "this".should_not == "that"
     RSpec::Matchers.generated_description.should == "should not == \"that\""
   end
-  
+
   it "should be empty (arbitrary predicate)" do
     [].should be_empty
     RSpec::Matchers.generated_description.should == "should be empty"
   end
-  
+
   it "should not be empty (arbitrary predicate)" do
     [1].should_not be_empty
     RSpec::Matchers.generated_description.should == "should not be empty"
   end
-  
+
   it "should be true" do
     true.should be_true
     RSpec::Matchers.generated_description.should == "should be true"
   end
-  
+
   it "should be false" do
     false.should be_false
     RSpec::Matchers.generated_description.should == "should be false"
   end
-  
+
   it "should be nil" do
     nil.should be_nil
     RSpec::Matchers.generated_description.should == "should be nil"
   end
-  
+
   it "should be > n" do
     5.should be > 3
     RSpec::Matchers.generated_description.should == "should be > 3"
   end
-  
+
   it "should be predicate arg1, arg2 and arg3" do
     5.0.should be_between(0,10)
     RSpec::Matchers.generated_description.should == "should be between 0 and 10"
@@ -55,42 +55,58 @@ describe "Matchers should be able to generate their own descriptions" do
     expected.should equal(expected)
     RSpec::Matchers.generated_description.should == "should equal \"expected\""
   end
-  
+
   it "should_not equal" do
     5.should_not equal(37)
     RSpec::Matchers.generated_description.should == "should not equal 37"
   end
-  
+
   it "should eql" do
     "string".should eql("string")
     RSpec::Matchers.generated_description.should == "should eql \"string\""
   end
-  
+
   it "should not eql" do
     "a".should_not eql(:a)
     RSpec::Matchers.generated_description.should == "should not eql :a"
   end
-  
+
   it "should have_key" do
     {:a => "a"}.should have_key(:a)
     RSpec::Matchers.generated_description.should == "should have key :a"
   end
-  
+
+  it "should have_some_method" do
+    object = Object.new
+    def object.has_eyes_closed?; true; end
+
+    object.should have_eyes_closed
+    RSpec::Matchers.generated_description.should == 'should have eyes closed'
+  end
+
+  it "should have_some_method(args*)" do
+    object = Object.new
+    def object.has_taste_for?(*args); true; end
+
+    object.should have_taste_for("wine", "cheese")
+    RSpec::Matchers.generated_description.should == 'should have taste for "wine", "cheese"'
+  end
+
   it "should have n items" do
     team.should have(3).players
     RSpec::Matchers.generated_description.should == "should have 3 players"
   end
-  
+
   it "should have at least n items" do
     team.should have_at_least(2).players
     RSpec::Matchers.generated_description.should == "should have at least 2 players"
   end
-  
+
   it "should have at most n items" do
     team.should have_at_most(4).players
     RSpec::Matchers.generated_description.should == "should have at most 4 players"
   end
-  
+
   it "should include" do
     [1,2,3].should include(3)
     RSpec::Matchers.generated_description.should == "should include 3"
@@ -100,42 +116,42 @@ describe "Matchers should be able to generate their own descriptions" do
     [1,2,3].should =~ [1,2,3]
     RSpec::Matchers.generated_description.should == "should contain exactly 1, 2 and 3"
   end
-  
+
   it "should match" do
     "this string".should match(/this string/)
     RSpec::Matchers.generated_description.should == "should match /this string/"
   end
-  
+
   it "should raise_error" do
     lambda { raise }.should raise_error
     RSpec::Matchers.generated_description.should == "should raise Exception"
   end
-  
+
   it "should raise_error with type" do
     lambda { raise }.should raise_error(RuntimeError)
     RSpec::Matchers.generated_description.should == "should raise RuntimeError"
   end
-  
+
   it "should raise_error with type and message" do
     lambda { raise "there was an error" }.should raise_error(RuntimeError, "there was an error")
     RSpec::Matchers.generated_description.should == "should raise RuntimeError with \"there was an error\""
   end
-  
+
   it "should respond_to" do
     [].should respond_to(:insert)
     RSpec::Matchers.generated_description.should == "should respond to #insert"
   end
-  
+
   it "should throw symbol" do
     lambda { throw :what_a_mess }.should throw_symbol
     RSpec::Matchers.generated_description.should == "should throw a Symbol"
   end
-  
+
   it "should throw symbol (with named symbol)" do
     lambda { throw :what_a_mess }.should throw_symbol(:what_a_mess)
     RSpec::Matchers.generated_description.should == "should throw :what_a_mess"
   end
-  
+
   def team
     Class.new do
       def players
@@ -152,7 +168,7 @@ describe "a Matcher with no description" do
        def failure_message; ""; end
      end.new
   end
-  
+
   it "provides a helpful message when used in a string-less example block" do
     5.should matcher
     RSpec::Matchers.generated_description.should =~ /When you call.*description method/m

data/spec/rspec/matchers/exist_spec.rb

@@ -1,65 +1,104 @@
 require 'spec_helper'
 
-class Substance
-  def initialize exists, description
-    @exists = exists
-    @description = description
-  end
-  def exist?(arg=nil)
-    @exists
-  end
-  def inspect
-    @description
-  end
-end
-  
-class SubstanceTester
-  include RSpec::Matchers
-  def initialize substance
-    @substance = substance
-  end
-  def should_exist
-    @substance.should exist
-  end
-end
+describe "exist matcher" do
+  context "when the object does not respond to #exist? or #exists?" do
+    subject { mock }
 
-describe "should exist" do
-  
-  before(:each) do
-    @real = Substance.new true, 'something real'
-    @imaginary = Substance.new false, 'something imaginary'
+    [:should, :should_not].each do |should_method|
+      describe "#{should_method} exist" do
+        it "raises an error" do
+          expect {
+            subject.send(should_method, exist)
+          }.to raise_error(NoMethodError)
+        end
+      end
+    end
   end
 
-  describe "within an example group" do
-  
-    it "passes if target exists" do
-      @real.should exist
-    end
-  
-    it "passes if target exists with args" do
-      @real.should exist('this arg')
-    end
-  
-    it "fails if target does not exist" do
-      lambda { @imaginary.should exist }.should fail
-    end
-    
-    it "describes itself" do
-      exist.description.should == "exist"
-    end
-    
-    it "passes should_not exist if target doesn't exist" do
-      lambda { @real.should_not exist }.should fail
+  [:exist?, :exists?].each do |predicate|
+    context "when the object responds to ##{predicate}" do
+      describe "should exist" do
+        it "passes if #{predicate}" do
+          mock(predicate => true).should exist
+        end
+
+        it "fails if not #{predicate}" do
+          expect {
+            mock(predicate => false).should exist
+          }.to fail_with(/expected .* to exist/)
+        end
+      end
+
+      describe "should not exist" do
+        it "passes if not #{predicate}" do
+          mock(predicate => false).should_not exist
+        end
+
+        it "fails if #{predicate}" do
+          expect {
+            mock(predicate => true).should_not exist
+          }.to fail_with(/expected .* not to exist/)
+        end
+      end
     end
   end
 
-  describe "outside of an example group" do
+  context "when the object responds to #exist? and #exists?" do
+    context "when they both return falsey values" do
+      subject { mock(:exist? => false, :exists? => nil) }
+
+      describe "should_not exist" do
+        it "passes" do
+          subject.should_not exist
+        end
+      end
+
+      describe "should exist" do
+        it "fails" do
+          expect {
+            subject.should exist
+          }.to fail_with(/expected .* to exist/)
+        end
+      end
+    end
+
+    context "when they both return truthy values" do
+      subject { mock(:exist? => true, :exists? => "something true") }
+
+      describe "should_not exist" do
+        it "fails" do
+          expect {
+            subject.should_not exist
+          }.to fail_with(/expected .* not to exist/)
+        end
+      end
 
-    it "passes if target exists" do
-      real_tester = SubstanceTester.new @real
-      real_tester.should_exist
+      describe "should exist" do
+        it "passes" do
+          subject.should exist
+        end
+      end
     end
 
+    context "when they return values with different truthiness" do
+      subject { mock(:exist? => true, :exists? => false) }
+
+      [:should, :should_not].each do |should_method|
+        describe "#{should_method} exist" do
+          it "raises an error" do
+            expect {
+              subject.send(should_method, exist)
+            }.to raise_error(/#exist\? and #exists\? returned different values/)
+          end
+        end
+      end
+    end
   end
 
+  it 'passes any provided arguments to the call to #exist?' do
+    object = mock
+    object.should_receive(:exist?).with(:foo, :bar) { true }
+
+    object.should exist(:foo, :bar)
+  end
 end

data/spec/rspec/matchers/has_spec.rb

@@ -26,7 +26,7 @@ describe "should have_sym(*args)" do
       Object.new.should have_key(:a)
     }.should raise_error(NoMethodError)
   end
-  
+
   it "reraises an exception thrown in #has_sym?(*args)" do
     o = Object.new
     def o.has_sym?(*args)
@@ -60,7 +60,7 @@ describe "should_not have_sym(*args)" do
       Object.new.should have_key(:a)
     }.should raise_error(NoMethodError)
   end
-  
+
   it "reraises an exception thrown in #has_sym?(*args)" do
     o = Object.new
     def o.has_sym?(*args)