rspec 1.1.4 → 1.1.5

data/spec/spec/runner/formatter/html_formatter_spec.rb

@@ -6,6 +6,7 @@ module Spec
   module Runner
     module Formatter
       describe HtmlFormatter do
+        include SandboxedOptions
         ['--diff', '--dry-run'].each do |opt|
           def jruby?
             PLATFORM == 'java'
@@ -22,7 +23,7 @@ module Spec
               args = ['failing_examples/mocking_example.rb', 'failing_examples/diffing_spec.rb', 'examples/pure/stubbing_example.rb',  'examples/pure/pending_example.rb', '--format', 'html', opt]
               err = StringIO.new
               out = StringIO.new
-              CommandLine.run(
+              run_with(
                 OptionParser.parse(args, err, out)
               )
 

data/spec/spec/runner/formatter/nested_text_formatter_spec.rb

@@ -5,7 +5,7 @@ module Spec
   module Runner
     module Formatter
       describe NestedTextFormatter do
-        it_should_behave_like "sandboxed rspec_options"
+        include SandboxedOptions
         attr_reader :io, :options, :formatter, :example_group
         before(:each) do
           @io = StringIO.new
@@ -304,7 +304,7 @@ module Spec
 
           describe "#example_pending" do
             it "should push pending example name and message" do
-              formatter.example_pending(example_group.examples.first, 'reason')
+              formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
               expected_output = <<-OUT
               ExampleGroup
                 example (PENDING: reason)
@@ -313,7 +313,7 @@ module Spec
             end
 
             it "should dump pending" do
-              formatter.example_pending(example_group.examples.first, 'reason')
+              formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
               io.rewind
               formatter.dump_pending
               io.string.should =~ /Pending\:\nExampleGroup example \(reason\)\n/

data/spec/spec/runner/formatter/progress_bar_formatter_spec.rb

@@ -29,7 +29,7 @@ module Spec
             end
           end
           example = example_group.examples.first
-          @formatter.example_pending(example, "message")
+          @formatter.example_pending(example, "message", "#{__FILE__}:#{__LINE__}")
           @io.rewind
           @formatter.dump_summary(3, 2, 1, 1)
           @io.string.should eql(%Q|
@@ -94,10 +94,28 @@ EOE
             end
           end
           example = example_group.examples.first
-          @formatter.example_pending(example, "message")
+          @formatter.example_pending(example, "message", "#{__FILE__}:#{__LINE__}")
           @formatter.dump_pending
           @io.string.should =~ /Pending\:\nexample_group example \(message\)\n/
         end
+        
+        it "should dump pending with file and line number" do
+          example_group = ExampleGroup.describe("example_group") do
+            specify "example" do
+            end
+          end
+          example = example_group.examples.first
+          file = __FILE__
+          line = __LINE__ + 1
+          @formatter.example_pending(example, "message", "#{__FILE__}:#{__LINE__}")
+          @formatter.dump_pending
+          @io.string.should ==(<<-HERE)
+*
+Pending:
+example_group example (message)
+  Called from #{file}:#{line}
+HERE
+        end
       end
       
       describe "ProgressBarFormatter outputting to custom out" do

data/spec/spec/runner/formatter/spec_mate_formatter_spec.rb

@@ -6,6 +6,7 @@ module Spec
   module Runner
     module Formatter
       describe TextMateFormatter do
+        include SandboxedOptions
         attr_reader :root, :suffix, :expected_file
         before do
           @root = File.expand_path(File.dirname(__FILE__) + '/../../../..')
@@ -33,7 +34,7 @@ module Spec
             err = StringIO.new
             out = StringIO.new
             options = ::Spec::Runner::OptionParser.parse(args, err, out)
-            Spec::Runner::CommandLine.run(options)
+            run_with(options)
 
             yield(out.string)
           end          

data/spec/spec/runner/formatter/specdoc_formatter_spec.rb

@@ -5,7 +5,7 @@ module Spec
   module Runner
     module Formatter
       describe SpecdocFormatter do
-        it_should_behave_like "sandboxed rspec_options"
+        include SandboxedOptions
         attr_reader :io, :options, :formatter, :example_group
         before(:each) do
           @io = StringIO.new
@@ -133,12 +133,12 @@ module Spec
 
           describe "#example_pending" do
             it "should push pending example name and message" do
-              formatter.example_pending(example_group.examples.first, 'reason')
+              formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
               io.string.should have_example_group_output("- example (PENDING: reason)\n")
             end
 
             it "should dump pending" do
-              formatter.example_pending(example_group.examples.first, 'reason')
+              formatter.example_pending(example_group.examples.first, 'reason', "#{__FILE__}:#{__LINE__}")
               io.rewind
               formatter.dump_pending
               io.string.should =~ /Pending\:\nExampleGroup example \(reason\)\n/

data/spec/spec/runner/formatter/story/html_formatter_spec.rb

@@ -37,12 +37,18 @@ module Spec
           
           it "should create spans for params" do
             @reporter.step_succeeded('given', 'a $coloured $animal', 'brown', 'dog')
-            @out.string.should == "                <li class=\"passed\">Given a <span class=\"param\">brown</span> <span class=\"param\">dog</span></li>\n"
+            @reporter.scenario_ended
+            @reporter.story_ended('story_title', 'narrative')
+
+            @out.string.should include("                <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"
+            @reporter.scenario_ended
+            @reporter.story_ended('story_title', 'narrative')
+            
+            @out.string.should include("                <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
@@ -54,6 +60,74 @@ module Spec
       </ul>
 EOF
           end
+          
+          it 'should document additional givens using And' do
+            # when
+            @reporter.step_succeeded :given, 'step 1'
+            @reporter.step_succeeded :given, 'step 2'
+            @reporter.scenario_ended
+            @reporter.story_ended '', ''
+
+            # then
+            @out.string.should include("Given step 1")
+            @out.string.should include("And step 2")
+          end
+
+          it 'should document additional events using And' do
+            # when
+            @reporter.step_succeeded :when, 'step 1'
+            @reporter.step_succeeded :when, 'step 2'
+            @reporter.scenario_ended
+            @reporter.story_ended '', ''
+
+            # then
+            @out.string.should include("When step 1")
+            @out.string.should include("And step 2")
+          end
+
+          it 'should document additional outcomes using And' do
+            # when
+            @reporter.step_succeeded :then, 'step 1'
+            @reporter.step_succeeded :then, 'step 2'
+            @reporter.scenario_ended
+            @reporter.story_ended '', ''
+
+            # then
+            @out.string.should include("Then step 1")
+            @out.string.should include("And step 2")
+          end
+
+          it 'should document a GivenScenario followed by a Given using And' do
+            # when
+            @reporter.step_succeeded :'given scenario', 'a scenario'
+            @reporter.step_succeeded :given, 'a context'
+            @reporter.scenario_ended
+            @reporter.story_ended '', ''
+
+            # then
+            @out.string.should include("Given scenario a scenario")
+            @out.string.should include("And a context")
+          end
+          
+          it "should create a failed story if one of its scenarios fails" do
+              @reporter.story_started('story_title', 'narrative')
+              @reporter.scenario_started('story_title', 'succeeded_scenario_name')
+              @reporter.step_failed('then', 'failed_step', 'en', 'to')
+              @reporter.scenario_failed('story_title', 'failed_scenario_name', NameError.new('sup'))
+              @reporter.story_ended('story_title', 'narrative')
+            
+              @out.string.should include("      <dl class=\"story failed\">\n        <dt>Story: story_title</dt>\n")
+          end
+          
+          it "should create a failed scenario if one of its steps fails" do
+            @reporter.scenario_started('story_title', 'failed_scenario_name')
+            @reporter.step_failed('then', 'failed_step', 'en', 'to')
+            @reporter.scenario_failed('story_title', 'failed_scenario_name', NameError.new('sup'))
+            @reporter.story_ended('story_title', 'narrative')
+          
+            @out.string.should include("<dl class=\"failed\">\n              <dt>Scenario: failed_scenario_name</dt>\n")
+          end
+          
         end
       end
     end

data/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb

@@ -159,6 +159,45 @@ module Spec
             @out.string.should include("3 scenarios: 1 succeeded, 1 failed, 1 pending")
           end
 
+          it 'should show test summary in red if there were failed scenarios' do
+            # when
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started(nil, nil)
+            @formatter.scenario_failed('story', 'scenario', exception_from { raise RuntimeError, 'oops' })
+            @formatter.run_ended
+
+            # then
+            @out.string.should include("\e[31m scenarios: 0 succeeded, 1 failed, 0 pending\e[0m")
+          end
+
+          it 'should show test summary in yellow if there are pending scenarios' do
+            # when
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started(nil, nil)
+            @formatter.scenario_pending('story', 'scenario', '')
+            @formatter.run_ended
+
+            # then
+            @out.string.should include("\e[32m scenarios: 0 succeeded, 0 failed, 1 pending\e[0m")
+          end
+
+          it 'should show test summary in green if all scenarios pass' do
+            # when
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started(nil, nil)
+            @formatter.scenario_succeeded('story', 'scenario')
+            @formatter.run_ended
+
+            # then
+            @out.string.should include("\e[32m scenarios: 1 succeeded, 0 failed, 0 pending\e[0m")
+          end
+        
           it 'should produce details of the first failure each failed scenario when the run ends' do
             # when
             @formatter.run_started(3)
@@ -180,6 +219,19 @@ module Spec
             @out.string.should include("RuntimeError: oops3")
           end
 
+          it 'should produce details of the failures in red when the run ends' do
+            # when
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+            @formatter.scenario_started(nil, nil)
+            @formatter.scenario_failed('story', 'scenario1', exception_from { raise RuntimeError, 'oops1' })
+            @formatter.run_ended
+
+            # then
+            @out.string.should =~ /\e\[31m[\n\s]*story \(scenario1\) FAILED\e\[0m/m
+            @out.string.should =~ /\e\[31m[\n\s]*RuntimeError: oops1\e\[0m/m
+          end
+
           it 'should produce details of each pending step when the run ends' do
             # when
             @formatter.run_started(2)
@@ -200,6 +252,7 @@ module Spec
           it 'should document a story title and narrative' do
             # when
             @formatter.story_started 'story', 'narrative'
+            @formatter.story_ended 'story', 'narrative'
 
             # then
             @out.string.should include("Story: story\n\n  narrative")
@@ -208,6 +261,8 @@ module Spec
           it 'should document a scenario name' do
             # when
             @formatter.scenario_started 'story', 'scenario'
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             # then
             @out.string.should include("\n\n  Scenario: scenario")
@@ -218,6 +273,8 @@ module Spec
             @formatter.step_succeeded :given, 'a context'
             @formatter.step_succeeded :when, 'an event'
             @formatter.step_succeeded :then, 'an outcome'
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             # then
             @out.string.should include("\n\n    Given a context\n\n    When an event\n\n    Then an outcome")
@@ -228,6 +285,8 @@ module Spec
             @formatter.step_succeeded :given, 'step 1'
             @formatter.step_succeeded :given, 'step 2'
             @formatter.step_succeeded :given, 'step 3'
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             # then
             @out.string.should include("    Given step 1\n    And step 2\n    And step 3")
@@ -238,6 +297,8 @@ module Spec
             @formatter.step_succeeded :when, 'step 1'
             @formatter.step_succeeded :when, 'step 2'
             @formatter.step_succeeded :when, 'step 3'
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             # then
             @out.string.should include("    When step 1\n    And step 2\n    And step 3")
@@ -248,6 +309,8 @@ module Spec
             @formatter.step_succeeded :then, 'step 1'
             @formatter.step_succeeded :then, 'step 2'
             @formatter.step_succeeded :then, 'step 3'
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             # then
             @out.string.should include("    Then step 1\n    And step 2\n    And step 3")
@@ -257,6 +320,8 @@ module Spec
             # when
             @formatter.step_succeeded :'given scenario', 'a scenario'
             @formatter.step_succeeded :given, 'a context'
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             # then
             @out.string.should include("    Given scenario a scenario\n    And a context")
@@ -264,27 +329,39 @@ module Spec
 
           it 'should document steps with replaced params' do
             @formatter.step_succeeded :given, 'a $coloured dog with $n legs', 'pink', 21
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
             @out.string.should include("  Given a pink dog with 21 legs")
           end
 
           it 'should document steps that include dollar signs ($)' do
             @formatter.step_succeeded :given, 'kicks that cost $$amount', 50
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
             @out.string.should include("Given kicks that cost $50")
           end
 
           it 'should document regexp steps with replaced params' do
             @formatter.step_succeeded :given, /a (pink|blue) dog with (.*) legs/, 'pink', 21
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
             @out.string.should include("  Given a pink dog with 21 legs")
           end
 
           it 'should document regex steps that include dollar signs ($)' do
             @formatter.step_succeeded :given, /kicks that cost \$(\d+)/, 50
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
             @out.string.should include("Given kicks that cost $50")
           end
 
           it "should append PENDING for the first pending step" do
             @formatter.scenario_started('','')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
             @formatter.step_pending(:given, 'a context')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should include('Given a context (PENDING)')
           end
@@ -293,6 +370,8 @@ module Spec
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
             @formatter.step_pending(:when, 'I say hey')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should include('When I say hey (PENDING)')
           end
@@ -300,6 +379,8 @@ module Spec
           it "should append FAILED for the first failiure" do
             @formatter.scenario_started('','')
             @formatter.step_failed(:given, 'a context')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should include('Given a context (FAILED)')
           end
@@ -308,6 +389,8 @@ module Spec
             @formatter.scenario_started('','')
             @formatter.step_failed(:given, 'a context')
             @formatter.step_failed(:when, 'I say hey')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should include('When I say hey (SKIPPED)')
           end
@@ -316,6 +399,8 @@ module Spec
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
             @formatter.step_failed(:when, 'I say hey')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should include('When I say hey (SKIPPED)')
           end
@@ -326,6 +411,8 @@ module Spec
 
             @formatter.scenario_started('','')
             @formatter.step_succeeded(:given, 'a context')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should =~ /\e\[32m[\n\s]+Given a context\e\[0m/m
           end
@@ -336,6 +423,8 @@ module Spec
 
             @formatter.scenario_started('','')
             @formatter.step_failed(:given, 'a context')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should =~ /\e\[31m[\n\s]+Given a context\e\[0m/m
           end
@@ -346,6 +435,8 @@ module Spec
 
             @formatter.scenario_started('','')
             @formatter.step_failed(:given, 'a context')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should =~ /\e\[31m \(FAILED\)\e\[0m/
           end
@@ -356,6 +447,8 @@ module Spec
 
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should =~ /\e\[33m[\n\s]+Given a context\e\[0m/m
           end
@@ -366,10 +459,70 @@ module Spec
 
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should =~ /\e\[33m \(PENDING\)\e\[0m/
           end
 
+          it "should print a scenario in red if any of its steps fail" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+
+            @formatter.scenario_started('title','narrative')
+            @formatter.step_failed(:given, 'a context')
+            @formatter.scenario_failed('story', 'scenario1', exception_from { raise RuntimeError, 'oops1' })
+            @formatter.story_ended('title','narrative')
+            @out.string.should include("\e[31m\n\n  Scenario: narrative\e[0m")
+          end
+          
+          it "should print a scenario in yellow if its steps are pending" do
+             @out.stub!(:tty?).and_return(true)
+             @options.stub!(:colour).and_return(true)
+
+             @formatter.scenario_started('title','narrative')
+             @formatter.step_pending(:given, 'a context')
+             @formatter.scenario_ended
+             @formatter.story_ended('','')
+             @out.string.should include("\e[33m\n\n  Scenario: narrative\e[0m")
+          end
+   
+          it "should print a story in red if any of its scenarios fail" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+            
+            @formatter.story_started('story', 'narrative')
+            @formatter.scenario_started('','')
+            @formatter.step_failed(:given, 'a context')
+            @formatter.scenario_failed('story', 'scenario1', exception_from { raise RuntimeError, 'oops1' })
+            @formatter.story_ended('story', 'narrative')
+            @out.string.should include("\e[31mStory: story\n\n  narrative\e[0m")
+          end
+
+          it "should print a story in green if all its scenarios succeed" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+            
+            @formatter.story_started('story', 'narrative')
+            @formatter.scenario_started('','')
+            @formatter.step_succeeded(:given, 'a context')
+            @formatter.scenario_succeeded('story', 'scenario1')
+            @formatter.story_ended('story', 'narrative')
+            @out.string.should include("\e[32mStory: story\n\n  narrative\e[0m")
+          end
+
+          it "should print a story in yellow if all its scenarios are pending" do
+            @out.stub!(:tty?).and_return(true)
+            @options.stub!(:colour).and_return(true)
+            
+            @formatter.story_started('story', 'narrative')
+            @formatter.scenario_started('','')
+            @formatter.step_pending(:given, 'a context')
+            @formatter.scenario_pending('story', 'scenario1','pending')
+            @formatter.story_ended('story', 'narrative')
+            @out.string.should include("\e[33mStory: story\n\n  narrative\e[0m")
+          end
+          
           it "should print skipped steps in yellow if the scenario is already pending" do
             @out.stub!(:tty?).and_return(true)
             @options.stub!(:colour).and_return(true)
@@ -377,6 +530,8 @@ module Spec
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
             @formatter.step_failed(:when, 'I say hey')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should =~ /\e\[33m[\n\s]+When I say hey\e\[0m/m
           end
@@ -388,6 +543,8 @@ module Spec
             @formatter.scenario_started('','')
             @formatter.step_pending(:given, 'a context')
             @formatter.step_failed(:when, 'I say hey')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should =~ /\e\[33m \(SKIPPED\)\e\[0m/
           end
@@ -399,6 +556,8 @@ module Spec
             @formatter.scenario_started('','')
             @formatter.step_failed(:given, 'a context')
             @formatter.step_failed(:when, 'I say hey')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
 
             @out.string.should =~ /\e\[31m[\n\s]+When I say hey\e\[0m/m
           end
@@ -410,6 +569,8 @@ module Spec
             @formatter.scenario_started('','')
             @formatter.step_failed(:given, 'a context')
             @formatter.step_failed(:when, 'I say hey')
+            @formatter.scenario_failed('story', 'scenario1', exception_from { raise RuntimeError, 'oops1' })         
+            @formatter.story_ended('','')
 
             @out.string.should =~ /\e\[31m \(SKIPPED\)\e\[0m/m
           end