rspec 1.2.9 → 1.3.1

data/spec/spec/matchers/match_array_spec.rb

@@ -66,7 +66,8 @@ 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
+  it "should not sort items in the error message if they don't all respond to <=>" do
+    with_ruby 1.8 do
       lambda {
         [UnsortableObject.new(2), UnsortableObject.new(1)].should =~ [UnsortableObject.new(4), UnsortableObject.new(3)]
       }.should fail_with(<<-MESSAGE)
@@ -76,6 +77,7 @@ the missing elements were:      [4, 3]
 the extra elements were:        [2, 1]
 MESSAGE
     end
+  end
 
   it "should accurately report extra elements when there are duplicates" do
     lambda {
@@ -97,6 +99,11 @@ the missing elements were:      [1]
 MESSAGE
   end
 
+  it "should work with subclasses of Array" do
+    class SuperArray < Array; end
+    SuperArray.new([1,2,3]).should =~ SuperArray.new([3,2,1])
+  end
+
 end
 
 describe "should_not =~ [:with, :multiple, :args]" do

data/spec/spec/matchers/matcher_spec.rb

@@ -1,5 +1,7 @@
 require 'spec_helper'
 
+class UnexpectedError < StandardError; end
+
 module Spec
   module Matchers
     describe Matcher do
@@ -52,6 +54,26 @@ module Spec
         matcher.actual.should == 'actual string'
       end
 
+      context "wrapping another expectation (should == ...)" do
+        it "returns true if the wrapped expectation passes" do
+          matcher = Spec::Matchers::Matcher.new(:name, 'value') do |expected|
+            match do |actual|
+              actual.should == expected
+            end
+          end
+          matcher.matches?('value').should be_true
+        end
+
+        it "returns false if the wrapped expectation fails" do
+          matcher = Spec::Matchers::Matcher.new(:name, 'value') do |expected|
+            match do |actual|
+              actual.should == expected
+            end
+          end
+          matcher.matches?('other value').should be_false
+        end
+      end
+
       context "with overrides" do
         before(:each) do
           @matcher = Spec::Matchers::Matcher.new(:be_boolean, true) do |boolean|
@@ -207,22 +229,61 @@ module Spec
         matcher.matches?(8).should be_true
       end
 
-      it "lets you override the actual() in messages" do
-        matcher = Spec::Matchers::Matcher.new(:be_foo) do
-          match do |actual|
-            @submitted = actual
-            false
+      describe "#match_unless_raises" do
+        context "with a passing assertion" do
+          let(:mod) do
+            Module.new do
+              def assert_equal(a,b)
+                a == b ? nil : (raise UnexpectedError.new("#{a} does not equal #{b}"))
+              end
+            end
+          end
+          let(:matcher) do
+            m = mod
+            Spec::Matchers::Matcher.new :equal, 4 do |expected|
+              extend m
+              match_unless_raises UnexpectedError do
+                assert_equal expected, actual
+              end
+            end
+          end
+          it "passes as you would expect" do
+            matcher.matches?(4).should be_true
           end
+          it "fails as you would expect" do
+            matcher.matches?(5).should be_false
+          end
+        end
 
-          def actual
-            "replaced"
+        context "with an unexpected error" do
+          let(:matcher) do
+            Spec::Matchers::Matcher.new :foo, :bar do |expected|
+              match_unless_raises SyntaxError do |actual|
+                raise "unexpected exception"
+              end
+            end
+          end
+
+          it "raises the error" do
+            expect do
+              matcher.matches?(:bar)
+            end.to raise_error("unexpected exception")
           end
         end
 
-        matcher.matches?("foo")
-        matcher.failure_message_for_should.should =~ /replaced/
       end
 
+      it "can define chainable methods" do
+        matcher = Spec::Matchers::Matcher.new(:name) do
+          chain(:expecting) do |expected_value|
+            @expected_value = expected_value
+          end
+          match { |actual| actual == @expected_value }
+        end
+
+        matcher.expecting('value').matches?('value').should be_true
+        matcher.expecting('value').matches?('other value').should be_false
+      end
     end
   end
 end

data/spec/spec/matchers/raise_exception_spec.rb

@@ -0,0 +1,345 @@
+require 'spec_helper'
+
+describe "should raise_exception" do
+  it "should pass if anything is raised" do
+    lambda {raise}.should raise_exception
+  end
+  
+  it "should fail if nothing is raised" do
+    lambda {
+      lambda {}.should raise_exception
+    }.should fail_with("expected Exception but nothing was raised")
+  end
+end
+
+describe "should raise_error" do
+  it "should pass if anything is raised" do
+    lambda {raise}.should raise_error
+  end
+  
+  it "should fail if nothing is raised" do
+    lambda {
+      lambda {}.should raise_error
+    }.should fail_with("expected Exception but nothing was raised")
+  end
+end
+
+describe "should raise_exception {|e| ... }" do
+  it "passes if there is an exception" do
+    ran = false
+    lambda { non_existent_method }.should raise_exception {|e|
+      ran = true
+    }
+    ran.should be_true
+  end
+
+  it "passes the exception to the block" do
+    exception = nil
+    lambda { non_existent_method }.should raise_exception {|e|
+      exception = e
+    }
+    exception.should be_kind_of(NameError)
+  end
+end
+
+describe "should_not raise_exception" do
+  it "should pass if nothing is raised" do
+    lambda {}.should_not raise_exception
+  end
+  
+  it "should fail if anything is raised" do
+    lambda {
+      lambda {raise}.should_not raise_exception
+    }.should fail_with("expected no Exception, got RuntimeError")
+  end
+end
+
+describe "should raise_exception(message)" do
+  it "should pass if RuntimeError is raised with the right message" do
+    lambda {raise 'blah'}.should raise_exception('blah')
+  end
+  it "should pass if RuntimeError is raised with a matching message" do
+    lambda {raise 'blah'}.should raise_exception(/blah/)
+  end
+  it "should pass if any other exception is raised with the right message" do
+    lambda {raise NameError.new('blah')}.should raise_exception('blah')
+  end
+  it "should fail if RuntimeError exception is raised with the wrong message" do
+    lambda do
+      lambda {raise 'blarg'}.should raise_exception('blah')
+    end.should fail_with("expected Exception with \"blah\", got #<RuntimeError: blarg>")
+  end
+  it "should fail if any other exception is raised with the wrong message" do
+    lambda do
+      lambda {raise NameError.new('blarg')}.should raise_exception('blah')
+    end.should fail_with("expected Exception with \"blah\", got #<NameError: blarg>")
+  end
+end
+
+describe "should_not raise_exception(message)" do
+  it "should pass if RuntimeError exception is raised with the different message" do
+    lambda {raise 'blarg'}.should_not raise_exception('blah')
+  end
+  it "should pass if any other exception is raised with the wrong message" do
+    lambda {raise NameError.new('blarg')}.should_not raise_exception('blah')
+  end
+  it "should fail if RuntimeError is raised with message" do
+    lambda do
+      lambda {raise 'blah'}.should_not raise_exception('blah')
+    end.should fail_with(%Q|expected no Exception with "blah", got #<RuntimeError: blah>|)
+  end
+  it "should fail if any other exception is raised with message" do
+    lambda do
+      lambda {raise NameError.new('blah')}.should_not raise_exception('blah')
+    end.should fail_with(%Q|expected no Exception with "blah", got #<NameError: blah>|)
+  end
+end
+
+describe "should raise_exception(NamedError)" do
+  it "should pass if named exception is raised" do
+    lambda { non_existent_method }.should raise_exception(NameError)
+  end
+  
+  it "should fail if nothing is raised" do
+    lambda {
+      lambda { }.should raise_exception(NameError)
+    }.should fail_with("expected NameError but nothing was raised")
+  end
+  
+  it "should fail if another exception is raised (NameError)" do
+    lambda {
+      lambda { raise }.should raise_exception(NameError)
+    }.should fail_with("expected NameError, got RuntimeError")
+  end
+  
+  it "should fail if another exception is raised (NameError)" do
+    lambda {
+      lambda { load "non/existent/file" }.should raise_exception(NameError)
+    }.should fail_with(/expected NameError, got #<LoadError/)
+  end
+end
+
+describe "should_not raise_exception(NamedError)" do
+  it "should pass if nothing is raised" do
+    lambda { }.should_not raise_exception(NameError)
+  end
+  
+  it "should pass if another exception is raised" do
+    lambda { raise }.should_not raise_exception(NameError)
+  end
+  
+  it "should fail if named exception is raised" do
+    lambda {
+      lambda { 1 + 'b' }.should_not raise_exception(TypeError)
+    }.should fail_with(/expected no TypeError, got #<TypeError: String can't be/)
+  end  
+end
+
+describe "should raise_exception(NamedError, exception_message) with String" do
+  it "should pass if named exception is raised with same message" do
+    lambda { raise "example message" }.should raise_exception(RuntimeError, "example message")
+  end
+  
+  it "should fail if nothing is raised" do
+    lambda {
+      lambda {}.should raise_exception(RuntimeError, "example message")
+    }.should fail_with("expected RuntimeError with \"example message\" but nothing was raised")
+  end
+  
+  it "should fail if incorrect exception is raised" do
+    lambda {
+      lambda { raise }.should raise_exception(NameError, "example message")
+    }.should fail_with("expected NameError with \"example message\", got RuntimeError")
+  end
+  
+  it "should fail if correct exception is raised with incorrect message" do
+    lambda {
+      lambda { raise RuntimeError.new("not the example message") }.should raise_exception(RuntimeError, "example message")
+    }.should fail_with(/expected RuntimeError with \"example message\", got #<RuntimeError: not the example message/)
+  end
+end
+
+describe "should raise_exception(NamedError, exception_message) { |err| ... }" do
+  it "should yield exception if named exception is raised with same message" do
+    ran = false
+
+    lambda {
+      raise "example message"
+    }.should raise_exception(RuntimeError, "example message") { |err|
+      ran = true
+      err.class.should == RuntimeError
+      err.message.should == "example message"
+    }
+
+    ran.should == true
+  end
+
+  it "yielded block should be able to fail on it's own right" do
+    ran, passed = false, false
+
+    lambda {
+      lambda {
+        raise "example message"
+      }.should raise_exception(RuntimeError, "example message") { |err|
+        ran = true
+        5.should == 4
+        passed = true
+      }
+    }.should fail_with(/expected: 4/m)
+
+    ran.should == true
+    passed.should == false
+  end
+
+  it "should NOT yield exception if no exception was thrown" do
+    ran = false
+
+    lambda {
+      lambda {}.should raise_exception(RuntimeError, "example message") { |err|
+        ran = true
+      }
+    }.should fail_with("expected RuntimeError with \"example message\" but nothing was raised")
+
+    ran.should == false
+  end
+
+  it "should not yield exception if exception class is not matched" do
+    ran = false
+
+    lambda {
+      lambda {
+        raise "example message"
+      }.should raise_exception(SyntaxError, "example message") { |err|
+        ran = true
+      }
+    }.should fail_with("expected SyntaxError with \"example message\", got #<RuntimeError: example message>")
+
+    ran.should == false
+  end
+
+  it "should NOT yield exception if exception message is not matched" do
+    ran = false
+
+    lambda {
+      lambda {
+        raise "example message"
+      }.should raise_exception(RuntimeError, "different message") { |err|
+        ran = true
+      }
+    }.should fail_with("expected RuntimeError with \"different message\", got #<RuntimeError: example message>")
+
+    ran.should == false
+  end
+end
+
+describe "should_not raise_exception(NamedError, exception_message) { |err| ... }" do
+  it "should pass if nothing is raised" do
+    ran = false
+
+    lambda {}.should_not raise_exception(RuntimeError, "example message") { |err|
+      ran = true
+    }
+
+    ran.should == false
+  end
+
+  it "should pass if a different exception is raised" do
+    ran = false
+
+    lambda { raise }.should_not raise_exception(NameError, "example message") { |err|
+      ran = true
+    }
+
+    ran.should == false
+  end
+
+  it "should pass if same exception is raised with different message" do
+    ran = false
+
+    lambda {
+      raise RuntimeError.new("not the example message")
+    }.should_not raise_exception(RuntimeError, "example message") { |err|
+      ran = true
+    }
+
+    ran.should == false
+  end
+
+  it "should fail if named exception is raised with same message" do
+    ran = false
+
+    lambda {
+      lambda {
+        raise "example message"
+      }.should_not raise_exception(RuntimeError, "example message") { |err|
+        ran = true
+      }
+    }.should fail_with("expected no RuntimeError with \"example message\", got #<RuntimeError: example message>")
+
+    ran.should == false
+  end
+end
+
+describe "should_not raise_exception(NamedError, exception_message) with String" do
+  it "should pass if nothing is raised" do
+    lambda {}.should_not raise_exception(RuntimeError, "example message")
+  end
+  
+  it "should pass if a different exception is raised" do
+    lambda { raise }.should_not raise_exception(NameError, "example message")
+  end
+  
+  it "should pass if same exception is raised with different message" do
+    lambda { raise RuntimeError.new("not the example message") }.should_not raise_exception(RuntimeError, "example message")
+  end
+  
+  it "should fail if named exception is raised with same message" do
+    lambda {
+      lambda { raise "example message" }.should_not raise_exception(RuntimeError, "example message")
+    }.should fail_with("expected no RuntimeError with \"example message\", got #<RuntimeError: example message>")
+  end
+end
+
+describe "should raise_exception(NamedError, exception_message) with Regexp" do
+  it "should pass if named exception is raised with matching message" do
+    lambda { raise "example message" }.should raise_exception(RuntimeError, /ample mess/)
+  end
+  
+  it "should fail if nothing is raised" do
+    lambda {
+      lambda {}.should raise_exception(RuntimeError, /ample mess/)
+    }.should fail_with("expected RuntimeError with message matching /ample mess/ but nothing was raised")
+  end
+  
+  it "should fail if incorrect exception is raised" do
+    lambda {
+      lambda { raise }.should raise_exception(NameError, /ample mess/)
+    }.should fail_with("expected NameError with message matching /ample mess/, got RuntimeError")
+  end
+  
+  it "should fail if correct exception is raised with incorrect message" do
+    lambda {
+      lambda { raise RuntimeError.new("not the example message") }.should raise_exception(RuntimeError, /less than ample mess/)
+    }.should fail_with("expected RuntimeError with message matching /less than ample mess/, got #<RuntimeError: not the example message>")
+  end
+end
+
+describe "should_not raise_exception(NamedError, exception_message) with Regexp" do
+  it "should pass if nothing is raised" do
+    lambda {}.should_not raise_exception(RuntimeError, /ample mess/)
+  end
+  
+  it "should pass if a different exception is raised" do
+    lambda { raise }.should_not raise_exception(NameError, /ample mess/)
+  end
+  
+  it "should pass if same exception is raised with non-matching message" do
+    lambda { raise RuntimeError.new("non matching message") }.should_not raise_exception(RuntimeError, /ample mess/)
+  end
+  
+  it "should fail if named exception is raised with matching message" do
+    lambda {
+      lambda { raise "example message" }.should_not raise_exception(RuntimeError, /ample mess/)
+    }.should fail_with("expected no RuntimeError with message matching /ample mess/, got #<RuntimeError: example message>")
+  end
+end

data/spec/spec/matchers/simple_matcher_spec.rb

@@ -3,6 +3,13 @@ require 'spec_helper'
 module Spec
   module Matchers
     describe SimpleMatcher do
+      before { Spec.stub(:deprecate) }
+
+      it "is deprecated" do
+        Spec.should_receive(:deprecate)
+        simple_matcher("foo") {}
+      end
+
       it "should pass match arg to block" do
         actual = nil
         matcher = simple_matcher("message") do |given| actual = given end
@@ -35,59 +42,59 @@ module Spec
           matcher.matches?("anything").should be_true
         end.should fail_with(/expected: 3/)
       end
-    end
     
-    describe "with arity of 2" do
-      it "should provide the matcher so you can access its messages" do
-        provided_matcher = nil
-        matcher = simple_matcher("thing") do |given, matcher|
-          provided_matcher = matcher
+      describe "with arity of 2" do
+        it "should provide the matcher so you can access its messages" do
+          provided_matcher = nil
+          matcher = simple_matcher("thing") do |given, matcher|
+            provided_matcher = matcher
+          end
+          matcher.matches?("anything")
+          provided_matcher.should equal(matcher)
         end
-        matcher.matches?("anything")
-        provided_matcher.should equal(matcher)
-      end
-      
-      it "should support a custom failure message" do
-        matcher = simple_matcher("thing") do |given, matcher|
-          matcher.failure_message = "custom message"
+        
+        it "should support a custom failure message" do
+          matcher = simple_matcher("thing") do |given, matcher|
+            matcher.failure_message = "custom message"
+          end
+          matcher.matches?("other")
+          matcher.failure_message.should == "custom message"
         end
-        matcher.matches?("other")
-        matcher.failure_message.should == "custom message"
-      end
 
-      it "should complain when asked for a failure message if you don't give it a description or a message" do
-        matcher = simple_matcher do |given, matcher| end
-        matcher.matches?("other")
-        matcher.failure_message.should =~ /No description provided/
-      end
+        it "should complain when asked for a failure message if you don't give it a description or a message" do
+          matcher = simple_matcher do |given, matcher| end
+          matcher.matches?("other")
+          matcher.failure_message.should =~ /No description provided/
+        end
 
-      it "should support a custom negative failure message" do
-        matcher = simple_matcher("thing") do |given, matcher|
-          matcher.negative_failure_message = "custom message"
+        it "should support a custom negative failure message" do
+          matcher = simple_matcher("thing") do |given, matcher|
+            matcher.negative_failure_message = "custom message"
+          end
+          matcher.matches?("other")
+          matcher.negative_failure_message.should == "custom message"
+        end
+        
+        it "should complain when asked for a negative failure message if you don't give it a description or a message" do
+          matcher = simple_matcher do |given, matcher| end
+          matcher.matches?("other")
+          matcher.negative_failure_message.should =~ /No description provided/
         end
-        matcher.matches?("other")
-        matcher.negative_failure_message.should == "custom message"
-      end
-      
-      it "should complain when asked for a negative failure message if you don't give it a description or a message" do
-        matcher = simple_matcher do |given, matcher| end
-        matcher.matches?("other")
-        matcher.negative_failure_message.should =~ /No description provided/
-      end
 
-      it "should support a custom description" do
-        matcher = simple_matcher("thing") do |given, matcher|
-          matcher.description = "custom message"
+        it "should support a custom description" do
+          matcher = simple_matcher("thing") do |given, matcher|
+            matcher.description = "custom message"
+          end
+          matcher.matches?("description")
+          matcher.description.should == "custom message"
         end
-        matcher.matches?("description")
-        matcher.description.should == "custom message"
-      end
 
-      it "should tell you no description was provided when it doesn't receive one" do
-        matcher = simple_matcher do end
-        matcher.description.should =~ /No description provided/
+        it "should tell you no description was provided when it doesn't receive one" do
+          matcher = simple_matcher do end
+          matcher.description.should =~ /No description provided/
+        end
       end
+      
     end
-    
   end
-end
+end