rspec 1.1.11 → 1.1.12

data/spec/spec/interop/test/unit/test_unit_spec_helper.rb

@@ -3,6 +3,10 @@ require File.dirname(__FILE__) + '/../../../../ruby_forker'
 
 module TestUnitSpecHelper
   include RubyForker
+
+  def resources
+    File.dirname(__FILE__) + "/resources"
+  end
   
   def run_script(file_name)
     output = ruby(file_name)

data/spec/spec/matchers/be_close_spec.rb

@@ -1,38 +1,40 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Matchers
-    describe BeClose do
+    describe "be_close" do
       it "should match when value == target" do
-        BeClose.new(5.0, 0.5).matches?(5.0).should be_true
+        be_close(5.0, 0.5).matches?(5.0).should be_true
       end
       it "should match when value < (target + delta)" do
-        BeClose.new(5.0, 0.5).matches?(5.49).should be_true
+        be_close(5.0, 0.5).matches?(5.49).should be_true
       end
       it "should match when value > (target - delta)" do
-        BeClose.new(5.0, 0.5).matches?(4.51).should be_true
+        be_close(5.0, 0.5).matches?(4.51).should be_true
       end
       it "should not match when value == (target - delta)" do
-        BeClose.new(5.0, 0.5).matches?(4.5).should be_false
+        be_close(5.0, 0.5).matches?(4.5).should be_false
       end
       it "should not match when value < (target - delta)" do
-        BeClose.new(5.0, 0.5).matches?(4.49).should be_false
+        be_close(5.0, 0.5).matches?(4.49).should be_false
       end
       it "should not match when value == (target + delta)" do
-        BeClose.new(5.0, 0.5).matches?(5.5).should be_false
+        be_close(5.0, 0.5).matches?(5.5).should be_false
       end
       it "should not match when value > (target + delta)" do
-        BeClose.new(5.0, 0.5).matches?(5.51).should be_false
+        be_close(5.0, 0.5).matches?(5.51).should be_false
       end
       it "should provide a useful failure message" do
         #given
-          matcher = BeClose.new(5.0, 0.5)
+          matcher = be_close(5.0, 0.5)
         #when
           matcher.matches?(5.51)
         #then
           matcher.failure_message.should == "expected 5.0 +/- (< 0.5), got 5.51"
       end
       it "should describe itself" do
-        BeClose.new(5.0, 0.5).description.should == "be close to 5.0 (within +- 0.5)"
+        matcher = be_close(5.0, 0.5)
+        matcher.matches?(5.1)
+        matcher.description.should == "be close to 5.0 (within +- 0.5)"
       end
     end
   end

data/spec/spec/matchers/be_spec.rb

@@ -7,7 +7,7 @@ describe "should be_predicate" do
   end
 
   it "should pass when actual returns true for :predicates? (present tense)" do
-    actual = stub("actual", :exists? => true)
+    actual = stub("actual", :exists? => true, :exist? => true)
     actual.should be_exist
   end
 
@@ -21,7 +21,23 @@ describe "should be_predicate" do
   it "should fail when actual does not respond to :predicate?" do
     lambda {
       Object.new.should be_happy
-    }.should raise_error(NameError)
+    }.should raise_error(NameError, /happy\?/)
+  end
+  
+  it "should fail on error other than NameError" do
+    actual = stub("actual")
+    actual.should_receive(:foo?).and_raise("aaaah")
+    lambda {
+      actual.should be_foo
+    }.should raise_error(/aaaah/)
+  end
+  
+  it "should fail on error other than NameError (with the present tense predicate)" do
+    actual = Object.new
+    actual.should_receive(:foos?).and_raise("aaaah")
+    lambda {
+      actual.should be_foo
+    }.should raise_error(/aaaah/)
   end
 end
 
@@ -121,7 +137,7 @@ describe "should be_nil" do
   it "should fail when actual is not nil" do
     lambda {
       :not_nil.should be_nil
-    }.should fail_with("expected nil, got :not_nil")
+    }.should fail_with("expected nil? to return true, got false")
   end
 end
 
@@ -133,7 +149,7 @@ describe "should_not be_nil" do
   it "should fail when actual is nil" do
     lambda {
       nil.should_not be_nil
-    }.should fail_with("expected not nil, got nil")
+    }.should fail_with("expected nil? to return false, got true")
   end
 end
 
@@ -195,7 +211,15 @@ describe "should be ===" do
   end
 
   it "should fail when === operator returns false" do
-    lambda { Hash.should be === "not a hash" }.should fail_with(%[expected === "not a hash", got Hash])
+    lambda { Hash.should be === "not a hash" }.should fail_with(%[expected === not a hash, got Hash])
+  end
+end
+
+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)
   end
 end
 
@@ -206,11 +230,11 @@ describe "should be" do
   end
 
   it "should fail if actual is false" do
-    lambda {false.should be}.should fail_with("expected if to be satisfied, got false")
+    lambda {false.should be}.should fail_with("expected true, got false")
   end
 
   it "should fail if actual is nil" do
-    lambda {nil.should be}.should fail_with("expected if to be satisfied, got nil")
+    lambda {nil.should be}.should fail_with("expected true, got nil")
   end
 end
 
@@ -223,6 +247,15 @@ describe "should be(value)" do
   end
 end
 
+describe "'should be' with operator" do
+  it "should include 'be' in the description" do
+    (be > 6).description.should =~ /be > 6/
+    (be >= 6).description.should =~ /be >= 6/
+    (be <= 6).description.should =~ /be <= 6/
+    (be < 6).description.should =~ /be < 6/
+  end
+end
+
 
 describe "arbitrary predicate with DelegateClass" do
   it "should access methods defined in the delegating class (LH[#48])" do
@@ -246,3 +279,25 @@ describe "arbitrary predicate with DelegateClass" do
     delegate.should be_large
   end
 end
+
+describe "be_a, be_an" do
+  it "should pass when class matches" do
+    "foobar".should be_a(String)
+    [1,2,3].should be_an(Array)
+  end
+
+  it "should fail when class does not match" do
+    "foobar".should_not be_a(Hash)
+    [1,2,3].should_not be_an(Integer)
+  end
+end
+
+describe "be_an_instance_of" do
+  it "passes when direct class matches" do
+    5.should be_an_instance_of(Fixnum)
+  end
+  
+  it "fails when class is higher up hierarchy" do
+    5.should_not be_an_instance_of(Numeric)
+  end
+end

data/spec/spec/matchers/description_generation_spec.rb

@@ -107,6 +107,11 @@ describe "Matchers should be able to generate their own descriptions" do
     [1,2,3].should include(3)
     Spec::Matchers.generated_description.should == "should include 3"
   end
+
+  it "array.should =~ [1,2,3]" do
+    [1,2,3].should =~ [1,2,3]
+    Spec::Matchers.generated_description.should == "should contain exactly 1, 2 and 3"
+  end
   
   it "should match" do
     "this string".should match(/this string/)
@@ -151,3 +156,17 @@ describe "Matchers should be able to generate their own descriptions" do
     end.new
   end
 end
+
+describe "a Matcher with no description" do
+  def matcher
+     Class.new do
+       def matches?(ignore); true; end
+       def failure_message; ""; end
+     end.new
+  end
+  
+  it "should provide a helpful message when used in a string-less example block" do
+    5.should matcher
+    Spec::Matchers.generated_description.should =~ /When you call.*description method/m
+  end
+end

data/spec/spec/matchers/eql_spec.rb

@@ -2,24 +2,25 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Matchers
-    describe Eql do
+    describe "eql" do
       it "should match when actual.eql?(expected)" do
-        Eql.new(1).matches?(1).should be_true
+        eql(1).matches?(1).should be_true
       end
       it "should not match when !actual.eql?(expected)" do
-        Eql.new(1).matches?(2).should be_false
+        eql(1).matches?(2).should be_false
       end
       it "should describe itself" do
-        matcher = Eql.new(1)
+        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.new("1")
+        matcher = eql("1")
         matcher.matches?(1)
         matcher.failure_message.should == ["expected \"1\", got 1 (using .eql?)", "1", 1]
       end
       it "should provide message, expected and actual on #negative_failure_message" do
-        matcher = Eql.new(1)
+        matcher = eql(1)
         matcher.matches?(1)
         matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .eql?)", 1, 1]
       end

data/spec/spec/matchers/equal_spec.rb

@@ -2,24 +2,25 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Matchers
-    describe Equal do
+    describe "equal" do
       it "should match when actual.equal?(expected)" do
-        Equal.new(1).matches?(1).should be_true
+        equal(1).matches?(1).should be_true
       end
       it "should not match when !actual.equal?(expected)" do
-        Equal.new("1").matches?("1").should be_false
+        equal("1").matches?("1").should be_false
       end
       it "should describe itself" do
-        matcher = Equal.new(1)
+        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.new("1")
+        matcher = equal("1")
         matcher.matches?(1)
         matcher.failure_message.should == ["expected \"1\", got 1 (using .equal?)", "1", 1]
       end
       it "should provide message, expected and actual on #negative_failure_message" do
-        matcher = Equal.new(1)
+        matcher = equal(1)
         matcher.matches?(1)
         matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .equal?)", 1, 1]
       end

data/spec/spec/matchers/handler_spec.rb

@@ -54,66 +54,34 @@ module Spec
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(true)
-          ExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher)
         end
       
-        it "should explain when the matcher parameter is not a matcher" do
-          begin
-            nonmatcher = mock("nonmatcher")
-            actual = Object.new
-            ExpectationMatcherHandler.handle_matcher(actual, nonmatcher)
-          rescue Spec::Expectations::InvalidMatcherError => e
-          end
-
-          e.message.should =~ /^Expected a matcher, got /
-        end
-        
         it "should return the match value" do
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(:this_value)
-          ExpectationMatcherHandler.handle_matcher(actual, matcher).should == :this_value
+          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher).should == :this_value
         end
       end
     end
 
     describe NegativeExpectationMatcherHandler do
       describe "#handle_matcher" do
-        it "should explain when matcher does not support should_not" do
-          matcher = mock("matcher")
-          matcher.stub!(:matches?)
-          actual = Object.new
-          lambda {
-            NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
-          }.should fail_with(/Matcher does not support should_not.\n/)
-        end      
-      
         it "should ask the matcher if it matches" do
           matcher = mock("matcher")
           actual = Object.new
           matcher.stub!(:negative_failure_message)
           matcher.should_receive(:matches?).with(actual).and_return(false)
-          NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
         end
       
-        it "should explain when the matcher parameter is not a matcher" do
-          begin
-            nonmatcher = mock("nonmatcher")
-            actual = Object.new
-            NegativeExpectationMatcherHandler.handle_matcher(actual, nonmatcher)
-          rescue Spec::Expectations::InvalidMatcherError => e
-          end
-
-          e.message.should =~ /^Expected a matcher, got /
-        end
-
-        
         it "should return the match value" do
           matcher = mock("matcher")
           actual = Object.new
           matcher.should_receive(:matches?).with(actual).and_return(false)
           matcher.stub!(:negative_failure_message).and_return("ignore")
-          NegativeExpectationMatcherHandler.handle_matcher(actual, matcher).should be_false
+          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher).should be_false
         end
       end
     end
@@ -138,13 +106,6 @@ module Spec
         5.should arbitrary_matcher(:expected => 4).with(5) { 3 }
       end
   
-      it "should explain when matcher does not support should_not" do
-        lambda {
-          5.should_not positive_only_matcher(:expected => 5)
-        }.should fail_with(/Matcher does not support should_not.\n/)
-      end
-
-
     end
   end
 end

data/spec/spec/matchers/has_spec.rb

@@ -52,7 +52,7 @@ describe "should_not have_sym(*args)" do
   end
 end
 
-describe Spec::Matchers::Has do
+describe "has" do
   it "should work when the target implements #send" do
     o = {:a => "A"}
     def o.send(*args); raise "DOH! Library developers shouldn't use #send!" end

data/spec/spec/matchers/have_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-module HaveSpecHelper
+share_as :HaveSpecHelper do
   def create_collection_owner_with(n)
     owner = Spec::Expectations::Helper::CollectionOwner.new
     (1..n).each do |n|
@@ -9,8 +9,21 @@ module HaveSpecHelper
     end
     owner
   end
+  before(:each) do
+    unless defined?(::ActiveSupport::Inflector)
+      @active_support_was_not_defined
+      module ::ActiveSupport
+        class Inflector
+          def self.pluralize(string)
+            string.to_s + 's'
+          end
+        end
+      end
+    end
+  end
 end
 
+
 describe "should have(n).items" do
   include HaveSpecHelper
 
@@ -50,19 +63,6 @@ end
 describe 'should have(1).item when ActiveSupport::Inflector is defined' do
   include HaveSpecHelper
   
-  before(:each) do
-    unless defined?(ActiveSupport::Inflector)
-      @active_support_was_not_defined
-      module ActiveSupport
-        class Inflector
-          def self.pluralize(string)
-            string.to_s + 's'
-          end
-        end
-      end
-    end
-  end
-  
   it 'should pluralize the collection name' do
     owner = create_collection_owner_with(1)
     owner.should have(1).item
@@ -70,7 +70,7 @@ describe 'should have(1).item when ActiveSupport::Inflector is defined' do
   
   after(:each) do
     if @active_support_was_not_defined
-      Object.send :remove_const, :ActiveSupport
+      Object.__send__ :remove_const, :ActiveSupport
     end
   end
 end
@@ -96,7 +96,7 @@ describe 'should have(1).item when Inflector is defined' do
 
   after(:each) do
     if @inflector_was_not_defined
-      Object.send :remove_const, :Inflector
+      Object.__send__ :remove_const, :Inflector
     end
   end
 end
@@ -327,7 +327,7 @@ end
 
 describe Spec::Matchers::Have, "for a collection owner that implements #send" do
   include HaveSpecHelper
-
+  
   before(:each) do
     @collection = Object.new
     def @collection.floozles; [1,2] end
@@ -357,7 +357,12 @@ module Spec
   module Matchers
     describe Have do
       it "should have method_missing as private" do
-        Have.private_instance_methods.should include("method_missing")
+        with_ruby '1.8' do
+          Have.private_instance_methods.should include("method_missing")
+        end
+        with_ruby '1.9' do
+          Have.private_instance_methods.should include(:method_missing)
+        end
       end
       
       describe "respond_to?" do