mspec 1.7.0 → 1.8.0

data/spec/runner/actions/filter_spec.rb

@@ -22,7 +22,7 @@ end
 
 describe ActionFilter, "#===" do
   before :each do
-    MSpec.stub!(:read_tags).and_return(["match"])
+    MSpec.stub(:read_tags).and_return(["match"])
     @action = ActionFilter.new(nil, ["catch", "if you"])
   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').as_null_object
+    filter = double('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
@@ -14,7 +14,7 @@ end
 
 describe TagAction, "#===" do
   before :each do
-    MSpec.stub!(:read_tags).and_return(["match"])
+    MSpec.stub(:read_tags).and_return(["match"])
     @action = TagAction.new :add, :fail, nil, nil, nil, ["catch", "if you"]
   end
 
@@ -51,7 +51,7 @@ end
 
 describe TagAction, "#outcome?" do
   before :each do
-    MSpec.stub!(:read_tags).and_return([])
+    MSpec.stub(:read_tags).and_return([])
     @exception = ExceptionState.new nil, nil, Exception.new("failed")
   end
 
@@ -106,11 +106,11 @@ end
 
 describe TagAction, "#after when action is :add" do
   before :each do
-    MSpec.stub!(:read_tags).and_return([])
+    MSpec.stub(:read_tags).and_return([])
     context = ContextState.new "Catch#me"
     @state = ExampleState.new context, "if you can"
     @tag = SpecTag.new "tag(comment):Catch#me if you can"
-    SpecTag.stub!(:new).and_return(@tag)
+    SpecTag.stub(:new).and_return(@tag)
     @exception = ExceptionState.new nil, nil, Exception.new("failed")
   end
 
@@ -155,11 +155,11 @@ end
 
 describe TagAction, "#after when action is :del" do
   before :each do
-    MSpec.stub!(:read_tags).and_return([])
+    MSpec.stub(:read_tags).and_return([])
     context = ContextState.new "Catch#me"
     @state = ExampleState.new context, "if you can"
     @tag = SpecTag.new "tag(comment):Catch#me if you can"
-    SpecTag.stub!(:new).and_return(@tag)
+    SpecTag.stub(:new).and_return(@tag)
     @exception = ExceptionState.new nil, nil, Exception.new("failed")
   end
 
@@ -207,8 +207,8 @@ describe TagAction, "#finish" do
     $stdout = @out = IOStub.new
     context = ContextState.new "Catch#me"
     @state = ExampleState.new context, "if you can"
-    MSpec.stub!(:write_tag).and_return(true)
-    MSpec.stub!(:delete_tag).and_return(true)
+    MSpec.stub(:write_tag).and_return(true)
+    MSpec.stub(:delete_tag).and_return(true)
   end
 
   after :each do
@@ -217,7 +217,7 @@ describe TagAction, "#finish" do
 
   it "reports no specs tagged if none where tagged" do
     action = TagAction.new :add, :fail, "tag", "comment", nil, "can"
-    action.stub!(:outcome?).and_return(false)
+    action.stub(:outcome?).and_return(false)
     action.after @state
     action.finish
     @out.should == "\nTagAction: no specs were tagged with 'tag'\n"
@@ -225,7 +225,7 @@ describe TagAction, "#finish" do
 
   it "reports no specs tagged if none where tagged" do
     action = TagAction.new :del, :fail, "tag", "comment", nil, "can"
-    action.stub!(:outcome?).and_return(false)
+    action.stub(:outcome?).and_return(false)
     action.after @state
     action.finish
     @out.should == "\nTagAction: no tags 'tag' were deleted\n"
@@ -233,7 +233,7 @@ describe TagAction, "#finish" do
 
   it "reports the spec descriptions that were tagged" do
     action = TagAction.new :add, :fail, "tag", "comment", nil, "can"
-    action.stub!(:outcome?).and_return(true)
+    action.stub(:outcome?).and_return(true)
     action.after @state
     action.finish
     @out.should ==
@@ -246,7 +246,7 @@ Catch#me if you can
 
   it "reports the spec descriptions for the tags that were deleted" do
     action = TagAction.new :del, :fail, "tag", "comment", nil, "can"
-    action.stub!(:outcome?).and_return(true)
+    action.stub(:outcome?).and_return(true)
     action.after @state
     action.finish
     @out.should ==
@@ -260,8 +260,8 @@ end
 
 describe TagAction, "#register" do
   before :each do
-    MSpec.stub!(:register)
-    MSpec.stub!(:read_tags).and_return([])
+    MSpec.stub(:register)
+    MSpec.stub(:read_tags).and_return([])
     @action = TagAction.new :add, :all, nil, nil, nil, nil
   end
 
@@ -288,8 +288,8 @@ end
 
 describe TagAction, "#unregister" do
   before :each do
-    MSpec.stub!(:unregister)
-    MSpec.stub!(:read_tags).and_return([])
+    MSpec.stub(:unregister)
+    MSpec.stub(:read_tags).and_return([])
     @action = TagAction.new :add, :all, nil, nil, nil, nil
   end
 

data/spec/runner/actions/taglist_spec.rb

@@ -13,9 +13,9 @@ end
 describe TagListAction, "#===" do
   before :each do
     tag = SpecTag.new "fails:description"
-    MSpec.stub!(:read_tags).and_return([tag])
-    @filter = mock("MatchFilter").as_null_object
-    MatchFilter.stub!(:new).and_return(@filter)
+    MSpec.stub(:read_tags).and_return([tag])
+    @filter = double("MatchFilter").as_null_object
+    MatchFilter.stub(:new).and_return(@filter)
     @action = TagListAction.new
     @action.load
   end
@@ -73,7 +73,7 @@ describe TagListAction, "#load" do
   end
 
   it "does not create a MatchFilter if there are no matching tags" do
-    MSpec.stub!(:read_tags).and_return([])
+    MSpec.stub(:read_tags).and_return([])
     MatchFilter.should_not_receive(:new)
     TagListAction.new(["fails"]).load
   end
@@ -84,8 +84,8 @@ describe TagListAction, "#after" do
     @stdout = $stdout
     $stdout = IOStub.new
 
-    @state = mock("ExampleState")
-    @state.stub!(:description).and_return("str")
+    @state = double("ExampleState")
+    @state.stub(:description).and_return("str")
 
     @action = TagListAction.new
   end
@@ -109,7 +109,7 @@ end
 
 describe TagListAction, "#register" do
   before :each do
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     @action = TagListAction.new
   end
 
@@ -131,7 +131,7 @@ end
 
 describe TagListAction, "#unregister" do
   before :each do
-    MSpec.stub!(:unregister)
+    MSpec.stub(:unregister)
     @action = TagListAction.new
   end
 

data/spec/runner/actions/tagpurge_spec.rb

@@ -36,8 +36,8 @@ end
 
 describe TagPurgeAction, "#after" do
   before :each do
-    @state = mock("ExampleState")
-    @state.stub!(:description).and_return("str")
+    @state = double("ExampleState")
+    @state.stub(:description).and_return("str")
 
     @action = TagPurgeAction.new
   end
@@ -64,11 +64,11 @@ describe TagPurgeAction, "#unload" do
     @t2 = SpecTag.new "unstable:I'm unstable"
     @t3 = SpecTag.new "fails:I'm unstable"
 
-    MSpec.stub!(:read_tags).and_return([@t1, @t2, @t3])
-    MSpec.stub!(:write_tags)
+    MSpec.stub(:read_tags).and_return([@t1, @t2, @t3])
+    MSpec.stub(:write_tags)
 
-    @state = mock("ExampleState")
-    @state.stub!(:description).and_return("I'm unstable")
+    @state = double("ExampleState")
+    @state.stub(:description).and_return("I'm unstable")
 
     @action = TagPurgeAction.new
     @action.load
@@ -107,10 +107,10 @@ describe TagPurgeAction, "#unload" do
     @stdout = $stdout
     $stdout = IOStub.new
 
-    MSpec.stub!(:read_tags).and_return([])
+    MSpec.stub(:read_tags).and_return([])
 
-    @state = mock("ExampleState")
-    @state.stub!(:description).and_return("I'm unstable")
+    @state = double("ExampleState")
+    @state.stub(:description).and_return("I'm unstable")
 
     @action = TagPurgeAction.new
     @action.load
@@ -131,7 +131,7 @@ end
 
 describe TagPurgeAction, "#register" do
   before :each do
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     @action = TagPurgeAction.new
   end
 
@@ -143,7 +143,7 @@ end
 
 describe TagPurgeAction, "#unregister" do
   before :each do
-    MSpec.stub!(:unregister)
+    MSpec.stub(:unregister)
     @action = TagPurgeAction.new
   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('Mon Mar 30 14:05:19 -0700 2009'))
+    Time.stub(:now).and_return(Time.parse('Mon Mar 30 14:05:19 -0700 2009'))
     @timer.start
-    Time.stub!(:now).and_return(Time.parse('Mon Mar 30 14:05:52 -0700 2009'))
+    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('Mon Mar 30 14:05:19 -0700 2009'))
+    Time.stub(:now).and_return(Time.parse('Mon Mar 30 14:05:19 -0700 2009'))
     @timer.start
-    Time.stub!(:now).and_return(Time.parse('Mon Mar 30 14:05:52 -0700 2009'))
+    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

@@ -104,7 +104,7 @@ describe ContextState, "#it" do
   it "calls registered :add actions" do
     ExampleState.should_receive(:new).with(@state, "it", @proc).and_return(@ex)
 
-    add_action = mock("add")
+    add_action = double("add")
     add_action.should_receive(:add).with(@ex).and_return { ScratchPad.record :add }
     MSpec.register :add, add_action
 
@@ -251,9 +251,9 @@ end
 describe ContextState, "#parent=" do
   before :each do
     @state = ContextState.new ""
-    @parent = mock("describe")
-    @parent.stub!(:parent).and_return(nil)
-    @parent.stub!(:child)
+    @parent = double("describe")
+    @parent.stub(:parent).and_return(nil)
+    @parent.stub(:child)
   end
 
   it "does not set self as a child of parent if shared" do
@@ -282,9 +282,9 @@ end
 describe ContextState, "#parent" do
   before :each do
     @state = ContextState.new ""
-    @parent = mock("describe")
-    @parent.stub!(:parent).and_return(nil)
-    @parent.stub!(:child)
+    @parent = double("describe")
+    @parent.stub(:parent).and_return(nil)
+    @parent.stub(:child)
   end
 
   it "returns nil if parent has not been set" do
@@ -301,9 +301,9 @@ describe ContextState, "#parents" do
   before :each do
     @first = ContextState.new ""
     @second = ContextState.new ""
-    @parent = mock("describe")
-    @parent.stub!(:parent).and_return(nil)
-    @parent.stub!(:child)
+    @parent = double("describe")
+    @parent.stub(:parent).and_return(nil)
+    @parent.stub(:child)
   end
 
   it "returns a list of all enclosing ContextState instances" do
@@ -317,9 +317,9 @@ describe ContextState, "#child" do
   before :each do
     @first = ContextState.new ""
     @second = ContextState.new ""
-    @parent = mock("describe")
-    @parent.stub!(:parent).and_return(nil)
-    @parent.stub!(:child)
+    @parent = double("describe")
+    @parent.stub(:parent).and_return(nil)
+    @parent.stub(:child)
   end
 
   it "adds the ContextState to the list of contained ContextStates" do
@@ -369,7 +369,7 @@ describe ContextState, "#process" do
   before :each do
     MSpec.store :before, []
     MSpec.store :after, []
-    MSpec.stub!(:register_current)
+    MSpec.stub(:register_current)
 
     @state = ContextState.new ""
     @state.describe { }
@@ -405,7 +405,7 @@ describe ContextState, "#process" do
   it "does not call the #it block if #filtered? returns true" do
     @state.it("one", &@a)
     @state.it("two", &@b)
-    @state.examples.first.stub!(:filtered?).and_return(true)
+    @state.examples.first.stub(:filtered?).and_return(true)
     @state.process
     ScratchPad.recorded.should == [:b]
   end
@@ -510,7 +510,7 @@ describe ContextState, "#process" do
     @state = ContextState.new ""
     @state.describe { }
 
-    action = mock("action")
+    action = double("action")
     def action.exception(exc)
       ScratchPad.record :exception if exc.exception.is_a? SpecExpectationNotFoundError
     end
@@ -550,7 +550,7 @@ describe ContextState, "#process" do
     @state = ContextState.new ""
     @state.describe { }
 
-    example = mock("example")
+    example = double("example")
     def example.example(state, spec)
       ScratchPad << state << spec
     end
@@ -594,7 +594,7 @@ describe ContextState, "#process" do
   end
 
   it "calls registered :before actions with the current ExampleState instance" do
-    before = mock("before")
+    before = double("before")
     before.should_receive(:before).and_return {
       ScratchPad.record :before
       @spec_state = @state.state
@@ -606,7 +606,7 @@ describe ContextState, "#process" do
   end
 
   it "calls registered :after actions with the current ExampleState instance" do
-    after = mock("after")
+    after = double("after")
     after.should_receive(:after).and_return {
       ScratchPad.record :after
       @spec_state = @state.state
@@ -634,7 +634,7 @@ describe ContextState, "#process" do
   end
 
   it "calls registered :enter actions with the current #describe string" do
-    enter = mock("enter")
+    enter = double("enter")
     enter.should_receive(:enter).with("C#m").and_return { ScratchPad.record :enter }
     MSpec.register :enter, enter
     @state.process
@@ -642,7 +642,7 @@ describe ContextState, "#process" do
   end
 
   it "calls registered :leave actions" do
-    leave = mock("leave")
+    leave = double("leave")
     leave.should_receive(:leave).and_return { ScratchPad.record :leave }
     MSpec.register :leave, leave
     @state.process
@@ -775,7 +775,7 @@ describe ContextState, "#process in pretend mode" do
   end
 
   it "calls registered :before actions with the current ExampleState instance" do
-    before = mock("before")
+    before = double("before")
     before.should_receive(:before).and_return {
       ScratchPad.record :before
       @spec_state = @state.state
@@ -787,7 +787,7 @@ describe ContextState, "#process in pretend mode" do
   end
 
   it "calls registered :after actions with the current ExampleState instance" do
-    after = mock("after")
+    after = double("after")
     after.should_receive(:after).and_return {
       ScratchPad.record :after
       @spec_state = @state.state
@@ -898,7 +898,7 @@ describe ContextState, "#process in pretend mode" do
   end
 
   it "calls registered :enter actions with the current #describe string" do
-    enter = mock("enter")
+    enter = double("enter")
     enter.should_receive(:enter).and_return { ScratchPad.record :enter }
     MSpec.register :enter, enter
     @state.process
@@ -906,7 +906,7 @@ describe ContextState, "#process in pretend mode" do
   end
 
   it "calls registered :leave actions" do
-    leave = mock("leave")
+    leave = double("leave")
     leave.should_receive(:leave).and_return { ScratchPad.record :leave }
     MSpec.register :leave, leave
     @state.process
@@ -918,7 +918,7 @@ describe ContextState, "#it_should_behave_like" do
   before :each do
     @shared_desc = :shared_context
     @shared = ContextState.new(@shared_desc, :shared => true)
-    MSpec.stub!(:retrieve_shared).and_return(@shared)
+    MSpec.stub(:retrieve_shared).and_return(@shared)
 
     @state = ContextState.new "Top level"
     @a = lambda {|*| }
@@ -938,7 +938,7 @@ describe ContextState, "#it_should_behave_like" do
       @shared.children << @nested
 
       @nested_dup = @nested.dup
-      @nested.stub!(:dup).and_return(@nested_dup)
+      @nested.stub(:dup).and_return(@nested_dup)
     end
 
     it "duplicates the nested ContextState" do
@@ -972,7 +972,7 @@ describe ContextState, "#it_should_behave_like" do
   it "adds duped examples from the shared ContextState" do
     @shared.it "some method", &@a
     ex_dup = @shared.examples.first.dup
-    @shared.examples.first.stub!(:dup).and_return(ex_dup)
+    @shared.examples.first.stub(:dup).and_return(ex_dup)
 
     @state.it_should_behave_like @shared_desc
     @state.examples.should == [ex_dup]
@@ -1022,20 +1022,20 @@ describe ContextState, "#filter_examples" do
   end
 
   it "removes examples that are filtered" do
-    @state.examples.first.stub!(:filtered?).and_return(true)
+    @state.examples.first.stub(:filtered?).and_return(true)
     @state.examples.size.should == 2
     @state.filter_examples
     @state.examples.size.should == 1
   end
 
   it "returns true if there are remaining examples to evaluate" do
-    @state.examples.first.stub!(:filtered?).and_return(true)
+    @state.examples.first.stub(:filtered?).and_return(true)
     @state.filter_examples.should be_true
   end
 
   it "returns false if there are no remaining examples to evaluate" do
-    @state.examples.first.stub!(:filtered?).and_return(true)
-    @state.examples.last.stub!(:filtered?).and_return(true)
+    @state.examples.first.stub(:filtered?).and_return(true)
+    @state.examples.last.stub(:filtered?).and_return(true)
     @state.filter_examples.should be_false
   end
 end