rspec 1.0.5 → 1.0.6

data/spec/spec/dsl/composite_proc_builder_spec.rb

@@ -22,19 +22,6 @@ module Spec
         @builder.proc.call.should == [:proc1, :proc2]
       end
 
-      it "calls block on exceptions" do
-        exception1 = Exception.new("Proc1 Error")
-        exception2 = Exception.new("Proc2 Error")
-        @builder << proc {raise exception1}
-        @builder << proc {raise exception2}
-        @builder << proc {:successful}
-
-        errors = []
-        @builder.proc {|e| errors << e }.call.should == [exception1, exception2, :successful]
-
-        errors.should == [exception1, exception2]
-      end
-
       it "evals procs in the caller's instance" do
         the_proc = proc do
           @an_attribute = :the_value

data/spec/spec/dsl/configuration_spec.rb

@@ -26,6 +26,11 @@ module Spec
         @config.mock_with(:flexmock)
         @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/flexmock$/
       end
+
+      it "should let you set rr" do
+        @config.mock_with(:rr)
+        @config.mock_framework.should =~ /\/plugins\/mock_frameworks\/rr$/
+      end
       
       it "should let you set an arbitrary adapter module" do
         adapter = Module.new
@@ -36,7 +41,7 @@ module Spec
       it "should let you define modules to be included" do
         mod = Module.new
         @config.include mod
-        @config.included_modules.should include(mod)
+        @config.modules_for(nil).should include(mod)
       end
       
       [:prepend_before, :append_before, :prepend_after, :append_after].each do |m|

data/spec/spec/dsl/description_spec.rb

@@ -72,10 +72,18 @@ module Spec
       end
     end
 
-    describe Description, " constructed with options" do before(:each) {@description = Description.new(Behaviour, :a => "b")}
+    describe Description, " constructed with options" do
+      before(:each) do
+        @description = Description.new(Behaviour, :a => "b", :spec_path => "blah")
+      end
+
       it "should provide its options" do
         @description[:a].should == "b"
       end
+      
+      it "should wrap spec path using File.expand_path" do
+        @description[:spec_path].should == File.expand_path("blah")
+      end
     end
   end
 end

data/spec/spec/dsl/example_class_spec.rb

@@ -15,9 +15,9 @@ module Spec
       
       it "should report errors in example" do
         error = Exception.new
-        @reporter.should_receive(:example_finished).with("example", error, "example", false)
-
-        run(@example_class.new("example") {raise(error)})
+        example = @example_class.new("example") {raise(error)}
+        @reporter.should_receive(:example_finished).with(equal(example), error, "example", false)
+        run(example)
       end
     end
   end

data/spec/spec/dsl/example_instance_spec.rb

@@ -3,31 +3,27 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module DSL
     describe Example, " instance" do
-      # TODO - this should be
-      #   predicate_matchers :is_a
-      def is_a(error)
-        be_is_a(error)
-      end
+      predicate_matchers[:is_a] = [:is_a?]
       
-      before do
+      before(:each) do
         @reporter = stub("reporter", :example_started => nil, :example_finished => nil)
       end
       
       it "should send reporter example_started" do
         example=Example.new("example") {}
-        @reporter.should_receive(:example_started).with("example")
+        @reporter.should_receive(:example_started).with(equal(example))
         example.run(@reporter, nil, nil, false, nil)
       end
 
       it "should report its name for dry run" do
         example=Example.new("example") {}
-        @reporter.should_receive(:example_finished).with("example")
+        @reporter.should_receive(:example_finished).with(equal(example))
         example.run(@reporter, nil, nil, true, nil) #4th arg indicates dry run
       end
 
       it "should report success" do
         example=Example.new("example") {}
-        @reporter.should_receive(:example_finished).with("example", nil, nil, false)
+        @reporter.should_receive(:example_finished).with(equal(example), nil, nil, false)
         example.run(@reporter, nil, nil, nil, nil)
       end
 
@@ -35,16 +31,16 @@ module Spec
         example=Example.new("example") do
           (2+2).should == 5
         end
-        @reporter.should_receive(:example_finished).with("example", is_a(Spec::Expectations::ExpectationNotMetError), "example", false)
+        @reporter.should_receive(:example_finished).with(equal(example), is_a(Spec::Expectations::ExpectationNotMetError), "example", false)
         example.run(@reporter, nil, nil, nil, nil)
       end
 
       it "should report failure due to error" do
-        error=RuntimeError.new
+        error=NonStandardError.new
         example=Example.new("example") do
           raise(error)
         end
-        @reporter.should_receive(:example_finished).with("example", error, "example", false)
+        @reporter.should_receive(:example_finished).with(equal(example), error, "example", false)
         example.run(@reporter, nil, nil, nil, nil)
       end
 
@@ -54,14 +50,14 @@ module Spec
           self.instance_of?(Example).should == false
           self.instance_of?(scope_class).should == true
         end
-        @reporter.should_receive(:example_finished).with("should pass", nil, nil, false)
+        @reporter.should_receive(:example_finished).with(equal(example), nil, nil, false)
         example.run(@reporter, nil, nil, nil, scope_class.new)
       end
 
       it "should not run example block if before_each fails" do
         example_ran = false
         example=Example.new("should pass") {example_ran = true}
-        before_each = lambda {raise "Setup error"}
+        before_each = lambda {raise NonStandardError}
         example.run(@reporter, before_each, nil, nil, Object.new)
         example_ran.should == false
       end
@@ -69,7 +65,7 @@ module Spec
       it "should run after_each block if before_each fails" do
         after_each_ran = false
         example=Example.new("should pass") {}
-        before_each = lambda {raise "Setup error"}
+        before_each = lambda {raise NonStandardError}
         after_each = lambda {after_each_ran = true}
         example.run(@reporter, before_each, after_each, nil, Object.new)
         after_each_ran.should == true
@@ -77,13 +73,13 @@ module Spec
 
       it "should run after_each block when example fails" do
         example=Example.new("example") do
-          raise("in body")
+          raise(NonStandardError.new("in body"))
         end
         after_each=lambda do
           raise("in after_each")
         end
         @reporter.should_receive(:example_finished) do |example, error, location|
-          example.should eql("example")
+          example.should equal(example)
           location.should eql("example")
           error.message.should eql("in body")
         end
@@ -92,9 +88,9 @@ module Spec
 
       it "should report failure location when in before_each" do
         example=Example.new("example") {}
-        before_each=lambda { raise("in before_each") }
+        before_each=lambda { raise(NonStandardError.new("in before_each")) }
         @reporter.should_receive(:example_finished) do |name, error, location|
-          name.should eql("example")
+          name.should equal(example)
           error.message.should eql("in before_each")
           location.should eql("before(:each)")
         end
@@ -103,9 +99,9 @@ module Spec
 
       it "should report failure location when in after_each" do
         example = Example.new("example") {}
-        after_each = lambda { raise("in after_each") }
+        after_each = lambda { raise(NonStandardError.new("in after_each")) }
         @reporter.should_receive(:example_finished) do |name, error, location|
-          name.should eql("example")
+          name.should equal(example)
           error.message.should eql("in after_each")
           location.should eql("after(:each)")
         end
@@ -120,16 +116,16 @@ module Spec
         example = Example.new(:__generate_description) {
           5.should == 5
         }
-        @reporter.should_receive(:example_finished) do |desc, error, location|
-          desc.should == "NO NAME (Because of --dry-run)"
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should == "NO NAME (Because of --dry-run)"
         end
         example.run(@reporter, lambda{}, lambda{}, true, Object.new)
       end
 
       it "should report NO NAME when told to use generated description with no expectations" do
         example = Example.new(:__generate_description) {}
-        @reporter.should_receive(:example_finished) do |desc, error, location|
-          desc.should == "NO NAME (Because there were no expectations)"
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should == "NO NAME (Because there were no expectations)"
         end
         example.run(@reporter, lambda{}, lambda{}, false, Object.new)
       end
@@ -138,8 +134,8 @@ module Spec
         example = Example.new(:__generate_description) do
           5.should "" # Has no matches? method..
         end
-        @reporter.should_receive(:example_finished) do |desc, error, location|
-          desc.should == "NO NAME (Because of Error raised in matcher)"
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should == "NO NAME (Because of Error raised in matcher)"
         end
         example.run(@reporter, nil, nil, nil, Object.new)
       end
@@ -148,7 +144,9 @@ module Spec
         example = Example.new(:__generate_description) {
           5.should == 5
         }
-        @reporter.should_receive(:example_finished).with("should == 5", anything(), anything(), false)
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should == "should == 5"
+        end
         example.run(@reporter, nil, nil, nil, Object.new)
       end
 

data/spec/spec/dsl/example_matcher_spec.rb

@@ -0,0 +1,91 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module DSL
+    module ExampleMatcherSpecHelper
+      class MatchDescription
+        def initialize(description)
+          @description = description
+        end
+        
+        def matches?(matcher)
+          matcher.matches?(@description)
+        end
+        
+        def failure_message
+          "expected matcher.matches?(#{@description.inspect}) to return true, got false"
+        end
+        
+        def negative_failure_message
+          "expected matcher.matches?(#{@description.inspect}) to return false, got true"
+        end
+      end
+      def match_description(description)
+        MatchDescription.new(description)
+      end
+    end
+
+    describe ExampleMatcher do
+      include ExampleMatcherSpecHelper
+      
+      it "should match correct behaviour and example" do
+        matcher = ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("behaviour example")
+      end
+      
+      it "should not match wrong example" do
+        matcher = ExampleMatcher.new("behaviour", "other example")
+        matcher.should_not match_description("behaviour example")
+      end
+      
+      it "should not match wrong behaviour" do
+        matcher = ExampleMatcher.new("other behaviour", "example")
+        matcher.should_not match_description("behaviour example")
+      end
+      
+      it "should match example only" do
+        matcher = ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("example")
+      end
+      
+      it "should match behaviour only" do
+        matcher = ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("behaviour")
+      end
+      
+      it "should escape regexp chars" do
+        matcher = ExampleMatcher.new("(con|text)", "[example]")
+        matcher.should_not match_description("con p")
+      end
+      
+      it "should match when behaviour is modularized" do
+        matcher = ExampleMatcher.new("MyModule::MyClass", "example")
+        matcher.should match_description("MyClass example")
+      end      
+    end
+
+    describe ExampleMatcher, "normal case" do
+      it "matches when passed in example matches" do
+        matcher = ExampleMatcher.new("Foo", "bar")
+        matcher.matches?(["no match", "Foo bar"]).should == true
+      end
+
+      it "does not match when no passed in examples match" do
+        matcher = ExampleMatcher.new("Foo", "bar")
+        matcher.matches?(["no match1", "no match2"]).should == false
+      end
+    end
+
+    describe ExampleMatcher, "where description has '::' in it" do
+      it "matches when passed in example matches" do
+        matcher = ExampleMatcher.new("Foo::Bar", "baz")
+        matcher.matches?(["no match", "Foo::Bar baz"]).should == true
+      end
+
+      it "does not match when no passed in examples match" do
+        matcher = ExampleMatcher.new("Foo::Bar", "baz")
+        matcher.matches?(["no match1", "no match2"]).should == false
+      end
+    end
+  end
+end

data/spec/spec/dsl/shared_behaviour_spec.rb

@@ -96,6 +96,30 @@ module Spec
           end
         end.should_not raise_error(ArgumentError)
       end
+      
+      it "should NOT complain when adding the same shared behaviour in same file with different absolute path" do
+        shared_behaviour_1 = behaviour_class.new("shared behaviour", :shared => true) {}
+        shared_behaviour_2 = behaviour_class.new("shared behaviour", :shared => true) {}
+
+        shared_behaviour_1.description[:spec_path] = "/my/spec/a/../shared.rb"
+        shared_behaviour_2.description[:spec_path] = "/my/spec/b/../shared.rb"
+
+        behaviour_class.add_shared_behaviour(shared_behaviour_1)
+        behaviour_class.add_shared_behaviour(shared_behaviour_2)
+      end
+        
+      it "should complain when adding a different shared behaviour with the same name in a different file with the same basename" do
+        shared_behaviour_1 = behaviour_class.new("shared behaviour", :shared => true) {}
+        shared_behaviour_2 = behaviour_class.new("shared behaviour", :shared => true) {}
+
+        shared_behaviour_1.description[:spec_path] = "/my/spec/a/shared.rb"
+        shared_behaviour_2.description[:spec_path] = "/my/spec/b/shared.rb"
+
+        behaviour_class.add_shared_behaviour(shared_behaviour_1)
+        lambda do
+          behaviour_class.add_shared_behaviour(shared_behaviour_2)
+        end.should raise_error(ArgumentError, /already exists/)
+      end
         
       it "should add examples to current behaviour when calling it_should_behave_like" do
         shared_behaviour = make_shared_behaviour("shared behaviour") {}

data/spec/spec/expectations/extensions/object_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 
-describe "Object#should" do
+describe Object, "#should" do
   before(:each) do
     @target = "target"
     @matcher = mock("matcher")
@@ -23,7 +23,7 @@ describe "Object#should" do
   end
 end
 
-describe "Object#should_not" do
+describe Object, "#should_not" do
   before(:each) do
     @target = "target"
     @matcher = mock("matcher")

data/spec/spec/expectations/fail_with_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-describe "Spec::Expectations.fail_with with no diff" do
+describe Spec::Expectations, "#fail_with with no diff" do
   before(:each) do
     @old_differ = Spec::Expectations.differ
     Spec::Expectations.differ = nil
@@ -23,7 +23,7 @@ describe "Spec::Expectations.fail_with with no diff" do
   end
 end
 
-describe "Spec::Expectations.fail_with with diff" do
+describe Spec::Expectations, "#fail_with with diff" do
   before(:each) do
     @old_differ = Spec::Expectations.differ
     @differ = mock("differ")

data/spec/spec/matchers/have_spec.rb

@@ -56,7 +56,7 @@ describe "should have(n).items where result responds to items but returns someth
     end.new
     lambda do
       owner.should have(3).items
-    end.should raise_error(RuntimeError, "expected items to be a collection but it does not respond to #length or #size")
+    end.should raise_error("expected items to be a collection but it does not respond to #length or #size")
   end
 end
 

data/spec/spec/matchers/operator_matcher_spec.rb

@@ -12,7 +12,7 @@ describe "should ==" do
   
   it "should fail when target.==(actual) returns false" do
     subject = "apple"
-    Spec::Expectations.should_receive(:fail_with).with(%[expected "orange", got "apple" (using ==)], "orange", "apple")
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ==)], "orange", "apple")
     subject.should == "orange"
   end
 
@@ -28,7 +28,7 @@ describe "should_not ==" do
   
   it "should fail when target.==(actual) returns false" do
     subject = "apple"
-    Spec::Expectations.should_receive(:fail_with).with(%[expected not == "apple", got "apple"], "apple", "apple")
+    Spec::Expectations.should_receive(:fail_with).with(%[expected not: == "apple",\n         got:    "apple"], "apple", "apple")
     subject.should_not == "apple"
   end
 
@@ -45,7 +45,7 @@ describe "should ===" do
   it "should fail when target.===(actual) returns false" do
     subject = "apple"
     subject.should_receive(:===).with("orange").and_return(false)
-    Spec::Expectations.should_receive(:fail_with).with(%[expected "orange", got "apple" (using ===)], "orange", "apple")
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: "orange",\n     got: "apple" (using ===)], "orange", "apple")
     subject.should === "orange"
   end
 
@@ -62,7 +62,7 @@ describe "should_not ===" do
   it "should fail when target.===(actual) returns false" do
     subject = "apple"
     subject.should_receive(:===).with("apple").and_return(true)
-    Spec::Expectations.should_receive(:fail_with).with(%[expected not === "apple", got "apple"], "apple", "apple")
+    Spec::Expectations.should_receive(:fail_with).with(%[expected not: === "apple",\n         got:     "apple"], "apple", "apple")
     subject.should_not === "apple"
   end
 
@@ -79,7 +79,7 @@ describe "should =~" do
   it "should fail when target.=~(actual) returns false" do
     subject = "fu"
     subject.should_receive(:=~).with(/oo/).and_return(false)
-    Spec::Expectations.should_receive(:fail_with).with(%[expected =~ /oo/, got "fu"], /oo/, "fu")
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: /oo/,\n     got: "fu" (using =~)], /oo/, "fu")
     subject.should =~ /oo/
   end
 
@@ -96,7 +96,7 @@ describe "should_not =~" do
   it "should fail when target.=~(actual) returns false" do
     subject = "foo"
     subject.should_receive(:=~).with(/oo/).and_return(true)
-    Spec::Expectations.should_receive(:fail_with).with(%[expected not =~ /oo/, got "foo"], /oo/, "foo")
+    Spec::Expectations.should_receive(:fail_with).with(%[expected not: =~ /oo/,\n         got:    "foo"], /oo/, "foo")
     subject.should_not =~ /oo/
   end
 
@@ -109,7 +109,7 @@ describe "should >" do
   end
 
   it "should fail if > fails" do
-    Spec::Expectations.should_receive(:fail_with).with(%[expected > 5, got 4], 5, 4)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: > 5,\n     got:   4], 5, 4)
     4.should > 5
   end
 
@@ -123,7 +123,7 @@ describe "should >=" do
   end
 
   it "should fail if > fails" do
-    Spec::Expectations.should_receive(:fail_with).with(%[expected >= 5, got 4], 5, 4)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: >= 5,\n     got:    4], 5, 4)
     4.should >= 5
   end
 
@@ -136,7 +136,7 @@ describe "should <" do
   end
 
   it "should fail if > fails" do
-    Spec::Expectations.should_receive(:fail_with).with(%[expected < 3, got 4], 3, 4)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: < 3,\n     got:   4], 3, 4)
     4.should < 3
   end
 
@@ -150,7 +150,7 @@ describe "should <=" do
   end
 
   it "should fail if > fails" do
-    Spec::Expectations.should_receive(:fail_with).with(%[expected <= 3, got 4], 3, 4)
+    Spec::Expectations.should_receive(:fail_with).with(%[expected: <= 3,\n     got:    4], 3, 4)
     4.should <= 3
   end