rspec 1.1.3 → 1.1.4

data/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/spec/spec/runner/reporter_spec.rb

@@ -21,8 +21,10 @@ module Spec
       end
 
       def create_example_group(description_text)
-        example_group = Class.new(Spec::Example::ExampleGroup)
-        example_group.describe description_text
+        example_group = Spec::Example::ExampleGroup.describe(description_text) do
+          it "should do something" do
+          end
+        end
         example_group
       end
 
@@ -127,8 +129,9 @@ module Spec
 
       describe Reporter, "reporting one failing example" do
         it "should tell formatter that example failed" do
+          example = example_group.it("should do something") {}
           formatter.should_receive(:example_failed)
-          reporter.example_finished(example_group, RuntimeError.new)
+          reporter.example_finished(example, RuntimeError.new)
         end
 
         it "should delegate to backtrace tweaker" do
@@ -154,7 +157,7 @@ module Spec
       describe Reporter, "reporting one pending example (ExamplePendingError)" do
         it "should tell formatter example is pending" do
           example = ExampleGroup.new("example")
-          formatter.should_receive(:example_pending).with(example_group.description, example, "reason")
+          formatter.should_receive(:example_pending).with(example, "reason")
           formatter.should_receive(:add_example_group).with(example_group)
           reporter.add_example_group(example_group)
           reporter.example_finished(example, Spec::Example::ExamplePendingError.new("reason"))
@@ -162,7 +165,7 @@ module Spec
 
         it "should account for pending example in stats" do
           example = ExampleGroup.new("example")
-          formatter.should_receive(:example_pending).with(example_group.description, example, "reason")
+          formatter.should_receive(:example_pending).with(example, "reason")
           formatter.should_receive(:start_dump)
           formatter.should_receive(:dump_pending)
           formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1)
@@ -177,11 +180,11 @@ module Spec
       describe Reporter, "reporting one pending example (PendingExampleFixedError)" do
         it "should tell formatter pending example is fixed" do
           formatter.should_receive(:example_failed) do |name, counter, failure|
-            failure.header.should == "'example_group example' FIXED"
+            failure.header.should == "'example_group should do something' FIXED"
           end
           formatter.should_receive(:add_example_group).with(example_group)
           reporter.add_example_group(example_group)
-          reporter.example_finished(ExampleGroup.new("example"), Spec::Example::PendingExampleFixedError.new("reason"))
+          reporter.example_finished(example_group.examples.first, Spec::Example::PendingExampleFixedError.new("reason"))
         end
       end
     end

data/spec/spec/runner/spec_drb.opts

@@ -0,0 +1 @@
+--drb

data/spec/spec/runner/spec_parser_spec.rb

@@ -3,9 +3,15 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 describe "SpecParser" do
   attr_reader :parser, :file
   before(:each) do
+    @original_rspec_options = $rspec_options
+    $rspec_options = ::Spec::Runner::Options.new(StringIO.new, StringIO.new)
     @parser = Spec::Runner::SpecParser.new
     @file = "#{File.dirname(__FILE__)}/spec_parser/spec_parser_fixture.rb"
-    require file
+    load file
+  end
+
+  after do
+    $rspec_options = @original_rspec_options
   end
 
   it "should find spec name for 'specify' at same line" do
@@ -32,9 +38,9 @@ describe "SpecParser" do
     parser.spec_name_for(file, 14).should == "d"
   end
 
- it "should find nearest example name between examples" do
-   parser.spec_name_for(file, 7).should == "c 1"
- end
+  it "should find nearest example name between examples" do
+    parser.spec_name_for(file, 7).should == "c 1"
+  end
 
   it "should find nothing outside a context" do
     parser.spec_name_for(file, 2).should be_nil

data/spec/spec/story/runner/plain_text_story_runner_spec.rb

@@ -22,28 +22,29 @@ module Spec
         
         it "should parse a story file" do
           runner = PlainTextStoryRunner.new("path")
-          
           during {
-            runner.run
+            runner.run(mock('runner'))
           }.expect {
             @parser.should_receive(:parse).with(["this", "and that"])
           }
         end
         
         it "should build up a mediator with its own steps and the singleton story_runner" do
+          @story_runner = mock('story runner', :null_object => true)
+
           runner = PlainTextStoryRunner.new("path")
-          Spec::Story::Runner.should_receive(:story_runner).and_return(story_runner = mock("story runner"))
-          Spec::Story::Runner::StoryMediator.should_receive(:new).with(runner.steps, story_runner, {}).
-            and_return(mediator = stub("mediator", :run_stories => nil))
-          runner.run
+          
+          Spec::Story::Runner::StoryMediator.should_receive(:new).with(
+            runner.steps, @story_runner, {}
+          ).and_return(mediator = stub("mediator", :run_stories => nil))
+          runner.run(@story_runner)
         end
         
         it "should build up a parser with the mediator" do
           runner = PlainTextStoryRunner.new("path")
-          Spec::Story::Runner.should_receive(:story_runner).and_return(story_runner = mock("story runner"))
           Spec::Story::Runner::StoryMediator.should_receive(:new).and_return(mediator = stub("mediator", :run_stories => nil))
           Spec::Story::Runner::StoryParser.should_receive(:new).with(mediator).and_return(@parser)
-          runner.run
+          runner.run(stub("story_runner"))
         end
         
         it "should tell the mediator to run the stories" do
@@ -51,7 +52,7 @@ module Spec
           mediator = mock("mediator")
           Spec::Story::Runner::StoryMediator.should_receive(:new).and_return(mediator)
           mediator.should_receive(:run_stories)
-          runner.run
+          runner.run(mock('runner'))
         end
         
         it "should accept a block instead of a path" do
@@ -59,13 +60,13 @@ module Spec
             runner.load("path/to/story")
           end
           File.should_receive(:read).with("path/to/story").and_return("this\nand that")
-          runner.run
+          runner.run(mock('runner'))
         end
         
         it "should tell you if you try to run with no path set" do
           runner = PlainTextStoryRunner.new
           lambda {
-            runner.run
+            runner.run(mock('runner'))
           }.should raise_error(RuntimeError, "You must set a path to the file with the story. See the RDoc.")
         end
         
@@ -74,7 +75,7 @@ module Spec
           Spec::Story::Runner::StoryMediator.should_receive(:new).
             with(anything, anything, :foo => :bar).
             and_return(mediator = stub("mediator", :run_stories => nil))
-          runner.run
+          runner.run(mock('runner'))
         end
         
         it "should provide access to its options" do
@@ -83,7 +84,7 @@ module Spec
           Spec::Story::Runner::StoryMediator.should_receive(:new).
             with(anything, anything, :foo => :bar).
             and_return(mediator = stub("mediator", :run_stories => nil))
-          runner.run
+          runner.run mock('runner')
         end
         
       end

data/spec/spec/story/runner/scenario_runner_spec.rb

@@ -70,71 +70,143 @@ module Spec
           
           # then
         end
-        
-        it 'should notify listeners when a scenario succeeds' do
-          # given
-          world = stub_everything('world')
-          story = Story.new 'story', 'narrative' do end
-          scenario = Scenario.new story, 'scenario1' do
-            # succeeds
+        describe "when a scenario succeeds" do
+          before(:each) do
+            # given
+            @world = stub_everything('world')
+            @story = Story.new 'story', 'narrative' do end
+            @scenario = Scenario.new @story, 'scenario1' do
+              # succeeds
+            end
+            @scenario_runner = ScenarioRunner.new            
           end
-          scenario_runner = ScenarioRunner.new
-          mock_listener1 = stub_everything('listener1')
-          mock_listener2 = stub_everything('listener2')
-          scenario_runner.add_listener(mock_listener1)
-          scenario_runner.add_listener(mock_listener2)
           
-          # expect
-          mock_listener1.should_receive(:scenario_succeeded).with('story', 'scenario1')
-          mock_listener2.should_receive(:scenario_succeeded).with('story', 'scenario1')
-          
-          # when
-          scenario_runner.run(scenario, world)
+          it 'should notify listeners' do
+            #given
+            mock_listener1 = stub_everything('listener1')
+            mock_listener2 = stub_everything('listener2')
+            @scenario_runner.add_listener(mock_listener1)
+            @scenario_runner.add_listener(mock_listener2)
+            
+            # expect
+            mock_listener1.should_receive(:scenario_succeeded).with('story', 'scenario1')
+            mock_listener2.should_receive(:scenario_succeeded).with('story', 'scenario1')
+            
+            # when
+            @scenario_runner.run(@scenario, @world)
+
+            # then
+          end
           
-          # then
+          it "should return true" do
+            #when
+            success = @scenario_runner.run(@scenario, @world)
+            
+            #then
+            success.should == true
+          end
         end
-        
-        it 'should notify listeners ONCE when a scenario raises an error' do
-          # given
-          error = RuntimeError.new('oops')
-          story = Story.new 'title', 'narrative' do end
-          scenario = Scenario.new story, 'scenario1' do
+
+        describe "when a scenario raises an error (other than a pending error)" do
+          before(:each) do
+            # given
+            @error = RuntimeError.new('oops')
+            @story = Story.new 'title', 'narrative' do end
+            @scenario = Scenario.new @story, 'scenario1' do
+            end
+            @scenario_runner = ScenarioRunner.new
+            @world = stub_everything
+
+            # expect
+            @world.should_receive(:errors).twice.and_return([@error, @error])
           end
-          scenario_runner = ScenarioRunner.new
-          mock_listener = stub_everything('listener')
-          scenario_runner.add_listener(mock_listener)
-          world = stub_everything
           
-          # expect
-          world.should_receive(:errors).twice.and_return([error, error])
-          mock_listener.should_receive(:scenario_failed).with('title', 'scenario1', error).once
+          it 'should notify listeners ONCE' do
+            #given
+            mock_listener = stub_everything('listener')
+            @scenario_runner.add_listener(mock_listener)
+            
+            #expect
+            mock_listener.should_receive(:scenario_failed).with('title', 'scenario1', @error).once
+
+            # when
+            @scenario_runner.run @scenario, @world
+
+            # then
+          end
+          
+          it "should return false" do
+            # when
+            success = @scenario_runner.run @scenario, @world
+
+            # then
+            success.should == false
+          end
           
-          # when
-          scenario_runner.run scenario, world
           
-          # then
         end
         
-        it 'should notify listeners when a scenario is pending' do
-          # given
-          pending_error = Spec::Example::ExamplePendingError.new('todo')
-          story = Story.new 'title', 'narrative' do end
-          scenario = Scenario.new story, 'scenario1' do
+        describe "when a scenario is pending" do
+          before(:each) do
+            # given
+            @pending_error = Spec::Example::ExamplePendingError.new('todo')
+            @story = Story.new 'title', 'narrative' do end
+            @scenario = Scenario.new @story, 'scenario1' do
+            end
+            @scenario_runner = ScenarioRunner.new
+            @world = stub_everything
+            
+            # expect
+            @world.should_receive(:errors).twice.and_return([@pending_error, @pending_error])
           end
-          scenario_runner = ScenarioRunner.new
-          mock_listener = mock('listener')
-          scenario_runner.add_listener(mock_listener)
-          world = stub_everything
           
-          # expect
-          world.should_receive(:errors).twice.and_return([pending_error, pending_error])
-          mock_listener.should_receive(:scenario_started).with('title', 'scenario1')
-          mock_listener.should_receive(:scenario_pending).with('title', 'scenario1', 'todo').once
-          
-          # when
-          scenario_runner.run scenario, world
+          it 'should notify listeners' do
+            #given 
+            mock_listener = mock('listener')
+            @scenario_runner.add_listener(mock_listener)
+            
+            # expect
+            mock_listener.should_receive(:scenario_started).with('title', 'scenario1')
+            mock_listener.should_receive(:scenario_pending).with('title', 'scenario1', 'todo').once
+
+            # when
+            @scenario_runner.run @scenario, @world
+
+            # then
+          end
           
-          # then
+          it "should return true" do
+            # when
+            success = @scenario_runner.run @scenario, @world
+
+            # then
+            success.should == true
+          end
+        end
+
+        describe "when a scenario has an empty body" do
+          before(:each) do
+            @story = Story.new 'title', 'narrative' do end
+            @scenario = Scenario.new @story, 'scenario'
+            @scenario_runner = ScenarioRunner.new
+            @world = stub_everything
+          end
+
+          it "should mark the scenario as pending" do
+            mock_listener = stub('listener', :scenario_started => true)
+            @scenario_runner.add_listener mock_listener
+
+            mock_listener.should_receive(:scenario_pending).with('title', 'scenario', '')
+            @scenario_runner.run @scenario, @world
+          end
+
+          it "should return true" do
+            # when
+            success = @scenario_runner.run @scenario, @world
+
+            # then
+            success.should == true
+          end
         end
       end
     end