rspec 1.1.12 → 1.2.0

data/spec/spec/example/nested_example_group_spec.rb

@@ -59,11 +59,11 @@ module Spec
     describe "Nested Example Groups" do
       describe "description options", :other_options => "other options" do
         it "should have a spec_path" do
-          self.class.description_options[:spec_path].should match(/#{__FILE__}/)
+          self.class.options[:spec_path].should match(/#{__FILE__}/)
         end
 
         it "should pass other options" do
-          self.class.description_options[:other_options].should == "other options"
+          self.class.options[:other_options].should == "other options"
         end
       end
     end

data/spec/spec/example/pending_module_spec.rb

@@ -2,57 +2,82 @@ module Spec
   module Example
     describe Pending do
       
-      it 'should raise an ExamplePendingError if no block is supplied' do
-        lambda {
-          pending "TODO"
-        }.should raise_error(ExamplePendingError, /TODO/)
-      end
-      
-      it 'should raise an ExamplePendingError if a supplied block fails as expected' do
-        lambda {
-          pending "TODO" do
-            raise "oops"
-          end
-        }.should raise_error(ExamplePendingError, /TODO/)
-      end
-      
-      it 'should raise an ExamplePendingError if a supplied block fails as expected with a mock' do
-        lambda {
-          pending "TODO" do
-            m = mock('thing')
-            m.should_receive(:foo)
-            m.rspec_verify
+      context "when no block is supplied" do
+        it "raises an ExamplePendingError if no block is supplied" do
+          lambda {
+            pending "TODO"
+          }.should raise_error(ExamplePendingError, /TODO/)
+        end
+
+        it "reports the file and line number" do
+          file = __FILE__
+          line_number = __LINE__ + 2
+          begin
+            pending("TODO")
+          rescue => error
+          ensure
+            error.pending_caller.should =~ /^#{file}:#{line_number}/
           end
-        }.should raise_error(ExamplePendingError, /TODO/)
+        end
       end
       
-      it 'should raise a PendingExampleFixedError if a supplied block starts working' do
-        lambda {
-          pending "TODO" do
-            # success!
+      context "when the supplied block fails" do
+        it "raises an ExamplePendingError if a supplied block fails as expected" do
+          lambda {
+            pending "TODO" do
+              raise "oops"
+            end
+          }.should raise_error(ExamplePendingError, /TODO/)
+        end
+
+        it "reports the file and line number" do
+          file = __FILE__
+          line_number = __LINE__ + 2
+          begin
+            pending do
+              raise
+            end
+          rescue => error
+          ensure
+            error.pending_caller.should =~ /#{file}:#{line_number}/
           end
-        }.should raise_error(PendingExampleFixedError, /TODO/)
+        end
       end
       
-      it "should have the correct file and line number for pending given with a block which fails" do
-        file = __FILE__
-        line_number = __LINE__ + 2
-        begin
-          pending do
-            raise
+      context "when the supplied block fails with a mock" do
+        it "raises an ExamplePendingError if a supplied block fails as expected with a mock" do
+          lambda {
+            pending "TODO" do
+              m = mock("thing")
+              m.should_receive(:foo)
+              m.rspec_verify
+            end
+          }.should raise_error(ExamplePendingError, /TODO/)
+        end
+
+        it "reports the file and line number" do
+          file = __FILE__
+          line_number = __LINE__ + 2
+          begin
+            pending do
+              m = mock("thing")
+              m.should_receive(:foo)
+              m.rspec_verify
+            end
+          rescue => error
+          ensure
+            error.pending_caller.should =~ /#{file}:#{line_number}/
           end
-        rescue => error
-          error.pending_caller.should == "#{file}:#{line_number}"
         end
       end
       
-      it "should have the correct file and line number for pending given with no block" do
-        file = __FILE__
-        line_number = __LINE__ + 2
-        begin
-          pending("TODO")
-        rescue => error
-          error.pending_caller.should == "#{file}:#{line_number}"
+      context "when the supplied block passes" do
+        it "raises a PendingExampleFixedError" do
+          lambda {
+            pending "TODO" do
+              # success!
+            end
+          }.should raise_error(PendingExampleFixedError, /TODO/)
         end
       end
     end

data/spec/spec/example/shared_example_group_spec.rb

@@ -8,7 +8,7 @@ module Spec
         before(:each) do
           @formatter = Spec::Mocks::Mock.new("formatter", :null_object => true)
           options.formatters << formatter
-          @example_group = Class.new(ExampleGroup).describe("example_group")
+          @example_group = Class.new(ExampleGroupDouble).describe("example_group")
           class << example_group
             public :include
           end
@@ -22,7 +22,7 @@ module Spec
         
         describe "#register" do
           it "creates a new shared example group with the submitted args" do
-            block = lambda {}
+            block = lambda {|a|}
             group = SharedExampleGroup.new("shared group") do end
             Spec::Example::SharedExampleGroup.should_receive(:new).with("share me", &block).and_return(group)
             Spec::Example::SharedExampleGroup.register("share me", &block)
@@ -130,12 +130,12 @@ module Spec
         end
 
         it "adds examples to current example_group using it_should_behave_like with a module" do
-          AllThings = describe "all things", :shared => true do
+          ::AllThings = describe "all things", :shared => true do
             it "should do stuff" do end
           end
         
           example_group = describe "one thing" do
-            it_should_behave_like AllThings
+            it_should_behave_like ::AllThings
           end
         
           example_group.number_of_examples.should == 1

data/spec/spec/{matchers → expectations}/handler_spec.rb

@@ -50,25 +50,52 @@ module Spec
   module Expectations
     describe ExpectationMatcherHandler do
       describe "#handle_matcher" do
-        it "should ask the matcher if it matches" 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)
         end
       
-        it "should return the match value" do
+        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
         end
+        
+        it "calls failure_message_for_should if the matcher implements it" do
+          matcher = mock("matcher", :failure_message_for_should => "message", :matches? => false)
+          actual = Object.new
+          
+          ::Spec::Expectations.should_receive(:fail_with).with("message")
+          
+          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher)
+          
+        end
+        
+        it "calls failure_message if the matcher does not implement failure_message_for_should" do
+          matcher = mock("matcher", :failure_message => "message", :matches? => false)
+          actual = Object.new
+          
+          ::Spec::Expectations.should_receive(:fail_with).with("message")
+          
+          Spec::Expectations::ExpectationMatcherHandler.handle_matcher(actual, matcher)
+          
+        end
       end
     end
 
     describe NegativeExpectationMatcherHandler do
       describe "#handle_matcher" do
-        it "should ask the matcher if it matches" 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)
+        end
+
+        it "asks the matcher if it matches when the matcher doesn't respond to #does_not_match?" do
           matcher = mock("matcher")
           actual = Object.new
           matcher.stub!(:negative_failure_message)
@@ -76,13 +103,34 @@ module Spec
           Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
         end
       
-        it "should return the match value" do
+        it "returns 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")
           Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher).should be_false
         end
+
+        
+        it "calls failure_message_for_should_not if the matcher implements it" do
+          matcher = mock("matcher", :failure_message_for_should_not => "message", :matches? => true)
+          actual = Object.new
+          
+          ::Spec::Expectations.should_receive(:fail_with).with("message")
+          
+          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+          
+        end
+        
+        it "calls negative_failure_message if the matcher does not implement failure_message_for_should_not" do
+          matcher = mock("matcher", :negative_failure_message => "message", :matches? => true)
+          actual = Object.new
+          
+          ::Spec::Expectations.should_receive(:fail_with).with("message")
+          
+          Spec::Expectations::NegativeExpectationMatcherHandler.handle_matcher(actual, matcher)
+          
+        end
       end
     end
     

data/spec/spec/interop/test/unit/resources/spec_that_fails.rb

@@ -1,7 +1,7 @@
 rspec_lib = File.dirname(__FILE__) + "/../../../../../../lib"
 $:.unshift rspec_lib unless $:.include?(rspec_lib)
-require 'test/unit'
-require 'spec'
+require 'spec/autorun'
+require 'spec/test/unit'
 
 describe "example group with failures" do
   it "should fail" do

data/spec/spec/interop/test/unit/resources/spec_that_passes.rb

@@ -1,7 +1,7 @@
 rspec_lib = File.dirname(__FILE__) + "/../../../../../../lib"
 $:.unshift rspec_lib unless $:.include?(rspec_lib)
-require 'test/unit'
-require 'spec'
+require 'spec/autorun'
+require 'spec/test/unit'
 
 describe "example group with passing examples" do
   it "should pass" do

data/spec/spec/interop/test/unit/resources/spec_with_errors.rb

@@ -1,7 +1,7 @@
 rspec_lib = File.dirname(__FILE__) + "/../../../../../../lib"
 $:.unshift rspec_lib unless $:.include?(rspec_lib)
-require 'test/unit'
-require 'spec'
+require 'spec/autorun'
+require 'spec/test/unit'
 
 describe "example group with errors" do
   it "should raise errors" do

data/spec/spec/interop/test/unit/resources/spec_with_options_hash.rb

@@ -1,7 +1,7 @@
 rspec_lib = File.dirname(__FILE__) + "/../../../../../../lib"
 $:.unshift rspec_lib unless $:.include?(rspec_lib)
-require 'test/unit'
-require 'spec'
+require 'spec/autorun'
+require 'spec/test/unit'
 
 describe "options hash" do
   describe "#options" do

data/spec/spec/interop/test/unit/resources/test_case_that_fails.rb

@@ -1,7 +1,7 @@
 rspec_lib = File.dirname(__FILE__) + "/../../../../../../lib"
 $:.unshift rspec_lib unless $:.include?(rspec_lib)
-require 'test/unit'
-require 'spec'
+require 'spec/autorun'
+require 'spec/test/unit'
 
 class TestCaseThatFails < Test::Unit::TestCase
   def test_that_fails

data/spec/spec/interop/test/unit/resources/test_case_that_passes.rb

@@ -1,7 +1,7 @@
 rspec_lib = File.dirname(__FILE__) + "/../../../../../../lib"
 $:.unshift rspec_lib unless $:.include?(rspec_lib)
-require 'test/unit'
-require 'spec'
+require 'spec/autorun'
+require 'spec/test/unit'
 
 class TestCaseThatPasses < Test::Unit::TestCase
   def test_that_passes

data/spec/spec/interop/test/unit/resources/test_case_with_errors.rb

@@ -1,7 +1,7 @@
 rspec_lib = File.dirname(__FILE__) + "/../../../../../../lib"
 $:.unshift rspec_lib unless $:.include?(rspec_lib)
-require 'test/unit'
-require 'spec'
+require 'spec/autorun'
+require 'spec/test/unit'
 
 class TestCaseWithErrors < Test::Unit::TestCase
   def test_with_error

data/spec/spec/interop/test/unit/resources/testsuite_adapter_spec_with_test_unit.rb

@@ -1,7 +1,7 @@
 rspec_lib = File.dirname(__FILE__) + "/../../../../../../lib"
 $:.unshift rspec_lib unless $:.include?(rspec_lib)
-require "test/unit"
-require "spec"
+require 'spec/autorun'
+require 'spec/test/unit'
 
 module Test
   module Unit

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

@@ -42,8 +42,4 @@ describe "Test::Unit::TestCase" do
       $?.should == 256
     end
   end
-  
-  describe "not yet implemented examples:" do
-    it "this example should be reported as pending (not an error)"
-  end
 end

data/spec/spec/matchers/be_close_spec.rb

@@ -29,7 +29,7 @@ module Spec
         #when
           matcher.matches?(5.51)
         #then
-          matcher.failure_message.should == "expected 5.0 +/- (< 0.5), got 5.51"
+          matcher.failure_message_for_should.should == "expected 5.0 +/- (< 0.5), got 5.51"
       end
       it "should describe itself" do
         matcher = be_close(5.0, 0.5)

data/spec/spec/matchers/be_instance_of_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Matchers
+    [:be_instance_of, :be_an_instance_of].each do |method|
+      describe "#{method}" do
+        it "passes if object is instance of given class" do
+          5.should send(method, Fixnum)
+        end
+
+        it "failse if object is instance of subclass of expected class" do
+          lambda { 5.should send(method, Numeric) }.should fail_with(%Q{expected instance of Numeric, got 5})
+        end
+
+        it "fails with failure message unless object is kind of given class" do
+          lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected instance of Array, got "foo"})
+        end
+
+        it "fails with negative failure message if object is kind of given class" do
+          lambda { "foo".should_not send(method, String) }.should fail_with(%Q{expected "foo" not to be an instance of String})
+        end
+
+        it "provides a description" do
+          Spec::Matchers::BeInstanceOf.new(Class).description.should == "be an instance of Class"
+        end
+      end
+    end
+  end
+end

data/spec/spec/matchers/be_kind_of_spec.rb

@@ -0,0 +1,29 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Matchers
+    [:be_kind_of, :be_a_kind_of].each do |method|
+      describe "#{method}" do
+        it "passes if object is instance of given class" do
+          5.should send(method, Fixnum)
+        end
+
+        it "passes if object is instance of subclass of expected class" do
+          5.should send(method, Numeric)
+        end
+
+        it "fails with failure message unless object is kind of given class" do
+          lambda { "foo".should send(method, Array) }.should fail_with(%Q{expected kind of Array, got "foo"})
+        end
+
+        it "fails with negative failure message if object is kind of given class" do
+          lambda { "foo".should_not send(method, String) }.should fail_with(%Q{expected "foo" not to be a kind of String})
+        end
+
+        it "provides a description" do
+          Spec::Matchers::BeKindOf.new(Class).description.should == "be a kind of Class"
+        end
+      end
+    end
+  end
+end

data/spec/spec/matchers/change_spec.rb

@@ -20,6 +20,10 @@ describe "should change(actual, message)" do
       lambda {}.should change(@instance, :some_value)
     end.should fail_with("some_value should have changed, but is still 5")
   end
+  
+  it "provides a #description" do
+    change(@instance, :some_value).description.should == "change #some_value"
+  end
 end
 
 describe "should_not change(actual, message)" do
@@ -60,6 +64,10 @@ describe "should change { block }" do
       lambda {}.should change do; end
     end.should raise_error(Spec::Matchers::MatcherError, /block passed to should or should_not/)
   end
+  
+  it "provides a #description" do
+    change { @instance.some_value }.description.should == "change #result"
+  end
 end
 
 describe "should_not change { block }" do
@@ -299,6 +307,18 @@ describe "should change(actual, message).from(old).to(new)" do
   it "should pass when #from comes before #to" do
     lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("string").to("cat")
   end
+  
+  it "should show the correct messaging when #after and #to are different" do
+    lambda do
+      lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("string").to("dog")
+    end.should fail_with("some_value should have been changed to \"dog\", but is now \"cat\"")
+  end
+  
+  it "should show the correct messaging when #before and #from are different" do
+    lambda do
+      lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("not_string").to("cat")
+    end.should fail_with("some_value should have initially been \"not_string\", but was \"string\"")
+  end
 end
 
 describe "should change{ block }.from(old).to(new)" do