mspec 1.5.17 → 1.5.18

data/spec/matchers/match_yaml_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
-require 'mspec/matchers/match_yaml'
+require 'mspec/matchers'
 
 describe MatchYAMLMatcher do
   before :each do
@@ -13,7 +13,7 @@ describe MatchYAMLMatcher do
 
   it "compares YAML documents and does not match if they're not equivalent" do
       @matcher.matches?("--- \nbar: foo\n").should == false
-      @matcher.matches?("--- \nfoo: \nbar\n").should == false  
+      @matcher.matches?("--- \nfoo: \nbar\n").should == false
   end
 
   it "also receives objects that respond_to to_yaml" do

data/spec/matchers/output_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
-require 'mspec/matchers/output'
+require 'mspec/matchers'
 
 describe OutputMatcher do
   it "matches when executing the proc results in the expected output to $stdout" do

data/spec/matchers/output_to_fd_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
-require 'mspec/matchers/output_to_fd'
+require 'mspec/matchers'
 
 describe OutputToFDMatcher do
   # Figure out how in the hell to achieve this

data/spec/matchers/raise_error_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
-require 'mspec/matchers/raise_error'
+require 'mspec/matchers'
 
 class ExpectedException < Exception; end
 class UnexpectedException < Exception; end
@@ -34,7 +34,12 @@ describe RaiseErrorMatcher do
   end
 
   it "does not match when the proc raises the expected exception with an unexpected message" do
-    proc = Proc.new { raise UnexpectedException, "unexpected" }
+    proc = Proc.new { raise ExpectedException, "unexpected" }
+    RaiseErrorMatcher.new(ExpectedException, "expected").matches?(proc).should == false
+  end
+
+  it "does not match when the proc does not raise an exception" do
+    proc = Proc.new {}
     RaiseErrorMatcher.new(ExpectedException, "expected").matches?(proc).should == false
   end
 
@@ -46,6 +51,14 @@ describe RaiseErrorMatcher do
       ["Expected ExpectedException (expected)", "but got UnexpectedException (unexpected)"]
   end
 
+  it "provides a useful failure message when no exception is raised" do
+    proc = Proc.new { 120 }
+    matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
+    matcher.matches?(proc)
+    matcher.failure_message.should ==
+      ["Expected ExpectedException (expected)", "but no exception was raised (120 was returned)"]
+  end
+
   it "provides a useful negative failure message" do
     proc = Proc.new { raise ExpectedException, "expected" }
     matcher = RaiseErrorMatcher.new(ExpectedException, "expected")
@@ -53,4 +66,12 @@ describe RaiseErrorMatcher do
     matcher.negative_failure_message.should ==
       ["Expected to not get ExpectedException (expected)", ""]
   end
+
+  it "provides a useful negative failure message for strict subclasses of the matched exception class" do
+    proc = Proc.new { raise UnexpectedException, "unexpected" }
+    matcher = RaiseErrorMatcher.new(Exception, nil)
+    matcher.matches?(proc)
+    matcher.negative_failure_message.should ==
+      ["Expected to not get Exception", "but got UnexpectedException (unexpected)"]
+  end
 end

data/spec/matchers/respond_to_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
-require 'mspec/matchers/respond_to'
+require 'mspec/matchers'
 
 describe RespondToMatcher do
   it "matches when actual does respond_to? expected" do

data/spec/matchers/signed_zero_spec.rb

@@ -0,0 +1,32 @@
+require 'spec_helper'
+require 'mspec/expectations/expectations'
+require 'mspec/matchers'
+
+describe SignedZeroMatcher do
+  it "matches when actual is zero and has the correct sign" do
+    SignedZeroMatcher.new(1).matches?(0.0).should == true
+    SignedZeroMatcher.new(-1).matches?(-0.0).should == true
+  end
+
+  it "does not match when actual is non-zero" do
+    SignedZeroMatcher.new(1).matches?(1.0).should == false
+    SignedZeroMatcher.new(-1).matches?(-1.0).should == false
+  end
+
+  it "does not match when actual is zero but has the incorrect sign" do
+    SignedZeroMatcher.new(1).matches?(-0.0).should == false
+    SignedZeroMatcher.new(-1).matches?(0.0).should == false
+  end
+
+  it "provides a useful failure message" do
+    matcher = SignedZeroMatcher.new(-1)
+    matcher.matches?(0.0)
+    matcher.failure_message.should == ["Expected 0.0", "to be -0.0"]
+  end
+
+  it "provides a useful negative failure message" do
+    matcher = SignedZeroMatcher.new(-1)
+    matcher.matches?(-0.0)
+    matcher.negative_failure_message.should == ["Expected -0.0", "not to be -0.0"]
+  end
+end

data/spec/matchers/stringsymboladapter_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
-require 'mspec/matchers/stringsymboladapter'
+require 'mspec/matchers'
 
 describe StringSymbolAdapter, "#convert_name" do
   include StringSymbolAdapter

data/spec/mocks/mock_spec.rb

@@ -2,7 +2,7 @@
 # opposites are true (for example a failure when the specified
 # arguments are NOT provided) is to simply alter the particular
 # spec to a failure condition.
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/runner/mspec'
 require 'mspec/mocks/mock'
 require 'mspec/mocks/proxy'
@@ -39,7 +39,7 @@ describe Mock, ".replaced?" do
   before :each do
     @mock = mock('install_method')
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
+    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
   end
 
   it "returns true if a method has been stubbed on an object" do
@@ -72,7 +72,7 @@ describe Mock, ".install_method for mocks" do
   before :each do
     @mock = mock('install_method')
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
+    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
   end
 
   after :each do
@@ -123,7 +123,7 @@ describe Mock, ".install_method for mocks" do
   end
 
   it "adds to the expectation tally" do
-    state = mock("run state", :null_object => true)
+    state = mock("run state").as_null_object
     state.stub!(:state).and_return(mock("spec state"))
     MSpec.should_receive(:current).and_return(state)
     MSpec.should_receive(:actions).with(:expectation, state.state)
@@ -132,7 +132,7 @@ describe Mock, ".install_method for mocks" do
   end
 
   it "registers that an expectation has been encountered" do
-    state = mock("run state", :null_object => true)
+    state = mock("run state").as_null_object
     state.stub!(:state).and_return(mock("spec state"))
     MSpec.should_receive(:expectation)
     Mock.install_method(@mock, :method_call).and_return(1)
@@ -144,7 +144,7 @@ describe Mock, ".install_method for stubs" do
   before :each do
     @mock = mock('install_method')
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
+    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
   end
 
   after :each do
@@ -175,7 +175,7 @@ describe Mock, ".install_method for stubs" do
   end
 
   it "does not add to the expectation tally" do
-    state = mock("run state", :null_object => true)
+    state = mock("run state").as_null_object
     state.stub!(:state).and_return(mock("spec state"))
     MSpec.should_not_receive(:actions)
     Mock.install_method(@mock, :method_call, :stub).and_return(1)
@@ -187,7 +187,7 @@ describe Mock, ".install_method" do
   before :each do
     @mock = mock('install_method')
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
+    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
   end
 
   after :each do
@@ -212,7 +212,7 @@ class MockAndRaiseError < Exception; end
 describe Mock, ".verify_call" do
   before :each do
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
+    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
 
     @mock = mock('verify_call')
     @proxy = Mock.install_method @mock, :method_call
@@ -318,7 +318,7 @@ end
 describe Mock, ".verify_count" do
   before :each do
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
+    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
 
     @mock = mock('verify_count')
     @proxy = Mock.install_method @mock, :method_call
@@ -381,7 +381,7 @@ end
 describe Mock, ".verify_count mixing mocks and stubs" do
   before :each do
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
+    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
 
     @mock = mock('verify_count')
   end
@@ -413,7 +413,7 @@ end
 describe Mock, ".cleanup" do
   before :each do
     MSpec.stub!(:actions)
-    MSpec.stub!(:current).and_return(mock("spec state", :null_object => true))
+    MSpec.stub!(:current).and_return(mock("spec state").as_null_object)
 
     @mock = mock('cleanup')
     @proxy = Mock.install_method @mock, :method_call

data/spec/mocks/proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/mocks/proxy'
 
 describe MockObject, ".new" do

data/spec/runner/actions/gdb_spec.rb

@@ -9,7 +9,7 @@ describe GdbAction do
   end
 
   it "creates an MatchFilter with its tag and desc arguments" do
-    filter = mock('action filter', :null_object => true)
+    filter = mock('action filter').as_null_object
     MatchFilter.should_receive(:new).with(nil, "some", "thing").and_return(filter)
     GdbAction.new ["tag", "key"], ["some", "thing"]
   end

data/spec/runner/actions/tag_spec.rb

@@ -6,7 +6,7 @@ require 'mspec/runner/tag'
 
 describe TagAction, ".new" do
   it "creates an MatchFilter with its tag and desc arguments" do
-    filter = mock('action filter', :null_object => true)
+    filter = mock('action filter').as_null_object
     MatchFilter.should_receive(:new).with(nil, "some", "thing").and_return(filter)
     TagAction.new :add, :all, nil, nil, ["tag", "key"], ["some", "thing"]
   end

data/spec/runner/actions/taglist_spec.rb

@@ -14,7 +14,7 @@ describe TagListAction, "#===" do
   before :each do
     tag = SpecTag.new "fails:description"
     MSpec.stub!(:read_tags).and_return([tag])
-    @filter = mock("MatchFilter", :null_object => true)
+    @filter = mock("MatchFilter").as_null_object
     MatchFilter.stub!(:new).and_return(@filter)
     @action = TagListAction.new
     @action.load

data/spec/runner/context_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
 require 'mspec/matchers/base'
 require 'mspec/runner/mspec'
@@ -9,7 +9,7 @@ require 'mspec/runner/example'
 describe ContextState, "#describe" do
   before :each do
     @state = ContextState.new "C#m"
-    @proc = lambda { ScratchPad.record :a }
+    @proc = lambda {|*| ScratchPad.record :a }
     ScratchPad.clear
   end
 
@@ -90,7 +90,7 @@ end
 describe ContextState, "#it" do
   before :each do
     @state = ContextState.new ""
-    @proc = lambda { }
+    @proc = lambda {|*| }
 
     @ex = ExampleState.new("", "", &@proc)
   end
@@ -129,7 +129,7 @@ end
 describe ContextState, "#before" do
   before :each do
     @state = ContextState.new ""
-    @proc = lambda { }
+    @proc = lambda {|*| }
   end
 
   it "records the block for :each" do
@@ -146,7 +146,7 @@ end
 describe ContextState, "#after" do
   before :each do
     @state = ContextState.new ""
-    @proc = lambda { }
+    @proc = lambda {|*| }
   end
 
   it "records the block for :each" do
@@ -162,9 +162,9 @@ end
 
 describe ContextState, "#pre" do
   before :each do
-    @a = lambda { }
-    @b = lambda { }
-    @c = lambda { }
+    @a = lambda {|*| }
+    @b = lambda {|*| }
+    @c = lambda {|*| }
 
     parent = ContextState.new ""
     parent.before(:each, &@c)
@@ -189,9 +189,9 @@ end
 
 describe ContextState, "#post" do
   before :each do
-    @a = lambda { }
-    @b = lambda { }
-    @c = lambda { }
+    @a = lambda {|*| }
+    @b = lambda {|*| }
+    @c = lambda {|*| }
 
     parent = ContextState.new ""
     parent.after(:each, &@c)
@@ -217,9 +217,9 @@ end
 describe ContextState, "#protect" do
   before :each do
     ScratchPad.record []
-    @a = lambda { ScratchPad << :a }
-    @b = lambda { ScratchPad << :b }
-    @c = lambda { raise Exception, "Fail!" }
+    @a = lambda {|*| ScratchPad << :a }
+    @b = lambda {|*| ScratchPad << :b }
+    @c = lambda {|*| raise Exception, "Fail!" }
   end
 
   it "returns true and does execute any blocks if check and MSpec.mode?(:pretend) are true" do
@@ -374,8 +374,8 @@ describe ContextState, "#process" do
     @state = ContextState.new ""
     @state.describe { }
 
-    @a = lambda { ScratchPad << :a }
-    @b = lambda { ScratchPad << :b }
+    @a = lambda {|*| ScratchPad << :a }
+    @b = lambda {|*| ScratchPad << :b }
     ScratchPad.record []
   end
 
@@ -658,8 +658,8 @@ describe ContextState, "#process when an exception is raised in before(:all)" do
     @state = ContextState.new ""
     @state.describe { }
 
-    @a = lambda { ScratchPad << :a }
-    @b = lambda { ScratchPad << :b }
+    @a = lambda {|*| ScratchPad << :a }
+    @b = lambda {|*| ScratchPad << :b }
     ScratchPad.record []
 
     @state.before(:all) { raise Exception, "Fail!" }
@@ -718,8 +718,8 @@ describe ContextState, "#process when an exception is raised in before(:each)" d
     @state = ContextState.new ""
     @state.describe { }
 
-    @a = lambda { ScratchPad << :a }
-    @b = lambda { ScratchPad << :b }
+    @a = lambda {|*| ScratchPad << :a }
+    @b = lambda {|*| ScratchPad << :b }
     ScratchPad.record []
 
     @state.before(:each) { raise Exception, "Fail!" }
@@ -756,7 +756,7 @@ describe ContextState, "#process in pretend mode" do
   end
 
   after :all do
-    MSpec.register_mode nil
+    MSpec.clear_modes
   end
 
   before :each do
@@ -805,7 +805,7 @@ describe ContextState, "#process in pretend mode" do
   end
 
   after :all do
-    MSpec.register_mode nil
+    MSpec.clear_modes
   end
 
   before :each do
@@ -815,8 +815,8 @@ describe ContextState, "#process in pretend mode" do
     @state = ContextState.new ""
     @state.describe { }
 
-    @a = lambda { ScratchPad << :a }
-    @b = lambda { ScratchPad << :b }
+    @a = lambda {|*| ScratchPad << :a }
+    @b = lambda {|*| ScratchPad << :b }
     ScratchPad.record []
   end
 
@@ -880,7 +880,7 @@ describe ContextState, "#process in pretend mode" do
   end
 
   after :all do
-    MSpec.register_mode nil
+    MSpec.clear_modes
   end
 
   before :each do
@@ -921,8 +921,8 @@ describe ContextState, "#it_should_behave_like" do
     MSpec.stub!(:retrieve_shared).and_return(@shared)
 
     @state = ContextState.new "Top level"
-    @a = lambda { }
-    @b = lambda { }
+    @a = lambda {|*| }
+    @b = lambda {|*| }
   end
 
   it "raises an Exception if unable to find the shared ContextState" do

data/spec/runner/example_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/matchers/base'
 require 'mspec/runner/mspec'
 require 'mspec/mocks/mock'