typo 5.1.3 → 5.1.98

data/vendor/plugins/rspec/spec/spec/runner/option_parser_spec.rb

@@ -1,6 +1,21 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 require 'fileutils'
 
+module Custom
+  class ExampleGroupRunner
+    attr_reader :options, :arg
+    def initialize(options, arg)
+      @options, @arg = options, arg
+    end
+
+    def load_files(files)
+    end
+
+    def run
+    end
+  end  
+end
+
 describe "OptionParser" do
   before(:each) do
     @out = StringIO.new
@@ -13,16 +28,22 @@ describe "OptionParser" do
     @parser.options
   end
   
+  it "should leave the submitted argv alone" do
+    args = ["--pattern", "foo"]
+    @parser.order!(args)
+    args.should == ["--pattern", "foo"]
+  end
+  
   it "should accept files to include" do
     options = parse(["--pattern", "foo"])
     options.filename_pattern.should == "foo"
   end
-
+  
   it "should accept dry run option" do
     options = parse(["--dry-run"])
     options.dry_run.should be_true
   end
-
+  
   it "should eval and use custom formatter when none of the builtins" do
     options = parse(["--format", "Custom::Formatter"])
     options.formatters[0].class.should be(Custom::Formatter)
@@ -40,31 +61,37 @@ describe "OptionParser" do
     options.formatters[2].where.should eql("foo\\bar")
     options.formatters[3].where.should eql("/foo/bar")
   end
-
+  
   it "should not be verbose by default" do
     options = parse([])
     options.verbose.should be_nil
   end
-
+  
   it "should not use colour by default" do
     options = parse([])
     options.colour.should == false
   end
-
-  it "should print help to stdout if no args" do
-    pending 'A regression since 1.0.8' do
-      options = parse([])
-      @out.rewind
-      @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
-    end
+  
+  it "should print help to stdout if no args and spec_comand?" do
+    Spec.stub!(:spec_command?).and_return(true)
+    options = parse([])
+    @out.rewind
+    @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
   end
-
+    
+  it "should not print help to stdout if no args and NOT spec_command?" do
+    Spec.stub!(:spec_command?).and_return(false)
+    options = parse([])
+    @out.rewind
+    @out.read.should == ""
+  end
+  
   it "should print help to stdout" do
     options = parse(["--help"])
     @out.rewind
     @out.read.should match(/Usage: spec \(FILE\|DIRECTORY\|GLOB\)\+ \[options\]/m)
   end
-
+  
   it "should print instructions about how to require missing formatter" do
     lambda do 
       options = parse(["--format", "Custom::MissingFormatter"]) 
@@ -72,11 +99,11 @@ describe "OptionParser" do
     end.should raise_error(NameError)
     @err.string.should match(/Couldn't find formatter class Custom::MissingFormatter/n)
   end
-
+  
   it "should print version to stdout" do
     options = parse(["--version"])
     @out.rewind
-    @out.read.should match(/RSpec-\d+\.\d+\.\d+.*\(build \d+\) - BDD for Ruby\nhttp:\/\/rspec.rubyforge.org\/\n/n)
+    @out.read.should match(/rspec \d+\.\d+\.\d+/n)
   end
   
   it "should require file when require specified" do
@@ -84,37 +111,37 @@ describe "OptionParser" do
       parse(["--require", "whatever"])
     end.should raise_error(LoadError)
   end
-
+  
   it "should support c option" do
     options = parse(["-c"])
     options.colour.should be_true
   end
-
+  
   it "should support queens colour option" do
     options = parse(["--colour"])
     options.colour.should be_true
   end
-
+  
   it "should support us color option" do
     options = parse(["--color"])
     options.colour.should be_true
   end
-
+  
   it "should support single example with -e option" do
     options = parse(["-e", "something or other"])
     options.examples.should eql(["something or other"])
   end
-
+  
   it "should support single example with -s option (will be removed when autotest supports -e)" do
     options = parse(["-s", "something or other"])
     options.examples.should eql(["something or other"])
   end
-
+  
   it "should support single example with --example option" do
     options = parse(["--example", "something or other"])
     options.examples.should eql(["something or other"])
   end
-
+  
   it "should read several example names from file if --example is given an existing file name" do
     options = parse(["--example", File.dirname(__FILE__) + '/examples.txt'])
     options.examples.should eql([
@@ -126,27 +153,27 @@ describe "OptionParser" do
     options = parse(["--example", File.dirname(__FILE__) + '/empty_file.txt'])
     options.examples.should eql([])
   end
-
+  
   it "should use html formatter when format is h" do
     options = parse(["--format", "h"])
     options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
   end
-
+  
   it "should use html story formatter when format is h" do
     options = parse(["--format", "h"])
     options.story_formatters[0].class.should equal(Spec::Runner::Formatter::Story::HtmlFormatter)
   end
-
+  
   it "should use html formatter when format is html" do
     options = parse(["--format", "html"])
     options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
   end
-
+  
   it "should use html story formatter when format is html" do
     options = parse(["--format", "html"])
     options.story_formatters[0].class.should equal(Spec::Runner::Formatter::Story::HtmlFormatter)
   end
-
+  
   it "should use html formatter with explicit output when format is html:test.html" do
     FileUtils.rm 'test.html' if File.exist?('test.html')
     options = parse(["--format", "html:test.html"])
@@ -156,88 +183,98 @@ describe "OptionParser" do
     options.formatters[0].close
     FileUtils.rm 'test.html'
   end
-
+  
   it "should use noisy backtrace tweaker with b option" do
     options = parse(["-b"])
     options.backtrace_tweaker.should be_instance_of(Spec::Runner::NoisyBacktraceTweaker)
   end
-
+  
   it "should use noisy backtrace tweaker with backtrace option" do
     options = parse(["--backtrace"])
     options.backtrace_tweaker.should be_instance_of(Spec::Runner::NoisyBacktraceTweaker)
   end
-
+  
   it "should use quiet backtrace tweaker by default" do
     options = parse([])
     options.backtrace_tweaker.should be_instance_of(Spec::Runner::QuietBacktraceTweaker)
   end
-
+  
   it "should use progress bar formatter by default" do
     options = parse([])
     options.formatters[0].class.should equal(Spec::Runner::Formatter::ProgressBarFormatter)
   end
-
+  
   it "should use specdoc formatter when format is s" do
     options = parse(["--format", "s"])
     options.formatters[0].class.should equal(Spec::Runner::Formatter::SpecdocFormatter)
   end
-
+  
   it "should use specdoc formatter when format is specdoc" do
     options = parse(["--format", "specdoc"])
     options.formatters[0].class.should equal(Spec::Runner::Formatter::SpecdocFormatter)
   end
 
+  it "should use nested text formatter when format is s" do
+    options = parse(["--format", "n"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::NestedTextFormatter)
+  end
+
+  it "should use nested text formatter when format is nested" do
+    options = parse(["--format", "nested"])
+    options.formatters[0].class.should equal(Spec::Runner::Formatter::NestedTextFormatter)
+  end
+  
   it "should support diff option when format is not specified" do
     options = parse(["--diff"])
     options.diff_format.should == :unified
   end
-
+  
   it "should use unified diff format option when format is unified" do
     options = parse(["--diff", "unified"])
     options.diff_format.should == :unified
     options.differ_class.should equal(Spec::Expectations::Differs::Default)
   end
-
+  
   it "should use context diff format option when format is context" do
     options = parse(["--diff", "context"])
     options.diff_format.should == :context
     options.differ_class.should == Spec::Expectations::Differs::Default
   end
-
+  
   it "should use custom diff format option when format is a custom format" do
     Spec::Expectations.differ.should_not be_instance_of(Custom::Differ)
-
+  
     options = parse(["--diff", "Custom::Differ"])
     options.parse_diff "Custom::Differ"
     options.diff_format.should == :custom
     options.differ_class.should == Custom::Differ
     Spec::Expectations.differ.should be_instance_of(Custom::Differ)
   end
-
+  
   it "should print instructions about how to fix missing differ" do
     lambda { parse(["--diff", "Custom::MissingFormatter"]) }.should raise_error(NameError)
     @err.string.should match(/Couldn't find differ class Custom::MissingFormatter/n)
   end
-
+  
   describe "when attempting a focussed spec" do
     attr_reader :file, :dir
-    before do
-      @original_rspec_options = $rspec_options
+    before(:each) do
+      @original_rspec_options = Spec::Runner.options
       @file = "#{File.dirname(__FILE__)}/spec_parser/spec_parser_fixture.rb"
       @dir = File.dirname(file)
     end
-
-    after do
-      $rspec_options = @original_rspec_options
+  
+    after(:each) do
+      Spec::Runner.use @original_rspec_options
     end
-
+  
     def parse(args)
       options = super
-      $rspec_options = options
+      Spec::Runner.use options
       options.filename_pattern = "*_fixture.rb"
       options
     end
-
+  
     it "should support --line to identify spec" do
       options = parse([file, "--line", "13"])
       options.line_number.should == 13
@@ -245,34 +282,34 @@ describe "OptionParser" do
       options.run_examples
       options.examples.should eql(["d"])
     end
-
+  
     it "should fail with error message if file is dir along with --line" do
       options = parse([dir, "--line", "169"])
       options.line_number.should == 169
       options.run_examples
       @err.string.should match(/You must specify one file, not a directory when using the --line option/n)
     end
-
+  
     it "should fail with error message if file does not exist along with --line" do
       options = parse(["some file", "--line", "169"])
       proc do
         options.run_examples
       end.should raise_error
     end
-
+  
     it "should fail with error message if more than one files are specified along with --line" do
       options = parse([file, file, "--line", "169"])
       options.run_examples
       @err.string.should match(/Only one file can be specified when using the --line option/n)
     end
-
+  
     it "should fail with error message if --example and --line are used simultaneously" do
       options = parse([file, "--example", "some example", "--line", "169"])
       options.run_examples
       @err.string.should match(/You cannot use both --line and --example/n)
     end
   end
-
+  
   if [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
     it "should barf when --heckle is specified (and platform is windows)" do
       lambda do
@@ -285,18 +322,24 @@ describe "OptionParser" do
       options.heckle_runner.should be_instance_of(Spec::Runner::HeckleRunner)
     end
   end
-
+  
   it "should read options from file when --options is specified" do
     options = parse(["--options", File.dirname(__FILE__) + "/spec.opts"])
     options.diff_format.should_not be_nil
     options.colour.should be_true
   end
-
+  
   it "should default the formatter to ProgressBarFormatter when using options file" do
     options = parse(["--options", File.dirname(__FILE__) + "/spec.opts"])
     options.formatters.first.should be_instance_of(::Spec::Runner::Formatter::ProgressBarFormatter)
   end
 
+  it "should run parse drb after parsing options" do
+    @parser.stub!(:parse_drb)
+    @parser.should_receive(:parse_drb).with(["--drb"]).and_return(true)
+    options = parse(["--options", File.dirname(__FILE__) + "/spec_drb.opts"])    
+  end
+
   it "should read spaced and multi-line options from file when --options is specified" do
     options = parse(["--options", File.dirname(__FILE__) + "/spec_spaced.opts"])
     options.diff_format.should_not be_nil
@@ -310,14 +353,14 @@ describe "OptionParser" do
     IO.read('test.spec.opts').should == "--colour\n--diff\n"
     FileUtils.rm 'test.spec.opts'
   end
-
+  
   it "should save config to file when -G is specified" do
     FileUtils.rm 'test.spec.opts' if File.exist?('test.spec.opts')
     options = parse(["--colour", "-G", "test.spec.opts", "--diff"])
     IO.read('test.spec.opts').should == "--colour\n--diff\n"
     FileUtils.rm 'test.spec.opts'
   end
-
+  
   it "when --drb is specified, calls DrbCommandLine all of the other ARGV arguments" do
     options = Spec::Runner::OptionParser.parse([
       "some/spec.rb", "--diff", "--colour"
@@ -331,7 +374,7 @@ describe "OptionParser" do
   it "should reverse spec order when --reverse is specified" do
     options = parse(["some/spec.rb", "--reverse"])
   end
-
+  
   it "should set an mtime comparator when --loadby mtime" do
     options = parse(["--loadby", 'mtime'])
     runner = Spec::Runner::ExampleGroupRunner.new(options)
@@ -339,7 +382,7 @@ describe "OptionParser" do
       with(options).
       and_return(runner)
     runner.should_receive(:load_files).with(["most_recent_spec.rb", "command_line_spec.rb"])
-
+  
     Dir.chdir(File.dirname(__FILE__)) do
       options.files << 'command_line_spec.rb'
       options.files << 'most_recent_spec.rb'
@@ -348,7 +391,7 @@ describe "OptionParser" do
       FileUtils.rm "most_recent_spec.rb"
     end
   end
-
+  
   it "should use the standard runner by default" do
     runner = ::Spec::Runner::ExampleGroupRunner.new(@parser.options)
     ::Spec::Runner::ExampleGroupRunner.should_receive(:new).
@@ -357,7 +400,7 @@ describe "OptionParser" do
     options = parse([])
     options.run_examples
   end
-
+  
   it "should use a custom runner when given" do
     runner = Custom::ExampleGroupRunner.new(@parser.options, nil)
     Custom::ExampleGroupRunner.should_receive(:new).
@@ -366,7 +409,7 @@ describe "OptionParser" do
     options = parse(["--runner", "Custom::ExampleGroupRunner"])
     options.run_examples
   end
-
+  
   it "should use a custom runner with extra options" do
     runner = Custom::ExampleGroupRunner.new(@parser.options, 'something')
     Custom::ExampleGroupRunner.should_receive(:new).

data/vendor/plugins/rspec/spec/spec/runner/options_spec.rb

@@ -293,39 +293,44 @@ module Spec
       end
 
       describe "#run_examples" do
-        it "should use the standard runner by default" do
-          runner = ::Spec::Runner::ExampleGroupRunner.new(@options)
-          ::Spec::Runner::ExampleGroupRunner.should_receive(:new).
+        describe "when not given a custom runner" do
+          it "should use the standard" do
+            runner = ::Spec::Runner::ExampleGroupRunner.new(@options)
+            ::Spec::Runner::ExampleGroupRunner.should_receive(:new).
             with(@options).
             and_return(runner)
-          @options.user_input_for_runner = nil
+            @options.user_input_for_runner = nil
 
-          @options.run_examples
+            @options.run_examples
+          end
         end
 
-        it "should use a custom runner when given" do
-          runner = Custom::ExampleGroupRunner.new(@options, nil)
-          Custom::ExampleGroupRunner.should_receive(:new).
+        describe "when given a custom runner" do
+          it "should use the custom runner" do
+            runner = Custom::ExampleGroupRunner.new(@options, nil)
+            Custom::ExampleGroupRunner.should_receive(:new).
             with(@options, nil).
             and_return(runner)
-          @options.user_input_for_runner = "Custom::ExampleGroupRunner"
+            @options.user_input_for_runner = "Custom::ExampleGroupRunner"
 
-          @options.run_examples
-        end
+            @options.run_examples
+          end
 
-        it "should use a custom runner with extra options" do
-          runner = Custom::ExampleGroupRunner.new(@options, 'something')
-          Custom::ExampleGroupRunner.should_receive(:new).
+          it "should use the custom runner with extra options" do
+            runner = Custom::ExampleGroupRunner.new(@options, 'something')
+            Custom::ExampleGroupRunner.should_receive(:new).
             with(@options, 'something').
             and_return(runner)
-          @options.user_input_for_runner = "Custom::ExampleGroupRunner:something"
+            @options.user_input_for_runner = "Custom::ExampleGroupRunner:something"
 
-          @options.run_examples
+            @options.run_examples
+          end
         end
 
         describe "when there are examples" do
           before(:each) do
-            @options.add_example_group Class.new(::Spec::Example::ExampleGroup)
+            @example_group = Class.new(::Spec::Example::ExampleGroup)
+            @options.add_example_group @example_group
             @options.formatters << Formatter::BaseTextFormatter.new(@options, @out)
           end
 
@@ -339,6 +344,77 @@ module Spec
             @options.run_examples
             @options.examples_run?.should be_true
           end
+
+          describe "and the suite passes" do
+            before do
+              @example_group.should_receive(:run).and_return(true)
+            end
+
+            it "invokes after_suite_parts with true" do
+              success_result = nil
+              @options.after_suite_parts << lambda do |success|
+                success_result = success
+              end
+              
+              @options.run_examples
+              success_result.should be_true
+            end
+          end
+
+          describe "and the suite fails" do
+            before do
+              @example_group.should_receive(:run).and_return(false)
+            end
+
+            it "invokes after_suite_parts with false" do
+              success_result = nil
+              @options.after_suite_parts << lambda do |success|
+                success_result = success
+              end
+
+              @options.run_examples
+              success_result.should be_false
+            end
+          end
+
+          describe "when using heckle runner" do
+            before(:each) do
+              @heckle_runner_mock = mock("HeckleRunner")
+              @options.heckle_runner = @heckle_runner_mock
+            end
+            
+            it "should heckle" do
+              @heckle_runner_mock.should_receive(:heckle_with)
+              @options.run_examples
+            end
+            
+            it "shouldn't heckle recursively" do
+              heckled = false
+              @heckle_runner_mock.should_receive(:heckle_with) {
+                heckled.should == false
+                heckled = true
+                @options.run_examples
+              }
+              @options.run_examples
+            end
+
+            it "shouldn't load spec files twice" do
+              example_runner = mock("ExampleGroupRunner")
+              example_runner_inside_heckle = mock("ExampleGroupRunner inside Heckle")
+
+              ExampleGroupRunner.should_receive(:new).twice.and_return(
+                example_runner, example_runner_inside_heckle
+              )
+
+              example_runner.stub!(:run)
+              example_runner.should_receive(:load_files)
+              @heckle_runner_mock.stub!(:heckle_with).and_return { @options.run_examples }
+              example_runner_inside_heckle.stub!(:run)
+              example_runner_inside_heckle.should_not_receive(:load_files)
+
+              @options.run_examples
+            end
+          end
         end
 
         describe "when there are no examples" do
@@ -357,6 +433,16 @@ module Spec
             @options.run_examples
             @options.examples_run?.should be_false
           end
+
+          it "invokes after_suite_parts with true" do
+            success_result = nil
+            @options.after_suite_parts << lambda do |success|
+              success_result = success
+            end
+
+            @options.run_examples
+            success_result.should be_true
+          end
         end
       end
     end

data/vendor/plugins/rspec/spec/spec/runner/output_one_time_fixture_runner.rb

@@ -1,7 +1,7 @@
 dir = File.dirname(__FILE__)
 require "#{dir}/../../spec_helper"
 
-triggering_double_output = rspec_options
+triggering_double_output = Spec::Runner.options
 options = Spec::Runner::OptionParser.parse(
   ["#{dir}/output_one_time_fixture.rb"], $stderr, $stdout
 )

data/vendor/plugins/rspec/spec/spec/runner/quiet_backtrace_tweaker_spec.rb

@@ -51,6 +51,12 @@ module Spec
         @tweaker.tweak_backtrace(@error)
         @error.backtrace.should include("/a/b/c/d.rb")
       end
+
+      it "should gracefully handle backtraces with newlines" do
+        @error.set_backtrace(["we like\nbin/spec:\nnewlines"])
+        @tweaker.tweak_backtrace(@error)
+        @error.backtrace.should include("we like\nnewlines")
+      end
     end
   end
 end