rspec 1.2.2 → 1.2.3

data/spec/spec/expectations/fail_with_spec.rb

@@ -12,17 +12,24 @@ describe Spec::Expectations, "#fail_with with no diff" do
     }.should fail_with("the message")
   end
   
-  it "should handle an Array" do
-    lambda {
-      Spec::Expectations.fail_with ["the message","expected","actual"]
-    }.should fail_with("the message")
-  end
-
   after(:each) do
     Spec::Expectations.differ = @old_differ
   end
 end
 
+describe Spec::Expectations, "#fail_with with Array" do
+  before(:each) do
+    Spec.stub!(:warn)
+  end
+  
+  it "is deprecated" do
+    Spec.should_receive(:warn)
+    lambda {
+      Spec::Expectations.fail_with ["message", "expected", "actual"]
+    }.should raise_error
+  end
+end
+
 describe Spec::Expectations, "#fail_with with diff" do
   before(:each) do
     @old_differ = Spec::Expectations.differ
@@ -58,13 +65,6 @@ describe Spec::Expectations, "#fail_with with diff" do
     }.should fail_with("the message")
   end
   
-  it "should call differ if expected/actual are presented in an Array with message" do
-    @differ.should_receive(:diff_as_string).with("actual","expected").and_return("diff")
-    lambda {
-      Spec::Expectations.fail_with(["the message", "expected", "actual"])
-    }.should fail_with(/the message\nDiff:diff/)
-  end
-  
   after(:each) do
     Spec::Expectations.differ = @old_differ
   end

data/spec/spec/expectations/handler_spec.rb

@@ -7,9 +7,7 @@ module ExampleExpectations
       if args.last.is_a? Hash
         @expected = args.last[:expected]
       end
-      if block_given?
-        @expected = block.call
-      end
+      @expected = block.call if block
       @block = block
     end
     
@@ -48,20 +46,20 @@ end
 
 module Spec
   module Expectations
-    describe ExpectationMatcherHandler do
+    describe PositiveExpectationHandler do
       describe "#handle_matcher" do
         it "asks the matcher if it matches" do
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(true)
-          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
         end
       
         it "returns the match value" do
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(:this_value)
-          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher).should == :this_value
+          Spec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher).should == :this_value
         end
         
         it "calls failure_message_for_should if the matcher implements it" do
@@ -70,8 +68,22 @@ module Spec
           
           ::Spec::Expectations.should_receive(:fail_with).with("message")
           
-          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
+        end
+        
+        it "calls fail if matcher.diffable?" do
+          matcher = mock("matcher",
+            :diffable? => true,
+            :failure_message_for_should => "message",
+            :matches? => false,
+            :expected => [1],
+            :actual   => 2
+          )
+          actual = Object.new
+          
+          ::Spec::Expectations.should_receive(:fail_with).with("message", 1, 2)
           
+          Spec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
         end
         
         it "calls failure_message if the matcher does not implement failure_message_for_should" do
@@ -80,19 +92,19 @@ module Spec
           
           ::Spec::Expectations.should_receive(:fail_with).with("message")
           
-          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::PositiveExpectationHandler.handle_matcher(actual, matcher)
           
         end
       end
     end
 
-    describe NegativeExpectationMatcherHandler do
+    describe NegativeExpectationHandler do
       describe "#handle_matcher" do
         it "asks the matcher if it doesn't match when the matcher responds to #does_not_match?" do
           matcher = mock("matcher", :does_not_match? => true, :negative_failure_message => nil)
           actual = Object.new
           matcher.should_receive(:does_not_match?).with(actual).and_return(true)
-          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
 
         it "asks the matcher if it matches when the matcher doesn't respond to #does_not_match?" do
@@ -100,7 +112,7 @@ module Spec
           actual = Object.new
           matcher.stub!(:negative_failure_message)
           matcher.should_receive(:matches?).with(actual).and_return(false)
-          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
       
         it "returns the match value" do
@@ -108,7 +120,7 @@ module Spec
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(false)
           matcher.stub!(:negative_failure_message).and_return("ignore")
-          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher).should be_false
+          Spec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher).should be_false
         end
 
         
@@ -118,7 +130,7 @@ module Spec
           
           ::Spec::Expectations.should_receive(:fail_with).with("message")
           
-          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
           
         end
         
@@ -128,13 +140,30 @@ module Spec
           
           ::Spec::Expectations.should_receive(:fail_with).with("message")
           
-          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
+          
+        end
+
+        
+        it "calls fail if matcher.diffable?" do
+          matcher = mock("matcher",
+            :diffable? => true,
+            :failure_message_for_should_not => "message",
+            :matches? => true,
+            :expected => [1],
+            :actual   => 2
+          )
+          actual = Object.new
+          
+          ::Spec::Expectations.should_receive(:fail_with).with("message", 1, 2)
           
+          Spec::Expectations::NegativeExpectationHandler.handle_matcher(actual, matcher)
         end
+
       end
     end
     
-    describe ExpectationMatcherHandler do
+    describe PositiveExpectationHandler do
       include ExampleExpectations
       
       it "should handle submitted args" do

data/spec/spec/matchers/be_close_spec.rb

@@ -31,6 +31,15 @@ module Spec
         #then
           matcher.failure_message_for_should.should == "expected 5.0 +/- (< 0.5), got 5.51"
       end
+
+      it "provides a failure message for should tno" do
+        #given
+          matcher = be_close(5.0, 0.5)
+        #when
+          matcher.matches?(5.49)
+        #then
+          matcher.failure_message_for_should_not.should == "expected 5.0 +/- (< 0.5), got 5.49"
+      end
       it "provides a description" do
         matcher = be_close(5.0, 0.5)
         matcher.matches?(5.1)

data/spec/spec/matchers/be_instance_of_spec.rb

@@ -2,22 +2,24 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Matchers
-    [:be_instance_of, :be_an_instance_of].each do |method|
+    [:be_an_instance_of, :be_instance_of].each do |method|
       describe "actual.should #{method}(expected)" do
         it "passes if actual is instance of expected class" do
           5.should send(method, Fixnum)
         end
 
         it "fails if actual is instance of subclass of expected class" do
-          lambda { 5.should send(method, Numeric) }.should fail_with(%Q{expected instance of Numeric, got 5})
+          lambda { 5.should send(method, Numeric) }.should fail_with(%Q{expected 5 to be an instance of Numeric})
         end
 
         it "fails with failure message for should unless actual is instance of expected class" do
-          lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected instance of Array, got "foo"})
+          lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected "foo" to be an instance of Array})
         end
 
         it "provides a description" do
-          Spec::Matchers::BeInstanceOf.new(Class).description.should == "be an instance of Class"
+          matcher = be_an_instance_of(Fixnum)
+          matcher.matches?(Numeric)
+          matcher.description.should == "be an instance of Fixnum"
         end
       end
       

data/spec/spec/matchers/be_kind_of_spec.rb

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Matchers
-    [:be_kind_of, :be_a_kind_of].each do |method|
+    [:be_a_kind_of, :be_kind_of].each do |method|
       describe "actual.should #{method}(expected)" do
         it "passes if actual is instance of expected class" do
           5.should send(method, Fixnum)
@@ -13,11 +13,13 @@ module Spec
         end
 
         it "fails with failure message for should unless actual is kind of expected class" do
-          lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected kind of Array, got "foo"})
+          lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected "foo" to be a kind of Array})
         end
 
         it "provides a description" do
-          Spec::Matchers::BeKindOf.new(Class).description.should == "be a kind of Class"
+          matcher = be_a_kind_of(String)
+          matcher.matches?("this")
+          matcher.description.should == "be a kind of String"
         end
       end
       

data/spec/spec/matchers/be_spec.rb

@@ -219,7 +219,7 @@ describe "should_not with operators" do
   it "should coach user to stop using operators with should_not" do
     lambda {
       5.should_not be < 6
-    }.should raise_error(/not only FAILED,\nit reads really poorly./m)
+    }.should raise_error(/not only FAILED,\nit is a bit confusing./m)
   end
 end
 
@@ -259,10 +259,6 @@ end
 
 describe "arbitrary predicate with DelegateClass" do
   it "should access methods defined in the delegating class (LH[#48])" do
-    pending(%{
-      Looks like DelegateClass is delegating #should to the
-      delegate. Not sure how to fix this one. Or if we even should."
-    })
     require 'delegate'
     class ArrayDelegate < DelegateClass(Array)
       def initialize(array)

data/spec/spec/matchers/compatibility_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-Spec::Matchers.create :have_public_instance_method do |method|
+Spec::Matchers.define :have_public_instance_method do |method|
   match do |klass|
     klass.public_instance_methods.include?(method)
   end

data/spec/spec/matchers/dsl_spec.rb

@@ -4,13 +4,22 @@ module Spec
   module Matchers
     module DSL
       describe "#create" do
+        it "is deprecated" do
+          Spec.should_receive(:deprecate)
+          mod = Module.new
+          mod.extend Spec::Matchers::DSL
+          mod.create(:foo)
+        end
+      end
+      
+      describe "#define" do
         it "creates a method that initializes a new matcher with the submitted name and expected arg" do
           # FIXME - this expects new to be called, but we need something
           # more robust - that expects new to be called with a specific
           # block (lambda, proc, whatever)
           mod = Module.new
           mod.extend Spec::Matchers::DSL
-          mod.create(:foo)
+          mod.define(:foo)
     
           obj = Object.new
           obj.extend mod

data/spec/spec/matchers/eql_spec.rb

@@ -4,25 +4,29 @@ module Spec
   module Matchers
     describe "eql" do
       it "should match when actual.eql?(expected)" do
-        eql(1).matches?(1).should be_true
+        1.should eql(1)
       end
+      
       it "should not match when !actual.eql?(expected)" do
-        eql(1).matches?(2).should be_false
+        1.should_not eql(2)
       end
+      
       it "should describe itself" do
         matcher = eql(1)
         matcher.matches?(1)
         matcher.description.should == "eql 1"
       end
+      
       it "should provide message, expected and actual on #failure_message" do
         matcher = eql("1")
         matcher.matches?(1)
-        matcher.failure_message_for_should.should == ["expected \"1\", got 1 (using .eql?)", "1", 1]
+        matcher.failure_message_for_should.should == "\nexpected \"1\"\n     got 1\n\n(compared using eql?)\n"
       end
+      
       it "should provide message, expected and actual on #negative_failure_message" do
         matcher = eql(1)
         matcher.matches?(1)
-        matcher.failure_message_for_should_not.should == ["expected 1 not to equal 1 (using .eql?)", 1, 1]
+        matcher.failure_message_for_should_not.should == "\nexpected 1 not to equal 1\n\n(compared using eql?)\n"
       end
     end
   end

data/spec/spec/matchers/equal_spec.rb

@@ -4,25 +4,29 @@ module Spec
   module Matchers
     describe "equal" do
       it "should match when actual.equal?(expected)" do
-        equal(1).matches?(1).should be_true
+        1.should equal(1)
       end
+
       it "should not match when !actual.equal?(expected)" do
-        equal("1").matches?("1").should be_false
+        1.should_not equal("1")
       end
+      
       it "should describe itself" do
         matcher = equal(1)
         matcher.matches?(1)
         matcher.description.should == "equal 1"
       end
+      
       it "should provide message, expected and actual on #failure_message" do
         matcher = equal("1")
         matcher.matches?(1)
-        matcher.failure_message_for_should.should == ["expected \"1\", got 1 (using .equal?)", "1", 1]
+        matcher.failure_message_for_should.should == "\nexpected \"1\"\n     got 1\n     \n(compared using equal?)\n"
       end
+      
       it "should provide message, expected and actual on #negative_failure_message" do
         matcher = equal(1)
         matcher.matches?(1)
-        matcher.failure_message_for_should_not.should == ["expected 1 not to equal 1 (using .equal?)", 1, 1]
+        matcher.failure_message_for_should_not.should == "\nexpected 1 not to equal 1\n\n(compared using equal?)\n"
       end
     end
   end

data/spec/spec/matchers/exist_spec.rb

@@ -41,7 +41,7 @@ describe "should exist" do
     end
     
     it "describes itself" do
-      exist.description.should == "exists"
+      exist.description.should == "exist"
     end
     
     it "passes should_not exist if target doesn't exist" do

data/spec/spec/matchers/include_spec.rb

@@ -35,7 +35,7 @@ describe "should include(with, multiple, args)" do
   it "should fail if target does not include any one of the items" do
     lambda {
       [1,2,3].should include(1,2,4)
-    }.should fail_with("expected [1, 2, 3] to include 1, 2 and 4")
+    }.should fail_with("expected [1, 2, 3] to include 1, 2, and 4")
   end
   
   it 'should pass if target is a Hash missing any item as a key' do

data/spec/spec/matchers/match_array_spec.rb

@@ -1,5 +1,19 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
+class UnsortableObject
+  def initialize(id)
+    @id = id
+  end
+
+  def inspect
+    @id.to_s
+  end
+
+  def ==(other)
+    false
+  end
+end
+
 describe "array.should =~ other_array" do
   it "should pass if target contains all items" do
     [1,2,3].should =~ [1,2,3]
@@ -41,7 +55,7 @@ the extra elements were:        [4]
 MESSAGE
   end
 
-  it "should sort items in the error message" do
+  it "should sort 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)
@@ -52,6 +66,17 @@ the extra elements were:        [5, 6]
 MESSAGE
   end
 
+    it "should 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)
+expected collection contained:  [4, 3]
+actual collection contained:    [2, 1]
+the missing elements were:      [4, 3]
+the extra elements were:        [2, 1]
+MESSAGE
+    end
+
   it "should accurately report extra elements when there are duplicates" do
     lambda {
       [1,1,1,5].should =~ [1,5]

data/spec/spec/matchers/match_spec.rb

@@ -14,7 +14,7 @@ describe "should match(expected)" do
   it "should provide message, expected and actual on failure" do
     matcher = match(/rings/)
     matcher.matches?("string")
-    matcher.failure_message_for_should.should == ["expected \"string\" to match /rings/", /rings/, "string"]
+    matcher.failure_message_for_should.should == "expected \"string\" to match /rings/"
   end
 end
 
@@ -32,6 +32,6 @@ describe "should_not match(expected)" do
   it "should provide 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/", /tri/, "string"]
+    matcher.failure_message_for_should_not.should == "expected \"string\" not to match /tri/"
   end
 end