typo 5.0.2 → 5.0.3.98

data/vendor/plugins/rspec/spec/spec/runner/formatter/story/html_formatter_spec.rb

@@ -40,6 +40,11 @@ module Spec
             @out.string.should == "                <li class=\"passed\">Given a <span class=\"param\">brown</span> <span class=\"param\">dog</span></li>\n"
           end
           
+          it 'should create spanes for params in regexp steps' do
+            @reporter.step_succeeded :given, /a (pink|blue) (.*)/, 'brown', 'dog'
+            @out.string.should == "                <li class=\"passed\">Given a <span class=\"param\">brown</span> <span class=\"param\">dog</span></li>\n"
+          end
+
           it "should create a ul for collected_steps" do
             @reporter.collected_steps(['Given a $coloured $animal', 'Given a $n legged eel'])
             @out.string.should == (<<-EOF)

data/vendor/plugins/rspec/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb

@@ -9,11 +9,14 @@ module Spec
           before :each do
             # given
             @out = StringIO.new
+            @tweaker = mock('tweaker')
+            @tweaker.stub!(:tweak_backtrace)
             @options = mock('options')
             @options.stub!(:colour).and_return(false)
+            @options.stub!(:backtrace_tweaker).and_return(@tweaker)
             @formatter = PlainTextFormatter.new(@options, @out)
           end
-        
+
           it 'should summarize the number of scenarios when the run ends' do
             # when
             @formatter.run_started(3)
@@ -24,11 +27,11 @@ module Spec
             @formatter.scenario_started(nil, nil)
             @formatter.scenario_succeeded('story', 'scenario3')
             @formatter.run_ended
-          
+
             # then
             @out.string.should include('3 scenarios')
           end
-        
+
           it 'should summarize the number of successful scenarios when the run ends' do
             # when
             @formatter.run_started(3)
@@ -39,11 +42,11 @@ module Spec
             @formatter.scenario_started(nil, nil)
             @formatter.scenario_succeeded('story', 'scenario3')
             @formatter.run_ended
-          
+
             # then
             @out.string.should include('3 scenarios: 3 succeeded')
           end
-        
+
           it 'should summarize the number of failed scenarios when the run ends' do
             # when
             @formatter.run_started(3)
@@ -54,11 +57,45 @@ module Spec
             @formatter.scenario_started(nil, nil)
             @formatter.scenario_failed('story', 'scenario3', exception_from { raise RuntimeError, 'oops' })
             @formatter.run_ended
-          
+
             # then
             @out.string.should include("3 scenarios: 1 succeeded, 2 failed")
           end
-        
+
+          it 'should end cleanly (no characters on the last line) with successes' do
+            # when
+            @formatter.run_started(1)
+            @formatter.scenario_started(nil, nil)
+            @formatter.scenario_succeeded('story', 'scenario')
+            @formatter.run_ended
+
+            # then
+            @out.string.should =~ /\n\z/
+          end
+
+          it 'should end cleanly (no characters on the last line) with failures' do
+            # when
+            @formatter.run_started(1)
+            @formatter.scenario_started(nil, nil)
+            @formatter.scenario_failed('story', 'scenario', exception_from { raise RuntimeError, 'oops' })
+            @formatter.run_ended
+
+            # then
+            @out.string.should =~ /\n\z/
+          end
+
+          it 'should end cleanly (no characters on the last line) with pending steps' do
+            # when
+            @formatter.run_started(1)
+            @formatter.scenario_started(nil, nil)
+            @formatter.step_pending(:then, 'do pend')
+            @formatter.scenario_pending('story', 'scenario', exception_from { raise RuntimeError, 'oops' })
+            @formatter.run_ended
+
+            # then
+            @out.string.should =~ /\n\z/
+          end
+
           it 'should summarize the number of pending scenarios when the run ends' do
             # when
             @formatter.run_started(3)
@@ -69,11 +106,11 @@ module Spec
             @formatter.scenario_started(nil, nil)
             @formatter.scenario_pending('story', 'scenario3', 'message')
             @formatter.run_ended
-          
+
             # then
             @out.string.should include("3 scenarios: 1 succeeded, 0 failed, 2 pending")
           end
-        
+
           it "should only count the first failure in one scenario" do
             # when
             @formatter.run_started(3)
@@ -85,11 +122,11 @@ module Spec
             @formatter.scenario_started(nil, nil)
             @formatter.scenario_failed('story', 'scenario3', exception_from { raise RuntimeError, 'oops' })
             @formatter.run_ended
-          
+
             # then
             @out.string.should include("3 scenarios: 1 succeeded, 2 failed")
           end
-        
+
           it "should only count the first pending in one scenario" do
             # when
             @formatter.run_started(3)
@@ -101,11 +138,11 @@ module Spec
             @formatter.scenario_started(nil, nil)
             @formatter.scenario_pending('story', 'scenario3', 'because ...')
             @formatter.run_ended
-          
+
             # then
             @out.string.should include("3 scenarios: 1 succeeded, 0 failed, 2 pending")
           end
-        
+
           it "should only count a failure before the first pending in one scenario" do
             # when
             @formatter.run_started(3)
@@ -117,11 +154,11 @@ module Spec
             @formatter.scenario_started(nil, nil)
             @formatter.scenario_failed('story', 'scenario3', exception_from { raise RuntimeError, 'oops' })
             @formatter.run_ended
-          
+
             # then
             @out.string.should include("3 scenarios: 1 succeeded, 1 failed, 1 pending")
           end
-        
+
           it 'should produce details of the first failure each failed scenario when the run ends' do
             # when
             @formatter.run_started(3)
@@ -133,7 +170,7 @@ module Spec
             @formatter.scenario_started(nil, nil)
             @formatter.scenario_failed('story', 'scenario3', exception_from { raise RuntimeError, 'oops3' })
             @formatter.run_ended
-          
+
             # then
             @out.string.should include("FAILURES:\n")
             @out.string.should include("1) story (scenario2) FAILED")
@@ -142,141 +179,150 @@ module Spec
             @out.string.should include("2) story (scenario3) FAILED")
             @out.string.should include("RuntimeError: oops3")
           end
-        
+
           it 'should produce details of each pending step when the run ends' do
             # when
             @formatter.run_started(2)
-            @formatter.scenario_pending('story', 'scenario2', 'todo2')
-            @formatter.scenario_pending('story', 'scenario3', 'todo3')
+            @formatter.story_started('story 1', 'narrative')
+            @formatter.scenario_started('story 1', 'scenario 1')
+            @formatter.step_pending(:given, 'todo 1', [])
+            @formatter.story_started('story 2', 'narrative')
+            @formatter.scenario_started('story 2', 'scenario 2')
+            @formatter.step_pending(:given, 'todo 2', [])
             @formatter.run_ended
-          
+
             # then
             @out.string.should include("Pending Steps:\n")
-            @out.string.should include("1) story (scenario2): todo2")
-            @out.string.should include("2) story (scenario3): todo3")
+            @out.string.should include("1) story 1 (scenario 1): todo 1")
+            @out.string.should include("2) story 2 (scenario 2): todo 2")
           end
-        
+
           it 'should document a story title and narrative' do
             # when
             @formatter.story_started 'story', 'narrative'
-          
+
             # then
             @out.string.should include("Story: story\n\n  narrative")
           end
-        
+
           it 'should document a scenario name' do
             # when
             @formatter.scenario_started 'story', 'scenario'
-          
+
             # then
             @out.string.should include("\n\n  Scenario: scenario")
           end
-        
+
           it 'should document a step by sentence-casing its name' do
             # when
             @formatter.step_succeeded :given, 'a context'
             @formatter.step_succeeded :when, 'an event'
             @formatter.step_succeeded :then, 'an outcome'
-          
+
             # then
             @out.string.should include("\n\n    Given a context\n\n    When an event\n\n    Then an outcome")
           end
-        
+
           it 'should document additional givens using And' do
             # when
             @formatter.step_succeeded :given, 'step 1'
             @formatter.step_succeeded :given, 'step 2'
             @formatter.step_succeeded :given, 'step 3'
-          
+
             # then
             @out.string.should include("    Given step 1\n    And step 2\n    And step 3")
           end
-        
+
           it 'should document additional events using And' do
             # when
             @formatter.step_succeeded :when, 'step 1'
             @formatter.step_succeeded :when, 'step 2'
             @formatter.step_succeeded :when, 'step 3'
-          
+
             # then
             @out.string.should include("    When step 1\n    And step 2\n    And step 3")
           end
-        
+
           it 'should document additional outcomes using And' do
             # when
             @formatter.step_succeeded :then, 'step 1'
             @formatter.step_succeeded :then, 'step 2'
             @formatter.step_succeeded :then, 'step 3'
-          
+
             # then
             @out.string.should include("    Then step 1\n    And step 2\n    And step 3")
           end
-        
+
           it 'should document a GivenScenario followed by a Given using And' do
             # when
             @formatter.step_succeeded :'given scenario', 'a scenario'
             @formatter.step_succeeded :given, 'a context'
-          
+
             # then
             @out.string.should include("    Given scenario a scenario\n    And a context")
           end
-        
+
           it 'should document steps with replaced params' do
             @formatter.step_succeeded :given, 'a $coloured dog with $n legs', 'pink', 21
             @out.string.should include("  Given a pink dog with 21 legs")
           end
-        
+
+          it 'should document regexp steps with replaced params' do
+            @formatter.step_succeeded :given, /a (pink|blue) dog with (.*) legs/, 'pink', 21
+            @out.string.should include("  Given a pink dog with 21 legs")
+          end
+
           it "should append PENDING for the first pending step" do
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
-          
+
             @out.string.should include('Given a context (PENDING)')
           end
-        
+
           it "should append PENDING for pending after already pending" do
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
             @formatter.step_pending(:when, 'I say hey')
-          
+
             @out.string.should include('When I say hey (PENDING)')
           end
-        
+
           it "should append FAILED for the first failiure" do
             @formatter.scenario_started('','')
             @formatter.step_failed(:given, 'a context')
-          
+
             @out.string.should include('Given a context (FAILED)')
           end
-        
+
           it "should append SKIPPED for the second failiure" do
             @formatter.scenario_started('','')
             @formatter.step_failed(:given, 'a context')
             @formatter.step_failed(:when, 'I say hey')
-          
+
             @out.string.should include('When I say hey (SKIPPED)')
           end
-        
+
           it "should append SKIPPED for the a failiure after PENDING" do
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
             @formatter.step_failed(:when, 'I say hey')
-          
+
             @out.string.should include('When I say hey (SKIPPED)')
           end
-        
+
           it 'should print some white space after each story' do
             # when
             @formatter.story_ended 'title', 'narrative'
-          
+
             # then
             @out.string.should include("\n\n")
           end
-          
+
           it "should print nothing for collected_steps" do
             @formatter.collected_steps(['Given a $coloured $animal', 'Given a $n legged eel'])
             @out.string.should == ("")
           end
-          
+
           it "should ignore messages it doesn't care about" do
             lambda {
               @formatter.this_method_does_not_exist

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

@@ -12,6 +12,11 @@ describe "OptionParser" do
     @parser.parse(args)
     @parser.options
   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"])
@@ -214,62 +219,58 @@ describe "OptionParser" do
     @err.string.should match(/Couldn't find differ class Custom::MissingFormatter/n)
   end
 
-  it "should support --line to identify spec" do
-    spec_parser = mock("spec_parser")
-    @parser.instance_variable_set('@spec_parser', spec_parser)
-
-    file_factory = mock("File")
-    file_factory.should_receive(:file?).and_return(true)
-    file_factory.should_receive(:open).and_return("fake_io")
-    @parser.instance_variable_set('@file_factory', file_factory)
-
-    spec_parser.should_receive(:spec_name_for).with("fake_io", 169).and_return("some spec")
-
-    options = parse(["some file", "--line", "169"])
-    options.examples.should eql(["some spec"])
-    File.rspec_verify
-  end
-
-  it "should fail with error message if file is dir along with --line" do
-    spec_parser = mock("spec_parser")
-    @parser.instance_variable_set('@spec_parser', spec_parser)
-
-    file_factory = mock("File")
-    file_factory.should_receive(:file?).and_return(false)
-    file_factory.should_receive(:directory?).and_return(true)
-    @parser.instance_variable_set('@file_factory', file_factory)
-
-    options = parse(["some file", "--line", "169"])
-    @err.string.should match(/You must specify one file, not a directory when using the --line option/n)
-  end
+  describe "when attempting a focussed spec" do
+    attr_reader :file, :dir
+    before do
+      @original_rspec_options = $rspec_options
+      @file = "#{File.dirname(__FILE__)}/spec_parser/spec_parser_fixture.rb"
+      @dir = File.dirname(file)
+    end
 
-  it "should fail with error message if file does not exist along with --line" do
-    spec_parser = mock("spec_parser")
-    @parser.instance_variable_set('@spec_parser', spec_parser)
+    after do
+      $rspec_options = @original_rspec_options
+    end
 
-    file_factory = mock("File")
-    file_factory.should_receive(:file?).and_return(false)
-    file_factory.should_receive(:directory?).and_return(false)
-    @parser.instance_variable_set('@file_factory', file_factory)
+    def parse(args)
+      options = super
+      $rspec_options = options
+      options.filename_pattern = "*_fixture.rb"
+      options
+    end
 
-    options = parse(["some file", "--line", "169"])
-    @err.string.should match(/some file does not exist/n)
-  end
+    it "should support --line to identify spec" do
+      options = parse([file, "--line", "13"])
+      options.line_number.should == 13
+      options.examples.should be_empty
+      options.run_examples
+      options.examples.should eql(["d"])
+    end
 
-  it "should fail with error message if more than one files are specified along with --line" do
-    spec_parser = mock("spec_parser")
-    @parser.instance_variable_set('@spec_parser', spec_parser)
+    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
 
-    options = parse(["some file", "some other file", "--line", "169"])
-    @err.string.should match(/Only one file can be specified 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 --example and --line are used simultaneously" do
-    spec_parser = mock("spec_parser")
-    @parser.instance_variable_set('@spec_parser', spec_parser)
+    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
 
-    options = parse(["some file", "--example", "some example", "--line", "169"])
-    @err.string.should match(/You cannot use both --line and --example/n)
+    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}