mspec 1.5.17 → 1.5.18

data/spec/runner/exception_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/expectations/expectations'
 require 'mspec/runner/example'
 require 'mspec/runner/exception'

data/spec/runner/filters/tag_spec.rb

@@ -5,7 +5,7 @@ require 'mspec/runner/filters/tag'
 
 describe TagFilter, "#load" do
   before :each do
-    @match = mock("match filter", :null_object => true)
+    @match = mock("match filter").as_null_object
     @filter = TagFilter.new :include, "tag", "key"
     @tag = SpecTag.new "tag(comment):description"
     MSpec.stub!(:read_tags).and_return([@tag])
@@ -50,7 +50,7 @@ describe TagFilter, "#unload" do
   end
 
   it "unregisters the MatchFilter if one was registered" do
-    match = mock("match filter", :null_object => true)
+    match = mock("match filter").as_null_object
     match.should_receive(:unregister)
     MatchFilter.stub!(:new).with(:include, "description").and_return(match)
     @filter.load

data/spec/runner/formatters/describe_spec.rb

@@ -7,7 +7,7 @@ describe DescribeFormatter, "#finish" do
     MSpec.stub!(:register)
     MSpec.stub!(:unregister)
 
-    @timer = mock("timer", :null_object => true)
+    @timer = mock("timer").as_null_object
     TimerAction.stub!(:new).and_return(@timer)
     @timer.stub!(:format).and_return("Finished in 2.0 seconds")
 

data/spec/runner/formatters/dotted_spec.rb

@@ -221,9 +221,9 @@ end
 
 describe DottedFormatter, "#finish" do
   before :each do
-    @tally = mock("tally", :null_object => true)
+    @tally = mock("tally").as_null_object
     TallyAction.stub!(:new).and_return(@tally)
-    @timer = mock("timer", :null_object => true)
+    @timer = mock("timer").as_null_object
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new

data/spec/runner/formatters/html_spec.rb

@@ -144,9 +144,9 @@ end
 
 describe HtmlFormatter, "#finish" do
   before :each do
-    @tally = mock("tally", :null_object => true)
+    @tally = mock("tally").as_null_object
     TallyAction.stub!(:new).and_return(@tally)
-    @timer = mock("timer", :null_object => true)
+    @timer = mock("timer").as_null_object
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new

data/spec/runner/formatters/junit_spec.rb

@@ -0,0 +1,147 @@
+# -*- coding: utf-8 -*-
+require File.dirname(__FILE__) + '/../../spec_helper'
+require 'mspec/runner/formatters/junit'
+require 'mspec/runner/example'
+
+describe JUnitFormatter, "#initialize" do
+  it "permits zero arguments" do
+    lambda { JUnitFormatter.new }.should_not raise_error
+  end
+
+  it "accepts one argument" do
+    lambda { JUnitFormatter.new nil }.should_not raise_error
+  end
+end
+
+describe JUnitFormatter, "#print" do
+  before :each do
+    $stdout = IOStub.new
+    @out = IOStub.new
+    File.stub!(:open).and_return(@out)
+    @formatter = JUnitFormatter.new "some/file"
+  end
+
+  after :each do
+    $stdout = STDOUT
+  end
+
+  it "writes to $stdout if #switch has not been called" do
+    @formatter.print "begonias"
+    $stdout.should == "begonias"
+    @out.should == ""
+  end
+
+  it "writes to the file passed to #initialize once #switch has been called" do
+    @formatter.switch
+    @formatter.print "begonias"
+    $stdout.should == ""
+    @out.should == "begonias"
+  end
+
+  it "writes to $stdout once #switch is called if no file was passed to #initialize" do
+    formatter = JUnitFormatter.new
+    formatter.switch
+    formatter.print "begonias"
+    $stdout.should == "begonias"
+    @out.should == ""
+  end
+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)
+
+    @timer = mock("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.register
+
+    exc = ExceptionState.new @state, nil, MSpecExampleError.new("broken")
+    exc.stub!(:backtrace).and_return("path/to/some/file.rb:35:in method")
+    @formatter.exception exc
+    @formatter.after @state
+  end
+
+  after :each do
+    $stdout = STDOUT
+  end
+
+  it "calls #switch" do
+    @formatter.should_receive(:switch)
+    @formatter.finish
+  end
+
+  it "outputs a failure message and backtrace" do
+    @formatter.finish
+    $stdout.should =~ /message="error in describe it" type="error"/
+    $stdout.should =~ /MSpecExampleError: broken\n/
+    $stdout.should =~ %r[path/to/some/file.rb:35:in method]
+  end
+
+  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")
+    @formatter.exception exc
+    @formatter.finish
+    $stdout.should =~ /MSpecExampleError: broken((\.\.\.)|\?)\n/
+    $stdout.should =~ /path\/to\/some\/file\.rb:35:in meth(\?|o)d/
+  end
+
+  it "outputs an elapsed time" do
+    @timer.should_receive(:elapsed).and_return(4.2)
+    @formatter.finish
+    $stdout.should =~ /time="4.2"/
+  end
+
+  it "outputs overall elapsed time" do
+    @timer.should_receive(:elapsed).and_return(4.2)
+    @formatter.finish
+    $stdout.should =~ /timeCount="4.2"/
+  end
+
+  it "outputs the number of examples as test count" do
+    @counter.should_receive(:examples).and_return(9)
+    @formatter.finish
+    $stdout.should =~ /tests="9"/
+  end
+
+  it "outputs overall number of examples as test count" do
+    @counter.should_receive(:examples).and_return(9)
+    @formatter.finish
+    $stdout.should =~ /testCount="9"/
+  end
+
+  it "outputs a failure count" do
+    @counter.should_receive(:failures).and_return(2)
+    @formatter.finish
+    $stdout.should =~ /failureCount="2"/
+  end
+
+  it "outputs overall failure count" do
+    @counter.should_receive(:failures).and_return(2)
+    @formatter.finish
+    $stdout.should =~ /failures="2"/
+  end
+
+  it "outputs an error count" do
+    @counter.should_receive(:errors).and_return(1)
+    @formatter.finish
+    $stdout.should =~ /errors="1"/
+  end
+
+  it "outputs overall error count" do
+    @counter.should_receive(:errors).and_return(1)
+    @formatter.finish
+    $stdout.should =~ /errorCount="1"/
+  end
+end

data/spec/runner/formatters/unit_spec.rb

@@ -5,9 +5,9 @@ require 'mspec/utils/script'
 
 describe UnitdiffFormatter, "#finish" do
   before :each do
-    @tally = mock("tally", :null_object => true)
+    @tally = mock("tally").as_null_object
     TallyAction.stub!(:new).and_return(@tally)
-    @timer = mock("timer", :null_object => true)
+    @timer = mock("timer").as_null_object
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = @out = IOStub.new

data/spec/runner/formatters/yaml_spec.rb

@@ -48,12 +48,12 @@ end
 
 describe YamlFormatter, "#finish" do
   before :each do
-    @tally = mock("tally", :null_object => true)
-    @counter = mock("counter", :null_object => true)
+    @tally = mock("tally").as_null_object
+    @counter = mock("counter").as_null_object
     @tally.stub!(:counter).and_return(@counter)
     TallyAction.stub!(:new).and_return(@tally)
 
-    @timer = mock("timer", :null_object => true)
+    @timer = mock("timer").as_null_object
     TimerAction.stub!(:new).and_return(@timer)
 
     $stdout = IOStub.new

data/spec/runner/mspec_spec.rb

@@ -1,5 +1,6 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/helpers/tmp'
+require 'mspec/helpers/fs'
 require 'mspec/matchers/base'
 require 'mspec/runner/mspec'
 require 'mspec/runner/example'
@@ -418,12 +419,12 @@ end
 describe MSpec, ".read_tags" do
   before :each do
     @tag = SpecTag.new "fails:Some#method"
-    File.open(tmp("tags.txt"), "w") do |f|
+    File.open(tmp("tags.txt", false), "w") do |f|
       f.puts ""
       f.puts @tag
       f.puts ""
     end
-    MSpec.stub!(:tags_file).and_return(tmp("tags.txt"))
+    MSpec.stub!(:tags_file).and_return(tmp("tags.txt", false))
   end
 
   it "does not return a tag object for empty lines" do
@@ -433,24 +434,24 @@ end
 
 describe MSpec, ".write_tags" do
   before :each do
-    FileUtils.cp File.dirname(__FILE__) + "/tags.txt", tmp("tags.txt")
-    MSpec.stub!(:tags_file).and_return(tmp("tags.txt"))
+    FileUtils.cp File.dirname(__FILE__) + "/tags.txt", 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
 
   after :all do
-    File.delete tmp("tags.txt") rescue nil
+    rm_r tmp("tags.txt", false)
   end
 
   it "overwrites the tags in the tag file" do
-    IO.read(tmp("tags.txt")).should == %[fail(broken):Some#method? works
+    IO.read(tmp("tags.txt", false)).should == %[fail(broken):Some#method? works
 incomplete(20%):The#best method ever
 benchmark(0.01825):The#fastest method today
 extended():\"Multi-line\\ntext\\ntag\"
 ]
     MSpec.write_tags [@tag1, @tag2]
-    IO.read(tmp("tags.txt")).should == %[check(broken):Tag#rewrite works
+    IO.read(tmp("tags.txt", false)).should == %[check(broken):Tag#rewrite works
 broken:Tag#write_tags fails
 ]
   end
@@ -459,40 +460,40 @@ end
 describe MSpec, ".write_tag" do
   before :each do
     FileUtils.stub!(:mkdir_p)
-    MSpec.stub!(:tags_file).and_return(tmp("tags.txt"))
+    MSpec.stub!(:tags_file).and_return(tmp("tags.txt", false))
     @tag = SpecTag.new "fail(broken):Some#method works"
   end
 
   after :all do
-    File.delete tmp("tags.txt") rescue nil
+    rm_r tmp("tags.txt", false)
   end
 
   it "writes a tag to the tags file for the current spec file" do
     MSpec.write_tag @tag
-    IO.read(tmp("tags.txt")).should == "fail(broken):Some#method works\n"
+    IO.read(tmp("tags.txt", false)).should == "fail(broken):Some#method works\n"
   end
 
   it "does not write a duplicate tag" do
-    File.open(tmp("tags.txt"), "w") { |f| f.puts @tag }
+    File.open(tmp("tags.txt", false), "w") { |f| f.puts @tag }
     MSpec.write_tag @tag
-    IO.read(tmp("tags.txt")).should == "fail(broken):Some#method works\n"
+    IO.read(tmp("tags.txt", false)).should == "fail(broken):Some#method works\n"
   end
 end
 
 describe MSpec, ".delete_tag" do
   before :each do
-    FileUtils.cp File.dirname(__FILE__) + "/tags.txt", tmp("tags.txt")
-    MSpec.stub!(:tags_file).and_return(tmp("tags.txt"))
+    FileUtils.cp File.dirname(__FILE__) + "/tags.txt", 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
 
   after :each do
-    File.delete tmp("tags.txt") rescue nil
+    rm_r tmp("tags.txt", false)
   end
 
   it "deletes the tag if it exists" do
     MSpec.delete_tag(@tag).should == true
-    IO.read(tmp("tags.txt")).should == %[incomplete(20%):The#best method ever
+    IO.read(tmp("tags.txt", false)).should == %[incomplete(20%):The#best method ever
 benchmark(0.01825):The#fastest method today
 extended():\"Multi-line\\ntext\\ntag\"
 ]
@@ -500,7 +501,7 @@ extended():\"Multi-line\\ntext\\ntag\"
 
   it "deletes a tag with escaped newlines" do
     MSpec.delete_tag(SpecTag.new('extended:"Multi-line\ntext\ntag"')).should == true
-    IO.read(tmp("tags.txt")).should == %[fail(broken):Some#method? works
+    IO.read(tmp("tags.txt", false)).should == %[fail(broken):Some#method? works
 incomplete(20%):The#best method ever
 benchmark(0.01825):The#fastest method today
 ]
@@ -509,7 +510,7 @@ benchmark(0.01825):The#fastest method today
   it "does not change the tags file contents if the tag doesn't exist" do
     @tag.tag = "failed"
     MSpec.delete_tag(@tag).should == false
-    IO.read(tmp("tags.txt")).should == %[fail(broken):Some#method? works
+    IO.read(tmp("tags.txt", false)).should == %[fail(broken):Some#method? works
 incomplete(20%):The#best method ever
 benchmark(0.01825):The#fastest method today
 extended():\"Multi-line\\ntext\\ntag\"
@@ -521,13 +522,13 @@ extended():\"Multi-line\\ntext\\ntag\"
     MSpec.delete_tag(SpecTag.new("incomplete:The#best method ever")).should == true
     MSpec.delete_tag(SpecTag.new("benchmark:The#fastest method today")).should == true
     MSpec.delete_tag(SpecTag.new("extended:\"Multi-line\ntext\ntag\"")).should == true
-    File.exist?(tmp("tags.txt")).should == false
+    File.exist?(tmp("tags.txt", false)).should == false
   end
 end
 
 describe MSpec, ".delete_tags" do
   before :each do
-    @tags = tmp("tags.txt")
+    @tags = tmp("tags.txt", false)
     FileUtils.cp File.dirname(__FILE__) + "/tags.txt", @tags
     MSpec.stub!(:tags_file).and_return(@tags)
   end

data/spec/runner/shared_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/runner/shared'
 require 'mspec/runner/context'
 require 'mspec/runner/example'
@@ -29,6 +29,14 @@ describe Object, "#it_behaves_like" do
     ScratchPad.recorded.should == object
   end
 
+  it "creates @object if the passed false" do
+    object = false
+    @shared.it("an example") { ScratchPad.record @object }
+    @state.it_behaves_like :shared_spec, :some_method, object
+    @state.process
+    ScratchPad.recorded.should == object
+  end
+
   it "sends :it_should_behave_like" do
     @state.should_receive(:it_should_behave_like)
     @state.it_behaves_like :shared_spec, :some_method

data/spec/runner/tag_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/runner/tag'
 
 describe SpecTag do

data/spec/spec_helper.rb

@@ -1,9 +1,3 @@
-dir_path = File.dirname(__FILE__)
-lib_path = File.expand_path(dir_path + '/../lib')
-bin_path = File.expand_path(dir_path + '/..')
-$:.unshift lib_path unless $:.include? lib_path
-$:.unshift bin_path unless $:.include? bin_path
-
 require 'pp'
 require 'mspec/helpers/io'
 require 'mspec/helpers/scratch'
@@ -29,6 +23,7 @@ class MOSConfig < Hash
     self[:command]   = nil
     self[:ltags]     = []
     self[:files]     = []
+    self[:launch]    = []
   end
 end
 
@@ -40,4 +35,3 @@ end
 # Just to have an exception name output not be "Exception"
 class MSpecExampleError < Exception
 end
-

data/spec/utils/name_map_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/utils/name_map'
 
 module NameMapSpecs
@@ -74,7 +74,6 @@ describe NameMap, "#class_or_module" do
       DTracer
       NameMap
       OptionParser
-      YAML
     ]
 
     excluded.each do |const|

data/spec/utils/options_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require 'spec_helper'
 require 'mspec/utils/options'
 require 'mspec/version'
 require 'mspec/guards/guard'
@@ -544,16 +544,20 @@ describe "The -t, --target TARGET option" do
     @options.targets
   end
 
-  it "sets the target to 'ruby' and flags to verbose with TARGET 'ruby'" do
+  it "sets the target to 'ruby' and flags to verbose with TARGET 'r' or 'ruby'" do
     ["-t", "--target"].each do |opt|
-      @options.parse [opt, "ruby"]
-      @config[:target].should == "ruby"
+      ["r", "ruby"].each do |t|
+        @config[:target] = nil
+        @options.parse [opt, t]
+        @config[:target].should == "ruby"
+      end
     end
   end
 
   it "sets the target to 'ruby1.9' with TARGET 'r19', 'ruby19' or 'ruby1.9'" do
     ["-t", "--target"].each do |opt|
-      ["r19", "ruby19", "ruby1.9"].each do |t|
+      ["r19", "ruby19"].each do |t|
+        @config[:target] = nil
         @options.parse [opt, t]
         @config[:target].should == "ruby1.9"
       end
@@ -563,6 +567,7 @@ describe "The -t, --target TARGET option" do
   it "sets the target to 'jruby' with TARGET 'j' or 'jruby'" do
     ["-t", "--target"].each do |opt|
       ["j", "jruby"].each do |t|
+        @config[:target] = nil
         @options.parse [opt, t]
         @config[:target].should == "jruby"
       end
@@ -572,6 +577,7 @@ describe "The -t, --target TARGET option" do
   it "sets the target to 'shotgun/rubinius' with TARGET 'x' or 'rubinius'" do
     ["-t", "--target"].each do |opt|
       ["x", "rubinius"].each do |t|
+        @config[:target] = nil
         @options.parse [opt, t]
         @config[:target].should == "./bin/rbx"
       end
@@ -581,6 +587,7 @@ describe "The -t, --target TARGET option" do
   it "set the target to 'rbx' with TARGET 'rbx'" do
     ["-t", "--target"].each do |opt|
       ["X", "rbx"].each do |t|
+        @config[:target] = nil
         @options.parse [opt, t]
         @config[:target].should == "rbx"
       end
@@ -590,14 +597,26 @@ describe "The -t, --target TARGET option" do
   it "sets the target to 'maglev' with TARGET 'm' or 'maglev'" do
     ["-t", "--target"].each do |opt|
       ["m", "maglev"].each do |t|
+        @config[:target] = nil
         @options.parse [opt, t]
         @config[:target].should == "maglev-ruby"
       end
     end
   end
 
+  it "sets the target to 'topaz' with TARGET 't' or 'topaz'" do
+    ["-t", "--target"].each do |opt|
+      ["t", "topaz"].each do |t|
+        @config[:target] = nil
+        @options.parse [opt, t]
+        @config[:target].should == "topaz"
+      end
+    end
+  end
+
   it "sets the target to TARGET" do
     ["-t", "--target"].each do |opt|
+      @config[:target] = nil
       @options.parse [opt, "whateva"]
       @config[:target].should == "whateva"
     end
@@ -782,6 +801,16 @@ describe "The -f, --format FORMAT option" do
       end
     end
   end
+
+  it "sets the JUnitFormatter with FORMAT 'j' or 'junit'" do
+    ["-f", "--format"].each do |opt|
+      ["j", "junit"].each do |f|
+        @config[:formatter] = nil
+        @options.parse [opt, f]
+        @config[:formatter].should == JUnitFormatter
+      end
+    end
+  end
 end
 
 describe "The -o, --output FILE option" do
@@ -1073,6 +1102,30 @@ describe "The -H, --random option" do
   end
 end
 
+describe "The -R, --repeat option" do
+  before :each do
+    @options, @config = new_option
+    @options.repeat
+  end
+
+  it "is enabled with #repeat" do
+    @options.should_receive(:on).with("-R", "--repeat", "NUMBER", an_instance_of(String))
+    @options.repeat
+  end
+
+  it "registers the MSpec repeat mode" do
+    ["-R", "--repeat"].each do |opt|
+      MSpec.repeat = 1
+      @options.parse [opt, "10"]
+      repeat_count = 0
+      MSpec.repeat do
+        repeat_count += 1
+      end
+      repeat_count.should == 10
+    end
+  end
+end
+
 describe "The -V, --verbose option" do
   before :each do
     @options, @config = new_option
@@ -1256,28 +1309,6 @@ describe "The -S, --action-string STR option" do
   end
 end
 
-describe "The --spec-debug option" do
-  before :each do
-    @options, @config = new_option
-    @options.actions
-  end
-
-  it "is enabled with #actions" do
-    @options.stub!(:on)
-    @options.should_receive(:on).with("--spec-debug", an_instance_of(String))
-    @options.actions
-  end
-
-  it "enables the triggering the ruby debugger" do
-    @options.action_filters
-    @options.parse ["-S", "some spec"]
-
-    @config[:debugger] = nil
-    @options.parse "--spec-debug"
-    @config[:debugger].should == true
-  end
-end
-
 describe "The --spec-gdb option" do
   before :each do
     @options, @config = new_option