mspec 1.5.10 → 1.5.11

data/spec/matchers/be_an_instance_of_spec.rb

@@ -0,0 +1,50 @@
+require File.dirname(__FILE__) + '/../spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers/be_an_instance_of'
+
+module BeAnInOfSpecs
+  class A
+  end
+
+  class B < A
+  end
+
+  class C < B
+  end
+end
+
+describe BeAnInstanceOfMatcher do
+  it "matches when actual is an instance_of? expected" do
+    a = BeAnInOfSpecs::A.new
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::A).matches?(a).should be_true
+
+    b = BeAnInOfSpecs::B.new
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::B).matches?(b).should be_true
+  end
+
+  it "does not match when actual is not an instance_of? expected" do
+    a = BeAnInOfSpecs::A.new
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::B).matches?(a).should be_false
+
+    b = BeAnInOfSpecs::B.new
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::A).matches?(b).should be_false
+
+    c = BeAnInOfSpecs::C.new
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::A).matches?(c).should be_false
+    BeAnInstanceOfMatcher.new(BeAnInOfSpecs::B).matches?(c).should be_false
+  end
+
+  it "provides a useful failure message" do
+    matcher = BeAnInstanceOfMatcher.new(Numeric)
+    matcher.matches?("string")
+    matcher.failure_message.should == [
+      "Expected \"string\" (String)", "to be an instance of Numeric"]
+  end
+
+  it "provides a useful negative failure message" do
+    matcher = BeAnInstanceOfMatcher.new(Numeric)
+    matcher.matches?(4.0)
+    matcher.negative_failure_message.should == [
+      "Expected 4.0 (Float)", "not to be an instance of Numeric"]
+  end
+end

data/spec/matchers/be_close_spec.rb

@@ -34,8 +34,8 @@ describe BeCloseMatcher do
 
   it "provides a useful failure message" do
     matcher = BeCloseMatcher.new(5.0, 0.5)
-    matcher.matches?(5.51)
-    matcher.failure_message.should == ["Expected 5.0", "to be within +/- 0.5 of 5.51"]
+    matcher.matches?(5.5)
+    matcher.failure_message.should == ["Expected 5.0", "to be within +/- 0.5 of 5.5"]
   end
 
   it "provides a useful negative failure message" do

data/spec/matchers/be_kind_of_spec.rb

@@ -18,12 +18,14 @@ describe BeKindOfMatcher do
   it "provides a useful failure message" do
     matcher = BeKindOfMatcher.new(Numeric)
     matcher.matches?('string')
-    matcher.failure_message.should == ["Expected \"string\" (String)", "to be kind of Numeric"]
+    matcher.failure_message.should == [
+      "Expected \"string\" (String)", "to be kind of Numeric"]
   end
 
   it "provides a useful negative failure message" do
     matcher = BeKindOfMatcher.new(Numeric)
-    matcher.matches?(4.2)
-    matcher.negative_failure_message.should == ["Expected 4.2 (Float)", "not to be kind of Numeric"]
+    matcher.matches?(4.0)
+    matcher.negative_failure_message.should == [
+      "Expected 4.0 (Float)", "not to be kind of Numeric"]
   end
 end

data/spec/matchers/equal_utf16_spec.rb

@@ -3,6 +3,12 @@ require 'mspec/expectations/expectations'
 require 'mspec/matchers/equal_utf16'
 
 describe EqualUtf16Matcher do
+  before :all do
+    # this is a neutral way to covert a NULL character to a
+    # string representation on 1.8 (\000) and 1.9 (\x00)
+    @null = "\0".inspect[1..-2]
+  end
+
   it "when given strings, matches when actual == expected" do
     EqualUtf16Matcher.new("abcd").matches?("abcd").should == true
   end
@@ -36,12 +42,16 @@ describe EqualUtf16Matcher do
   it "provides a useful failure message" do
     matcher = EqualUtf16Matcher.new("a\0b\0")
     matcher.matches?("a\0b\0c\0")
-    matcher.failure_message.should == ["Expected \"a\\000b\\000c\\000\"\n", "to equal \"a\\000b\\000\"\n or \"\\000a\\000b\"\n"]
+    matcher.failure_message.should == [
+      "Expected \"a#{@null}b#{@null}c#{@null}\"\n",
+      "to equal \"a#{@null}b#{@null}\"\n or \"#{@null}a#{@null}b\"\n"]
   end
 
   it "provides a useful negative failure message" do
     matcher = EqualUtf16Matcher.new("a\0b\0")
     matcher.matches?("\0a\0b")
-    matcher.negative_failure_message.should == ["Expected \"\\000a\\000b\"\n", "not to equal \"a\\000b\\000\"\n nor \"\\000a\\000b\"\n"]
+    matcher.negative_failure_message.should == [
+      "Expected \"#{@null}a#{@null}b\"\n",
+      "not to equal \"a#{@null}b#{@null}\"\n nor \"#{@null}a#{@null}b\"\n"]
   end
 end

data/spec/matchers/respond_to_spec.rb

@@ -20,12 +20,14 @@ describe RespondToMatcher do
   it "provides a useful failure message" do
     matcher = RespondToMatcher.new(:non_existent_method)
     matcher.matches?('string')
-    matcher.failure_message.should == ["Expected \"string\" (String)", "to respond to non_existent_method"]
+    matcher.failure_message.should == [
+      "Expected \"string\" (String)", "to respond to non_existent_method"]
   end
 
   it "provides a useful negative failure message" do
     matcher = RespondToMatcher.new(:to_i)
-    matcher.matches?(4.2)
-    matcher.negative_failure_message.should == ["Expected 4.2 (Float)", "not to respond to to_i"]
+    matcher.matches?(4.0)
+    matcher.negative_failure_message.should == [
+      "Expected 4.0 (Float)", "not to respond to to_i"]
   end
 end

data/spec/mocks/mock_spec.rb

@@ -88,7 +88,7 @@ describe Mock, ".install_method for mocks" do
     Mock.install_method(@mock, :method_call).with(:c).and_return(2)
     @mock.method_call(:a, :b)
     @mock.method_call(:c)
-    lambda { @mock.method_call(:d) }.should raise_error(ExpectationNotMetError)
+    lambda { @mock.method_call(:d) }.should raise_error(SpecExpectationNotMetError)
   end
 
   # This illustrates RSpec's behavior. This spec fails in mock call count verification
@@ -110,7 +110,7 @@ describe Mock, ".install_method for mocks" do
     @mock.method_call(:a).should == true
     Mock.install_method(@mock, :method_call).with(:a).and_return(false)
     @mock.method_call(:a).should == true
-    lambda { Mock.verify_count }.should raise_error(ExpectationNotMetError)
+    lambda { Mock.verify_count }.should raise_error(SpecExpectationNotMetError)
   end
 
   it "properly sends #respond_to? calls to the aliased respond_to? method when not matching mock expectations" do
@@ -226,25 +226,25 @@ describe Mock, ".verify_call" do
     Mock.verify_call @mock, :method_call, 1, 'two', :three
   end
 
-  it "raises an ExpectationNotMetError when the mock method does not receive the expected arguments" do
+  it "raises an SpecExpectationNotMetError when the mock method does not receive the expected arguments" do
     @proxy.with(4, 2)
     lambda {
       Mock.verify_call @mock, :method_call, 42
-    }.should raise_error(ExpectationNotMetError)
+    }.should raise_error(SpecExpectationNotMetError)
   end
 
-  it "raises an ExpectationNotMetError when the mock method is called with arguments but expects none" do
+  it "raises an SpecExpectationNotMetError when the mock method is called with arguments but expects none" do
     lambda {
       @proxy.with(:no_args)
       Mock.verify_call @mock, :method_call, "hello"
-    }.should raise_error(ExpectationNotMetError)
+    }.should raise_error(SpecExpectationNotMetError)
   end
 
-  it "raises an ExpectationNotMetError when the mock method is called with no arguments but expects some" do
+  it "raises an SpecExpectationNotMetError when the mock method is called with no arguments but expects some" do
     @proxy.with("hello", "beautiful", "world")
     lambda {
       Mock.verify_call @mock, :method_call
-    }.should raise_error(ExpectationNotMetError)
+    }.should raise_error(SpecExpectationNotMetError)
   end
 
   it "does not raise an exception when the mock method is called with arguments and is expecting :any_args" do
@@ -288,21 +288,21 @@ describe Mock, ".verify_call" do
     @proxy.and_yield(1, 2, 3)
     lambda {
       Mock.verify_call(@mock, :method_call)
-    }.should raise_error(ExpectationNotMetError)
+    }.should raise_error(SpecExpectationNotMetError)
   end
 
   it "raises an expection when it is expected to yield more arguments than the block can take" do
     @proxy.and_yield(1, 2, 3)
     lambda {
       Mock.verify_call(@mock, :method_call) {|a, b|}
-    }.should raise_error(ExpectationNotMetError)
+    }.should raise_error(SpecExpectationNotMetError)
   end
 
   it "does not raise an expection when it is expected to yield to a block that can take any number of arguments" do
     @proxy.and_yield(1, 2, 3)
     lambda {
       Mock.verify_call(@mock, :method_call) {|*a|}
-    }.should_not raise_error(ExpectationNotMetError)
+    }.should_not raise_error(SpecExpectationNotMetError)
   end
 end
 
@@ -326,10 +326,10 @@ describe Mock, ".verify_count" do
     Mock.verify_count
   end
 
-  it "raises an ExpectationNotMetError when the mock receives less than at least the expected number of calls" do
+  it "raises an SpecExpectationNotMetError when the mock receives less than at least the expected number of calls" do
     @proxy.at_least(2)
     @mock.method_call
-    lambda { Mock.verify_count }.should raise_error(ExpectationNotMetError)
+    lambda { Mock.verify_count }.should raise_error(SpecExpectationNotMetError)
   end
 
   it "does not raise an exception when the mock receives at most the expected number of calls" do
@@ -339,12 +339,12 @@ describe Mock, ".verify_count" do
     Mock.verify_count
   end
 
-  it "raises an ExpectationNotMetError when the mock receives more than at most the expected number of calls" do
+  it "raises an SpecExpectationNotMetError when the mock receives more than at most the expected number of calls" do
     @proxy.at_most(2)
     @mock.method_call
     @mock.method_call
     @mock.method_call
-    lambda { Mock.verify_count }.should raise_error(ExpectationNotMetError)
+    lambda { Mock.verify_count }.should raise_error(SpecExpectationNotMetError)
   end
 
   it "does not raise an exception when the mock receives exactly the expected number of calls" do
@@ -354,18 +354,18 @@ describe Mock, ".verify_count" do
     Mock.verify_count
   end
 
-  it "raises an ExpectationNotMetError when the mock receives less than exactly the expected number of calls" do
+  it "raises an SpecExpectationNotMetError when the mock receives less than exactly the expected number of calls" do
     @proxy.exactly(2)
     @mock.method_call
-    lambda { Mock.verify_count }.should raise_error(ExpectationNotMetError)
+    lambda { Mock.verify_count }.should raise_error(SpecExpectationNotMetError)
   end
 
-  it "raises an ExpectationNotMetError when the mock receives more than exactly the expected number of calls" do
+  it "raises an SpecExpectationNotMetError when the mock receives more than exactly the expected number of calls" do
     @proxy.exactly(2)
     @mock.method_call
     @mock.method_call
     @mock.method_call
-    lambda { Mock.verify_count }.should raise_error(ExpectationNotMetError)
+    lambda { Mock.verify_count }.should raise_error(SpecExpectationNotMetError)
   end
 end
 
@@ -425,11 +425,12 @@ describe Mock, ".cleanup" do
   it "removes the replaced method if the mock method overrides an existing method" do
     def @mock.already_here() :hey end
     @mock.should respond_to(:already_here)
+    replaced_name = Mock.replaced_name(@mock, :already_here)
     Mock.install_method @mock, :already_here
-    @mock.should respond_to(Mock.replaced_name(@mock, :already_here))
+    @mock.should respond_to(replaced_name)
 
     Mock.cleanup
-    @mock.should_not respond_to(Mock.replaced_name(@mock, :already_here))
+    @mock.should_not respond_to(replaced_name)
     @mock.should respond_to(:already_here)
     @mock.already_here.should == :hey
   end

data/spec/runner/actions/tally_spec.rb

@@ -274,7 +274,7 @@ describe TallyAction, "#exception" do
   end
 
   it "increments counts returned by Tally#failures" do
-    exc = ExceptionState.new nil, nil, ExpectationNotMetError.new("Failed!")
+    exc = ExceptionState.new nil, nil, SpecExpectationNotMetError.new("Failed!")
     @tally.exception exc
     @tally.counter.examples.should == 0
     @tally.counter.expectations.should == 0
@@ -310,7 +310,7 @@ describe TallyAction, "#format" do
     @tally.example @state, nil
     @tally.expectation @state
     @tally.expectation @state
-    exc = ExceptionState.new nil, nil, ExpectationNotMetError.new("Failed!")
+    exc = ExceptionState.new nil, nil, SpecExpectationNotMetError.new("Failed!")
     @tally.exception exc
     @tally.format.should == "1 file, 1 example, 2 expectations, 1 failure, 0 errors"
   end

data/spec/runner/actions/timer_spec.rb

@@ -19,17 +19,17 @@ describe TimerAction do
   end
 
   it "responds to #elapsed by returning the difference between stop and start" do
-    Time.stub!(:now).and_return(Time.parse('10/18/2007 5:43:18'))
+    Time.stub!(:now).and_return(Time.parse('Mon Mar 30 14:05:19 -0700 2009'))
     @timer.start
-    Time.stub!(:now).and_return(Time.parse('10/18/2007 5:43:51'))
+    Time.stub!(:now).and_return(Time.parse('Mon Mar 30 14:05:52 -0700 2009'))
     @timer.finish
     @timer.elapsed.should == 33
   end
 
   it "responds to #format by returning a readable string of elapsed time" do
-    Time.stub!(:now).and_return(Time.parse('10/18/2007 5:43:18'))
+    Time.stub!(:now).and_return(Time.parse('Mon Mar 30 14:05:19 -0700 2009'))
     @timer.start
-    Time.stub!(:now).and_return(Time.parse('10/18/2007 5:43:51'))
+    Time.stub!(:now).and_return(Time.parse('Mon Mar 30 14:05:52 -0700 2009'))
     @timer.finish
     @timer.format.should == "Finished in 33.000000 seconds"
   end

data/spec/runner/context_spec.rb

@@ -506,7 +506,7 @@ describe ContextState, "#process" do
 
     action = mock("action")
     def action.exception(exc)
-      ScratchPad.record :exception if exc.exception.is_a? ExpectationNotFoundError
+      ScratchPad.record :exception if exc.exception.is_a? SpecExpectationNotFoundError
     end
     MSpec.register :exception, action
 
@@ -518,19 +518,19 @@ describe ContextState, "#process" do
     MSpec.store :exception, nil
   end
 
-  it "raises an ExpectationNotFoundError if an #it block does not contain an expectation" do
+  it "raises an SpecExpectationNotFoundError if an #it block does not contain an expectation" do
     @state.it("it") { }
     @state.process
     ScratchPad.recorded.should == :exception
   end
 
-  it "does not raise an ExpectationNotFoundError if an #it block does contain an expectation" do
+  it "does not raise an SpecExpectationNotFoundError if an #it block does contain an expectation" do
     @state.it("it") { MSpec.expectation }
     @state.process
     ScratchPad.recorded.should be_nil
   end
 
-  it "does not raise an ExpectationNotFoundError if the #it block causes a failure" do
+  it "does not raise an SpecExpectationNotFoundError if the #it block causes a failure" do
     @state.it("it") { raise Exception, "Failed!" }
     @state.process
     ScratchPad.recorded.should be_nil

data/spec/runner/exception_spec.rb

@@ -69,17 +69,17 @@ describe ExceptionState, "#failure?" do
     @state = ExampleState.new ContextState.new("C#m"), "works"
   end
 
-  it "returns true if the exception is an ExpectationNotMetError" do
-    exc = ExceptionState.new @state, "", ExpectationNotMetError.new("Fail!")
+  it "returns true if the exception is an SpecExpectationNotMetError" do
+    exc = ExceptionState.new @state, "", SpecExpectationNotMetError.new("Fail!")
     exc.failure?.should be_true
   end
 
-  it "returns true if the exception is an ExpectationNotFoundError" do
-    exc = ExceptionState.new @state, "", ExpectationNotFoundError.new("Fail!")
+  it "returns true if the exception is an SpecExpectationNotFoundError" do
+    exc = ExceptionState.new @state, "", SpecExpectationNotFoundError.new("Fail!")
     exc.failure?.should be_true
   end
 
-  it "returns false if the exception is not an ExpectationNotMetError or an ExpectationNotFoundError" do
+  it "returns false if the exception is not an SpecExpectationNotMetError or an SpecExpectationNotFoundError" do
     exc = ExceptionState.new @state, "", Exception.new("Fail!")
     exc.failure?.should be_false
   end
@@ -91,18 +91,18 @@ describe ExceptionState, "#message" do
     exc.message.should == "<No message>"
   end
 
-  it "returns the message without exception class when the exception is an ExpectationNotMetError" do
-    exc = ExceptionState.new @state, "", ExpectationNotMetError.new("Fail!")
+  it "returns the message without exception class when the exception is an SpecExpectationNotMetError" do
+    exc = ExceptionState.new @state, "", SpecExpectationNotMetError.new("Fail!")
     exc.message.should == "Fail!"
   end
 
-  it "returns ExpectationNotFoundError#message when the exception is an ExpectationNotFoundError" do
-    e = ExpectationNotFoundError.new
+  it "returns SpecExpectationNotFoundError#message when the exception is an SpecExpectationNotFoundError" do
+    e = SpecExpectationNotFoundError.new
     exc = ExceptionState.new @state, "", e
     exc.message.should == e.message
   end
 
-  it "returns the message with exception class when the exception is not an ExpectationNotMetError or an ExpectationNotFoundError" do
+  it "returns the message with exception class when the exception is not an SpecExpectationNotMetError or an SpecExpectationNotFoundError" do
     exc = ExceptionState.new @state, "", Exception.new("Fail!")
     exc.message.should == "Exception: Fail!"
   end

data/spec/runner/formatters/dotted_spec.rb

@@ -78,7 +78,7 @@ end
 describe DottedFormatter, "#exception" do
   before :each do
     @formatter = DottedFormatter.new
-    @failure = ExceptionState.new nil, nil, ExpectationNotMetError.new("failed")
+    @failure = ExceptionState.new nil, nil, SpecExpectationNotMetError.new("failed")
     @error = ExceptionState.new nil, nil, MSpecExampleError.new("boom!")
   end
 
@@ -107,7 +107,7 @@ end
 describe DottedFormatter, "#exception?" do
   before :each do
     @formatter = DottedFormatter.new
-    @failure = ExceptionState.new nil, nil, ExpectationNotMetError.new("failed")
+    @failure = ExceptionState.new nil, nil, SpecExpectationNotMetError.new("failed")
     @error = ExceptionState.new nil, nil, MSpecExampleError.new("boom!")
   end
 
@@ -137,7 +137,7 @@ end
 describe DottedFormatter, "#failure?" do
   before :each do
     @formatter = DottedFormatter.new
-    @failure = ExceptionState.new nil, nil, ExpectationNotMetError.new("failed")
+    @failure = ExceptionState.new nil, nil, SpecExpectationNotMetError.new("failed")
     @error = ExceptionState.new nil, nil, MSpecExampleError.new("boom!")
   end
 
@@ -162,7 +162,7 @@ describe DottedFormatter, "#before" do
   before :each do
     @state = ExampleState.new ContextState.new("describe"), "it"
     @formatter = DottedFormatter.new
-    @formatter.exception ExceptionState.new(nil, nil, ExpectationNotMetError.new("Failed!"))
+    @formatter.exception ExceptionState.new(nil, nil, SpecExpectationNotMetError.new("Failed!"))
   end
 
   it "resets the #failure? flag to false" do
@@ -195,7 +195,7 @@ describe DottedFormatter, "#after" do
   end
 
   it "prints an 'F' if there was an expectation failure" do
-    exc = ExpectationNotMetError.new "failed"
+    exc = SpecExpectationNotMetError.new "failed"
     @formatter.exception ExceptionState.new(@state, nil, exc)
     @formatter.after(@state)
     @out.should == "F"
@@ -209,7 +209,7 @@ describe DottedFormatter, "#after" do
   end
 
   it "prints an 'E' if there are mixed exceptions and exepctation failures" do
-    exc = ExpectationNotMetError.new "failed"
+    exc = SpecExpectationNotMetError.new "failed"
     @formatter.exception ExceptionState.new(@state, nil, exc)
     exc = MSpecExampleError.new("boom!")
     @formatter.exception ExceptionState.new(@state, nil, exc)

data/spec/runner/formatters/file_spec.rb

@@ -27,7 +27,7 @@ describe FileFormatter, "#load" do
   before :each do
     @state = ExampleState.new ContextState.new("describe"), "it"
     @formatter = FileFormatter.new
-    @formatter.exception ExceptionState.new(nil, nil, ExpectationNotMetError.new("Failed!"))
+    @formatter.exception ExceptionState.new(nil, nil, SpecExpectationNotMetError.new("Failed!"))
   end
 
   it "resets the #failure? flag to false" do
@@ -60,7 +60,7 @@ describe FileFormatter, "#unload" do
   end
 
   it "prints an 'F' if there was an expectation failure" do
-    exc = ExpectationNotMetError.new "failed"
+    exc = SpecExpectationNotMetError.new "failed"
     @formatter.exception ExceptionState.new(@state, nil, exc)
     @formatter.unload(@state)
     @out.should == "F"
@@ -74,7 +74,7 @@ describe FileFormatter, "#unload" do
   end
 
   it "prints an 'E' if there are mixed exceptions and exepctation failures" do
-    exc = ExpectationNotMetError.new "failed"
+    exc = SpecExpectationNotMetError.new "failed"
     @formatter.exception ExceptionState.new(@state, nil, exc)
     exc = MSpecExampleError.new("boom!")
     @formatter.exception ExceptionState.new(@state, nil, exc)