rspec 1.1.12 → 1.2.0

data/spec/spec/matchers/compatibility_spec.rb

@@ -0,0 +1,34 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+Spec::Matchers.create :have_public_instance_method do |method|
+  match do |klass|
+    klass.public_instance_methods.include?(method)
+  end
+end
+
+module Spec
+  module Matchers
+    describe Spec::Matchers do
+      (Spec::Matchers.constants.sort).each do |c|
+        if (Class === (klass = Spec::Matchers.const_get(c)))
+          describe klass do
+            if klass.public_instance_methods.include?('failure_message_for_should')
+              describe "called with should" do
+                subject { klass }
+                it { should have_public_instance_method('failure_message_for_should')}
+                it { should have_public_instance_method('failure_message')}
+              end
+            end
+            if klass.public_instance_methods.include?('failure_message_for_should_not')
+              describe "called with should not" do
+                subject { klass }
+                it { should have_public_instance_method('failure_message_for_should_not')}
+                it { should have_public_instance_method('negative_failure_message')}
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/spec/spec/matchers/description_generation_spec.rb

@@ -50,18 +50,6 @@ describe "Matchers should be able to generate their own descriptions" do
     Spec::Matchers.generated_description.should == "should be between 0 and 10"
   end
 
-  it "should be_few_words predicate should be transformed to 'be few words'" do
-    5.should be_kind_of(Fixnum)
-    Spec::Matchers.generated_description.should == "should be kind of Fixnum"
-  end
-
-  it "should preserve a proper prefix for be predicate" do
-    5.should be_a_kind_of(Fixnum)
-    Spec::Matchers.generated_description.should == "should be a kind of Fixnum"
-    5.should be_an_instance_of(Fixnum)
-    Spec::Matchers.generated_description.should == "should be an instance of Fixnum"
-  end
-  
   it "should equal" do
     expected = "expected"
     expected.should equal(expected)

data/spec/spec/matchers/eql_spec.rb

@@ -17,12 +17,12 @@ module Spec
       it "should provide message, expected and actual on #failure_message" do
         matcher = eql("1")
         matcher.matches?(1)
-        matcher.failure_message.should == ["expected \"1\", got 1 (using .eql?)", "1", 1]
+        matcher.failure_message_for_should.should == ["expected \"1\", got 1 (using .eql?)", "1", 1]
       end
       it "should provide message, expected and actual on #negative_failure_message" do
         matcher = eql(1)
         matcher.matches?(1)
-        matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .eql?)", 1, 1]
+        matcher.failure_message_for_should_not.should == ["expected 1 not to equal 1 (using .eql?)", 1, 1]
       end
     end
   end

data/spec/spec/matchers/equal_spec.rb

@@ -17,12 +17,12 @@ module Spec
       it "should provide message, expected and actual on #failure_message" do
         matcher = equal("1")
         matcher.matches?(1)
-        matcher.failure_message.should == ["expected \"1\", got 1 (using .equal?)", "1", 1]
+        matcher.failure_message_for_should.should == ["expected \"1\", got 1 (using .equal?)", "1", 1]
       end
       it "should provide message, expected and actual on #negative_failure_message" do
         matcher = equal(1)
         matcher.matches?(1)
-        matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .equal?)", 1, 1]
+        matcher.failure_message_for_should_not.should == ["expected 1 not to equal 1 (using .equal?)", 1, 1]
       end
     end
   end

data/spec/spec/matchers/exist_spec.rb

@@ -23,7 +23,7 @@ class SubstanceTester
   end
 end
 
-describe "should exist," do
+describe "should exist" do
   
   before(:each) do
     @real = Substance.new true, 'something real'
@@ -32,15 +32,19 @@ describe "should exist," do
 
   describe "within an example group" do
   
-    it "should pass if target exists" do
+    it "passes if target exists" do
       @real.should exist
     end
   
-    it "should fail if target does not exist" do
+    it "fails if target does not exist" do
       lambda { @imaginary.should exist }.should fail
     end
     
-    it "should pass if target doesn't exist" do
+    it "describes itself" do
+      exist.description.should == "exists"
+    end
+    
+    it "passes should_not exist if target doesn't exist" do
       lambda { @real.should_not exist }.should fail
     end
   end

data/spec/spec/matchers/have_spec.rb

@@ -212,7 +212,7 @@ describe "should have_at_least(n).items" do
     size_matcher.matches?(owner)
     
     #then
-    length_matcher.negative_failure_message.should == <<-EOF
+    length_matcher.failure_message_for_should_not.should == <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_least(3).items_in_collection_with_length_method
@@ -220,7 +220,7 @@ We recommend that you use this instead:
   should have_at_most(2).items_in_collection_with_length_method
 EOF
 
-    size_matcher.negative_failure_message.should == <<-EOF
+    size_matcher.failure_message_for_should_not.should == <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_least(3).items_in_collection_with_size_method
@@ -266,7 +266,7 @@ describe "should have_at_most(n).items" do
     size_matcher.matches?(owner)
     
     #then
-    length_matcher.negative_failure_message.should == <<-EOF
+    length_matcher.failure_message_for_should_not.should == <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_most(3).items_in_collection_with_length_method
@@ -274,7 +274,7 @@ We recommend that you use this instead:
   should have_at_least(4).items_in_collection_with_length_method
 EOF
     
-    size_matcher.negative_failure_message.should == <<-EOF
+    size_matcher.failure_message_for_should_not.should == <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_most(3).items_in_collection_with_size_method

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.should == ["expected \"string\" to match /rings/", /rings/, "string"]
+    matcher.failure_message_for_should.should == ["expected \"string\" to match /rings/", /rings/, "string"]
   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.negative_failure_message.should == ["expected \"string\" not to match /tri/", /tri/, "string"]
+    matcher.failure_message_for_should_not.should == ["expected \"string\" not to match /tri/", /tri/, "string"]
   end
 end

data/spec/spec/matchers/matcher_methods_spec.rb

@@ -58,7 +58,7 @@ This module should provide the following methods, each of which returns a Matche
       end
 
       it "should convert have_xyz to Has(:have_xyz)" do
-        self.should_receive(:has).with(:have_whatever)
+        Has.should_receive(:new).with(:have_whatever)
         have_whatever
       end
     end

data/spec/spec/matchers/matcher_spec.rb

@@ -0,0 +1,97 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Matchers
+    describe Spec::Matchers::Matcher do
+      context "without overrides" do
+        before(:each) do
+          @matcher = Spec::Matchers::Matcher.new(:be_a_multiple_of, 3) do |multiple|
+            match do |actual|
+              actual % multiple == 0
+            end
+          end
+        end
+        
+        it "provides a default description" do
+          @matcher.matches?(0)
+          @matcher.description.should == "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"
+        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"
+        end
+      end
+      
+      context "with overrides" do
+        before(:each) do
+          @matcher = Spec::Matchers::Matcher.new(:be_boolean, true) do |boolean|
+            match do |actual|
+              actual
+            end
+            description do
+              "be the boolean #{boolean}"
+            end
+            failure_message_for_should do |actual|
+              "expected #{actual} to be the boolean #{boolean}"
+            end
+            failure_message_for_should_not do |actual|
+              "expected #{actual} not to be the boolean #{boolean}"
+            end
+          end
+        end
+
+        it "does not hide result of match block when true" do
+          @matcher.matches?(true).should be_true
+        end
+
+        it "does not hide result of match block when false" do
+          @matcher.matches?(false).should be_false
+        end
+
+        it "overrides the description" do
+          @matcher.matches?(true)
+          @matcher.description.should == "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"
+        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"
+        end
+      end
+      
+      context "#new" do
+        it "passes matches? arg to match block" do
+          matcher = Spec::Matchers::Matcher.new(:ignore) do 
+            match do |actual|
+              actual == 5
+            end
+          end
+          matcher.matches?(5).should be_true
+        end
+
+        it "exposes arg submitted through #new to matcher block" do
+          matcher = Spec::Matchers::Matcher.new(:ignore, 4) do |expected|
+            match do |actual|
+              actual > expected
+            end
+          end
+          matcher.matches?(5).should be_true
+        end
+      end
+
+      context "matching with overrides" do
+      end
+    end
+  end
+end

data/spec/spec/matchers/throw_symbol_spec.rb

@@ -17,11 +17,11 @@ module Spec
         end
         it "should provide a failure message" do
           @matcher.matches?(lambda{})
-          @matcher.failure_message.should == "expected a Symbol but nothing was thrown"
+          @matcher.failure_message_for_should.should == "expected a Symbol but nothing was thrown"
         end
         it "should provide a negative failure message" do
           @matcher.matches?(lambda{ throw :sym})
-          @matcher.negative_failure_message.should == "expected no Symbol, got :sym"
+          @matcher.failure_message_for_should_not.should == "expected no Symbol, got :sym"
         end
       end
           
@@ -42,15 +42,15 @@ module Spec
         end
         it "should provide a failure message when no Symbol is thrown" do
           @matcher.matches?(lambda{})
-          @matcher.failure_message.should == "expected :sym but nothing was thrown"
+          @matcher.failure_message_for_should.should == "expected :sym but nothing was thrown"
         end
         it "should provide a failure message when wrong Symbol is thrown" do
           @matcher.matches?(lambda{ throw :other_sym })
-          @matcher.failure_message.should == "expected :sym, got :other_sym"
+          @matcher.failure_message_for_should.should == "expected :sym, got :other_sym"
         end
         it "should provide a negative failure message" do
           @matcher.matches?(lambda{ throw :sym })
-          @matcher.negative_failure_message.should == "expected :sym not to be thrown"
+          @matcher.failure_message_for_should_not.should == "expected :sym not to be thrown"
         end
         it "should only match NameErrors raised by uncaught throws" do
           @matcher.matches?(lambda{ sym }).should be_false
@@ -77,15 +77,15 @@ module Spec
         end
         it "should provide a failure message when no Symbol is thrown" do
           @matcher.matches?(lambda{})
-          @matcher.failure_message.should == %q[expected :sym with "a" but nothing was thrown]
+          @matcher.failure_message_for_should.should == %q[expected :sym with "a" but nothing was thrown]
         end
         it "should provide a failure message when wrong Symbol is thrown" do
           @matcher.matches?(lambda{ throw :other_sym })
-          @matcher.failure_message.should == %q[expected :sym with "a", got :other_sym]
+          @matcher.failure_message_for_should.should == %q[expected :sym with "a", got :other_sym]
         end
         it "should provide a negative failure message" do
           @matcher.matches?(lambda{ throw :sym })
-          @matcher.negative_failure_message.should == %q[expected :sym with "a" not to be thrown]
+          @matcher.failure_message_for_should_not.should == %q[expected :sym with "a" not to be thrown]
         end
         it "should only match NameErrors raised by uncaught throws" do
           @matcher.matches?(lambda{ sym }).should be_false

data/spec/spec/mocks/{failing_mock_argument_constraints_spec.rb → failing_argument_matchers_spec.rb}

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Mocks
-    describe "failing MockArgumentConstraints" do
+    describe "failing MockArgumentMatchers" do
       before(:each) do
         @mock = mock("test mock")
         @reporter = Mock.new("reporter", :null_object => true)
@@ -83,7 +83,7 @@ module Spec
          end.should raise_error(MockExpectationError, "Mock 'test mock' expected :msg with (hash_including(:a=>1)) but received it with ({})")
       end
 
-      it "should fail with block constraints" do
+      it "should fail with block matchers" do
         lambda do
           @mock.should_receive(:msg).with {|arg| arg.should == :received }
           @mock.msg :no_msg_for_you

data/spec/spec/mocks/hash_including_matcher_spec.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Mocks
-    module ArgumentConstraints
-      describe HashIncludingConstraint do
+    module ArgumentMatchers
+      describe HashIncludingMatcher do
         
         it "should describe itself properly" do
-          HashIncludingConstraint.new(:a => 1).description.should == "hash_including(:a=>1)"
+          HashIncludingMatcher.new(:a => 1).description.should == "hash_including(:a=>1)"
         end      
 
         describe "passing" do
@@ -18,7 +18,7 @@ module Spec
             hash_including(:a => 1).should == {:a => 1, :b => 2}
           end
           
-          describe "when matching against other constraints" do
+          describe "when matching against other matchers" do
             it "should match an int against anything()" do
               hash_including(:a => anything, :b => 2).should == {:a => 1, :b => 2}
             end

data/spec/spec/mocks/hash_not_including_matcher_spec.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Mocks
-    module ArgumentConstraints
-      describe HashNotIncludingConstraint do
+    module ArgumentMatchers
+      describe HashNotIncludingMatcher do
         
         it "should describe itself properly" do
-          HashNotIncludingConstraint.new(:a => 5).description.should == "hash_not_including(:a=>5)"
+          HashNotIncludingMatcher.new(:a => 5).description.should == "hash_not_including(:a=>5)"
         end      
 
         describe "passing" do

data/spec/spec/mocks/mock_spec.rb

@@ -11,6 +11,21 @@ module Spec
         @mock.rspec_reset
       end
       
+      describe "deprecated #stub_everything method" do
+        before(:each) do
+          Kernel.stub!(:warn)
+        end
+        
+        it "creates a mock that behaves as a null object" do
+          stub_everything.should be_null_object
+        end
+        
+        it "provides deprecation warning" do
+          Kernel.should_receive(:warn).with(/DEPRECATION: stub_everything.* is deprecated./)
+          stub_everything
+        end
+      end
+      
       it "should report line number of expectation of unreceived message" do
         expected_error_line = __LINE__; @mock.should_receive(:wont_happen).with("x", 3)
         begin
@@ -100,7 +115,7 @@ module Spec
         lambda {
           @mock.something("a","d","c")
           @mock.rspec_verify
-        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with (\"a\", \"d\", \"c\")")
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with ([\"a\", \"d\", \"c\"])")
       end
            
       it "should raise exception if args don't match when method called even when using null_object" do
@@ -109,7 +124,7 @@ module Spec
         lambda {
           @mock.something("a","d","c")
           @mock.rspec_verify
-        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with (\"a\", \"d\", \"c\")")
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with ([\"a\", \"d\", \"c\"])")
       end
            
       it "should fail if unexpected method called" do
@@ -550,5 +565,15 @@ module Spec
         valid_html_str.should_not include('<')
       end
     end
+    
+    describe "==" do
+      it "sends '== self' to the comparison object" do
+        first = mock('first')
+        second = mock('second')
+        
+        first.should_receive(:==).with(second)
+        second == first
+      end
+    end
   end
 end

data/spec/spec/mocks/nil_expectation_warning_spec.rb

@@ -33,7 +33,7 @@ module Spec
     describe "#allow_message_expectations_on_nil" do
       
       it "should not effect subsequent examples" do
-        example_group = Class.new(ExampleGroup)
+        example_group = Class.new(::Spec::Example::ExampleGroupDouble)
         example_group.it("when called in one example that doesn't end up setting an expectation on nil") do
                         allow_message_expectations_on_nil
                       end