mspec 1.7.0 → 1.8.0

data/spec/runner/example_spec.rb

@@ -68,7 +68,7 @@ describe ExampleState, "#filtered?" do
     MSpec.store :exclude, nil
 
     @state = ExampleState.new ContextState.new("describe"), "it"
-    @filter = mock("filter")
+    @filter = double("filter")
   end
 
   after :each do

data/spec/runner/filters/profile_spec.rb

@@ -5,7 +5,7 @@ require 'mspec/runner/filters/profile'
 describe ProfileFilter, "#find" do
   before :each do
     @filter = ProfileFilter.new nil
-    File.stub!(:exist?).and_return(false)
+    File.stub(:exist?).and_return(false)
     @file = "rails.yaml"
   end
 
@@ -79,7 +79,7 @@ end
 describe ProfileFilter, "#===" do
   before :each do
     @filter = ProfileFilter.new nil
-    @filter.stub!(:load).and_return({ "A#" => ["[]=", "a", "a!", "a?", "aa="]})
+    @filter.stub(:load).and_return({ "A#" => ["[]=", "a", "a!", "a?", "aa="]})
     @filter.send :initialize, nil
   end
 

data/spec/runner/filters/tag_spec.rb

@@ -5,11 +5,11 @@ require 'mspec/runner/filters/tag'
 
 describe TagFilter, "#load" do
   before :each do
-    @match = mock("match filter").as_null_object
+    @match = double("match filter").as_null_object
     @filter = TagFilter.new :include, "tag", "key"
     @tag = SpecTag.new "tag(comment):description"
-    MSpec.stub!(:read_tags).and_return([@tag])
-    MSpec.stub!(:register)
+    MSpec.stub(:read_tags).and_return([@tag])
+    MSpec.stub(:register)
   end
 
   it "loads tags from the tag file" do
@@ -46,13 +46,13 @@ describe TagFilter, "#unload" do
   before :each do
     @filter = TagFilter.new :include, "tag", "key"
     @tag = SpecTag.new "tag(comment):description"
-    MSpec.stub!(:read_tags).and_return([@tag])
+    MSpec.stub(:read_tags).and_return([@tag])
   end
 
   it "unregisters the MatchFilter if one was registered" do
-    match = mock("match filter").as_null_object
+    match = double("match filter").as_null_object
     match.should_receive(:unregister)
-    MatchFilter.stub!(:new).with(:include, "description").and_return(match)
+    MatchFilter.stub(:new).with(:include, "description").and_return(match)
     @filter.load
     @filter.unload
   end

data/spec/runner/formatters/describe_spec.rb

@@ -4,12 +4,12 @@ require 'mspec/runner/example'
 
 describe DescribeFormatter, "#finish" do
   before :each do
-    MSpec.stub!(:register)
-    MSpec.stub!(:unregister)
+    MSpec.stub(:register)
+    MSpec.stub(:unregister)
 
-    @timer = mock("timer").as_null_object
-    TimerAction.stub!(:new).and_return(@timer)
-    @timer.stub!(:format).and_return("Finished in 2.0 seconds")
+    @timer = double("timer").as_null_object
+    TimerAction.stub(:new).and_return(@timer)
+    @timer.stub(:format).and_return("Finished in 2.0 seconds")
 
     $stdout = @out = IOStub.new
     context = ContextState.new "Class#method"
@@ -52,7 +52,7 @@ Finished in 2.0 seconds
 
   it "prints a summary of failures and errors for each describe block" do
     exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken")
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.exception exc
     @formatter.finish
     @out.should == %[

data/spec/runner/formatters/dotted_spec.rb

@@ -17,7 +17,7 @@ end
 describe DottedFormatter, "#register" do
   before :each do
     @formatter = DottedFormatter.new
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
   end
 
   it "registers self with MSpec for appropriate actions" do
@@ -29,8 +29,8 @@ describe DottedFormatter, "#register" do
   end
 
   it "creates TimerAction and TallyAction" do
-    timer = mock("timer")
-    tally = mock("tally")
+    timer = double("timer")
+    tally = double("tally")
     timer.should_receive(:register)
     tally.should_receive(:register)
     tally.should_receive(:counter)
@@ -221,15 +221,15 @@ end
 
 describe DottedFormatter, "#finish" do
   before :each do
-    @tally = mock("tally").as_null_object
-    TallyAction.stub!(:new).and_return(@tally)
-    @timer = mock("timer").as_null_object
-    TimerAction.stub!(:new).and_return(@timer)
+    @tally = double("tally").as_null_object
+    TallyAction.stub(:new).and_return(@tally)
+    @timer = double("timer").as_null_object
+    TimerAction.stub(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new
     context = ContextState.new "Class#method"
     @state = ExampleState.new(context, "runs")
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     @formatter = DottedFormatter.new
     @formatter.register
   end
@@ -248,7 +248,7 @@ describe DottedFormatter, "#finish" do
 
   it "prints a backtrace for an exception" do
     exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken")
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.exception exc
     @formatter.after @state
     @formatter.finish
@@ -269,7 +269,7 @@ describe DottedFormatter, "#finish" do
 
   it "prints errors, backtraces, elapsed time, and tallies" do
     exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken")
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.exception exc
     @timer.should_receive(:format).and_return("Finished in 2.0 seconds")
     @tally.should_receive(:format).and_return("1 example, 1 failure")

data/spec/runner/formatters/file_spec.rb

@@ -6,8 +6,8 @@ require 'mspec/runner/example'
 describe FileFormatter, "#register" do
   before :each do
     @formatter = FileFormatter.new
-    MSpec.stub!(:register)
-    MSpec.stub!(:unregister)
+    MSpec.stub(:register)
+    MSpec.stub(:unregister)
   end
 
   it "registers self with MSpec for :load, :unload actions" do

data/spec/runner/formatters/html_spec.rb

@@ -12,7 +12,7 @@ describe HtmlFormatter do
   end
 
   it "responds to #register by registering itself with MSpec for appropriate actions" do
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     MSpec.should_receive(:register).with(:start, @formatter)
     MSpec.should_receive(:register).with(:enter, @formatter)
     MSpec.should_receive(:register).with(:leave, @formatter)
@@ -33,7 +33,7 @@ describe HtmlFormatter, "#start" do
   it "prints the HTML head" do
     @formatter.start
     ruby_name = RUBY_NAME
-    ruby_name.should =~ /^ruby/
+    ruby_name.should =~ /^#{ruby_name}/
     @out.should ==
 %[<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
     "http://www.w3.org/TR/html4/strict.dtd">
@@ -144,19 +144,19 @@ end
 
 describe HtmlFormatter, "#finish" do
   before :each do
-    @tally = mock("tally").as_null_object
-    TallyAction.stub!(:new).and_return(@tally)
-    @timer = mock("timer").as_null_object
-    TimerAction.stub!(:new).and_return(@timer)
+    @tally = double("tally").as_null_object
+    TallyAction.stub(:new).and_return(@tally)
+    @timer = double("timer").as_null_object
+    TimerAction.stub(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new
     context = ContextState.new "describe"
     @state = ExampleState.new(context, "it")
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     @formatter = HtmlFormatter.new
     @formatter.register
     @exception = MSpecExampleError.new("broken")
-    @exception.stub!(:backtrace).and_return(["file.rb:1", "file.rb:2"])
+    @exception.stub(:backtrace).and_return(["file.rb:1", "file.rb:2"])
   end
 
   after :each do
@@ -172,7 +172,7 @@ describe HtmlFormatter, "#finish" do
 
   it "prints a backtrace for an exception" do
     exc = ExceptionState.new @state, nil, @exception
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.exception exc
     @formatter.finish
     @out.should =~ %r[<pre>.*path/to/some/file.rb:35:in method.*</pre>]m
@@ -192,7 +192,7 @@ describe HtmlFormatter, "#finish" do
 
   it "prints errors, backtraces, elapsed time, and tallies" do
     exc = ExceptionState.new @state, nil, @exception
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.exception exc
     
     @timer.should_receive(:format).and_return("Finished in 2.0 seconds")

data/spec/runner/formatters/junit_spec.rb

@@ -17,7 +17,7 @@ describe JUnitFormatter, "#print" do
   before :each do
     $stdout = IOStub.new
     @out = IOStub.new
-    File.stub!(:open).and_return(@out)
+    File.stub(:open).and_return(@out)
     @formatter = JUnitFormatter.new "some/file"
   end
 
@@ -49,25 +49,25 @@ end
 
 describe JUnitFormatter, "#finish" do
   before :each do
-    @tally = mock("tally").as_null_object
-    @counter = mock("counter").as_null_object
-    @tally.stub!(:counter).and_return(@counter)
-    TallyAction.stub!(:new).and_return(@tally)
+    @tally = double("tally").as_null_object
+    @counter = double("counter").as_null_object
+    @tally.stub(:counter).and_return(@counter)
+    TallyAction.stub(:new).and_return(@tally)
 
-    @timer = mock("timer").as_null_object
-    TimerAction.stub!(:new).and_return(@timer)
+    @timer = double("timer").as_null_object
+    TimerAction.stub(:new).and_return(@timer)
 
     $stdout = IOStub.new
     context = ContextState.new "describe"
     @state = ExampleState.new(context, "it")
 
     @formatter = JUnitFormatter.new
-    @formatter.stub!(:backtrace).and_return("")
-    MSpec.stub!(:register)
+    @formatter.stub(:backtrace).and_return("")
+    MSpec.stub(:register)
     @formatter.register
 
     exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken")
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.exception exc
     @formatter.after @state
   end
@@ -90,7 +90,7 @@ describe JUnitFormatter, "#finish" do
 
   it "encodes message and backtrace in latin1 for jenkins" do
     exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken…")
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in methød")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in methød")
     @formatter.exception exc
     @formatter.finish
     $stdout.should =~ /MSpecExampleError: broken((\.\.\.)|\?)\n/

data/spec/runner/formatters/method_spec.rb

@@ -26,7 +26,7 @@ end
 describe MethodFormatter, "#before" do
   before :each do
     @formatter = MethodFormatter.new
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     @formatter.register
   end
 
@@ -94,7 +94,7 @@ end
 describe MethodFormatter, "#after" do
   before :each do
     @formatter = MethodFormatter.new
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     @formatter.register
   end
 
@@ -138,7 +138,7 @@ describe MethodFormatter, "#after" do
     context = ContextState.new "Class#method"
     @state = ExampleState.new(context, "runs")
     @formatter = MethodFormatter.new
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     @formatter.register
   end
 

data/spec/runner/formatters/specdoc_spec.rb

@@ -8,7 +8,7 @@ describe SpecdocFormatter do
   end
 
   it "responds to #register by registering itself with MSpec for appropriate actions" do
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     MSpec.should_receive(:register).with(:enter, @formatter)
     @formatter.register
   end

data/spec/runner/formatters/spinner_spec.rb

@@ -16,7 +16,7 @@ end
 describe SpinnerFormatter, "#register" do
   before :each do
     @formatter = SpinnerFormatter.new
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
   end
 
   it "registers self with MSpec for appropriate actions" do
@@ -28,8 +28,8 @@ describe SpinnerFormatter, "#register" do
   end
 
   it "creates TimerAction and TallyAction" do
-    timer = mock("timer")
-    tally = mock("tally")
+    timer = double("timer")
+    tally = double("tally")
     timer.should_receive(:register)
     tally.should_receive(:register)
     tally.should_receive(:counter)
@@ -55,7 +55,7 @@ end
 describe SpinnerFormatter, "#after" do
   before :each do
     $stdout = IOStub.new
-    MSpec.stub!(:retrieve).and_return(["a", "b"])
+    MSpec.stub(:retrieve).and_return(["a", "b"])
     @formatter = SpinnerFormatter.new
     @formatter.register
     @state = ExampleState.new("describe", "it")

data/spec/runner/formatters/unit_spec.rb

@@ -5,15 +5,15 @@ require 'mspec/utils/script'
 
 describe UnitdiffFormatter, "#finish" do
   before :each do
-    @tally = mock("tally").as_null_object
-    TallyAction.stub!(:new).and_return(@tally)
-    @timer = mock("timer").as_null_object
-    TimerAction.stub!(:new).and_return(@timer)
+    @tally = double("tally").as_null_object
+    TallyAction.stub(:new).and_return(@tally)
+    @timer = double("timer").as_null_object
+    TimerAction.stub(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new
     context = ContextState.new "describe"
     @state = ExampleState.new(context, "it")
-    MSpec.stub!(:register)
+    MSpec.stub(:register)
     @formatter = UnitdiffFormatter.new
     @formatter.register
   end
@@ -32,7 +32,7 @@ describe UnitdiffFormatter, "#finish" do
 
   it "prints a backtrace for an exception" do
     exc = ExceptionState.new @state, nil, Exception.new("broken")
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.exception exc
     @formatter.finish
     @out.should =~ %r[path/to/some/file.rb:35:in method$]
@@ -52,7 +52,7 @@ describe UnitdiffFormatter, "#finish" do
 
   it "prints errors, backtraces, elapsed time, and tallies" do
     exc = ExceptionState.new @state, nil, Exception.new("broken")
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.exception exc
     @formatter.after @state
     @timer.should_receive(:format).and_return("Finished in 2.0 seconds")

data/spec/runner/formatters/yaml_spec.rb

@@ -16,7 +16,7 @@ describe YamlFormatter, "#print" do
   before :each do
     $stdout = IOStub.new
     @out = IOStub.new
-    File.stub!(:open).and_return(@out)
+    File.stub(:open).and_return(@out)
     @formatter = YamlFormatter.new "some/file"
   end
 
@@ -48,25 +48,25 @@ end
 
 describe YamlFormatter, "#finish" do
   before :each do
-    @tally = mock("tally").as_null_object
-    @counter = mock("counter").as_null_object
-    @tally.stub!(:counter).and_return(@counter)
-    TallyAction.stub!(:new).and_return(@tally)
+    @tally = double("tally").as_null_object
+    @counter = double("counter").as_null_object
+    @tally.stub(:counter).and_return(@counter)
+    TallyAction.stub(:new).and_return(@tally)
 
-    @timer = mock("timer").as_null_object
-    TimerAction.stub!(:new).and_return(@timer)
+    @timer = double("timer").as_null_object
+    TimerAction.stub(:new).and_return(@timer)
 
     $stdout = IOStub.new
     context = ContextState.new "describe"
     @state = ExampleState.new(context, "it")
 
     @formatter = YamlFormatter.new
-    @formatter.stub!(:backtrace).and_return("")
-    MSpec.stub!(:register)
+    @formatter.stub(:backtrace).and_return("")
+    MSpec.stub(:register)
     @formatter.register
 
     exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken")
-    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    exc.stub(:backtrace).and_return("path/to/some/file.rb:35:in method")
     @formatter.exception exc
     @formatter.after @state
   end

data/spec/runner/mspec_spec.rb

@@ -95,7 +95,7 @@ describe MSpec, ".protect" do
   before :each do
     MSpec.clear_current
     @cs = ContextState.new "C#m"
-    @cs.stub!(:state).and_return(@es)
+    @cs.stub(:state).and_return(@es)
     @cs.parent = MSpec.current
 
     @es = ExampleState.new @cs, "runs"
@@ -125,8 +125,8 @@ describe MSpec, ".protect" do
 
   it "calls all the exception actions" do
     exc = ExceptionState.new @es, "testing", ScratchPad.recorded
-    ExceptionState.stub!(:new).and_return(exc)
-    action = mock("exception")
+    ExceptionState.stub(:new).and_return(exc)
+    action = double("exception")
     action.should_receive(:exception).with(exc)
     MSpec.register :exception, action
     MSpec.protect("testing") { raise ScratchPad.recorded }
@@ -183,10 +183,10 @@ describe MSpec, ".actions" do
   before :each do
     MSpec.store :start, []
     ScratchPad.record []
-    start_one = mock("one")
-    start_one.stub!(:start).and_return { ScratchPad << :one }
-    start_two = mock("two")
-    start_two.stub!(:start).and_return { ScratchPad << :two }
+    start_one = double("one")
+    start_one.stub(:start).and_return { ScratchPad << :one }
+    start_two = double("two")
+    start_two.stub(:start).and_return { ScratchPad << :two }
     MSpec.register :start, start_one
     MSpec.register :start, start_two
   end
@@ -264,9 +264,9 @@ describe MSpec, ".describe" do
   before :each do
     MSpec.clear_current
     @cs = ContextState.new ""
-    ContextState.stub!(:new).and_return(@cs)
-    MSpec.stub!(:current).and_return(nil)
-    MSpec.stub!(:register_current)
+    ContextState.stub(:new).and_return(@cs)
+    MSpec.stub(:current).and_return(nil)
+    MSpec.stub(:register_current)
   end
 
   it "creates a new ContextState for the block" do
@@ -293,22 +293,22 @@ end
 
 describe MSpec, ".process" do
   before :each do
-    MSpec.stub!(:files)
+    MSpec.stub(:files)
     MSpec.store :start, []
     MSpec.store :finish, []
   end
 
   it "calls all start actions" do
-    start = mock("start")
-    start.stub!(:start).and_return { ScratchPad.record :start }
+    start = double("start")
+    start.stub(:start).and_return { ScratchPad.record :start }
     MSpec.register :start, start
     MSpec.process
     ScratchPad.recorded.should == :start
   end
 
   it "calls all finish actions" do
-    finish = mock("finish")
-    finish.stub!(:finish).and_return { ScratchPad.record :finish }
+    finish = double("finish")
+    finish.stub(:finish).and_return { ScratchPad.record :finish }
     MSpec.register :finish, finish
     MSpec.process
     ScratchPad.recorded.should == :finish
@@ -325,12 +325,12 @@ describe MSpec, ".files" do
     MSpec.store :load, []
     MSpec.store :unload, []
     MSpec.register_files [:one, :two, :three]
-    Kernel.stub!(:load)
+    Kernel.stub(:load)
   end
 
   it "calls load actions before each file" do
-    load = mock("load")
-    load.stub!(:load).and_return { ScratchPad.record :load }
+    load = double("load")
+    load.stub(:load).and_return { ScratchPad.record :load }
     MSpec.register :load, load
     MSpec.files
     ScratchPad.recorded.should == :load
@@ -403,7 +403,7 @@ end
 
 describe MSpec, ".read_tags" do
   before :each do
-    MSpec.stub!(:tags_file).and_return(File.dirname(__FILE__) + '/tags.txt')
+    MSpec.stub(:tags_file).and_return(File.dirname(__FILE__) + '/tags.txt')
   end
 
   it "returns a list of tag instances for matching tag names found" do
@@ -424,7 +424,7 @@ describe MSpec, ".read_tags" do
       f.puts @tag
       f.puts ""
     end
-    MSpec.stub!(:tags_file).and_return(tmp("tags.txt", false))
+    MSpec.stub(:tags_file).and_return(tmp("tags.txt", false))
   end
 
   it "does not return a tag object for empty lines" do
@@ -435,7 +435,7 @@ end
 describe MSpec, ".write_tags" do
   before :each do
     FileUtils.cp File.dirname(__FILE__) + "/tags.txt", tmp("tags.txt", false)
-    MSpec.stub!(:tags_file).and_return(tmp("tags.txt", false))
+    MSpec.stub(:tags_file).and_return(tmp("tags.txt", false))
     @tag1 = SpecTag.new "check(broken):Tag#rewrite works"
     @tag2 = SpecTag.new "broken:Tag#write_tags fails"
   end
@@ -459,8 +459,8 @@ end
 
 describe MSpec, ".write_tag" do
   before :each do
-    FileUtils.stub!(:mkdir_p)
-    MSpec.stub!(:tags_file).and_return(tmp("tags.txt", false))
+    FileUtils.stub(:mkdir_p)
+    MSpec.stub(:tags_file).and_return(tmp("tags.txt", false))
     @tag = SpecTag.new "fail(broken):Some#method works"
   end
 
@@ -483,7 +483,7 @@ end
 describe MSpec, ".delete_tag" do
   before :each do
     FileUtils.cp File.dirname(__FILE__) + "/tags.txt", tmp("tags.txt", false)
-    MSpec.stub!(:tags_file).and_return(tmp("tags.txt", false))
+    MSpec.stub(:tags_file).and_return(tmp("tags.txt", false))
     @tag = SpecTag.new "fail(Comments don't matter):Some#method? works"
   end
 
@@ -530,7 +530,7 @@ describe MSpec, ".delete_tags" do
   before :each do
     @tags = tmp("tags.txt", false)
     FileUtils.cp File.dirname(__FILE__) + "/tags.txt", @tags
-    MSpec.stub!(:tags_file).and_return(@tags)
+    MSpec.stub(:tags_file).and_return(@tags)
   end
 
   it "deletes the tag file" do