typo 5.1.3 → 5.1.98

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

@@ -17,12 +17,14 @@ module Spec
       end
 
       def failure
-        Mocks::DuckTypeArgConstraint.new(:header, :exception)
+        Mocks::ArgumentConstraints::DuckTypeConstraint.new(:header, :exception)
       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
@@ -152,36 +155,82 @@ module Spec
       end
 
       describe Reporter, "reporting one pending example (ExamplePendingError)" do
+        before :each do
+          @pending_error = Spec::Example::ExamplePendingError.new("reason")
+          @pending_caller = @pending_error.pending_caller
+        end
+        
         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", @pending_caller)
           formatter.should_receive(:add_example_group).with(example_group)
           reporter.add_example_group(example_group)
-          reporter.example_finished(example, Spec::Example::ExamplePendingError.new("reason"))
+          reporter.example_finished(example, @pending_error)
         end
 
         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", @pending_caller)
           formatter.should_receive(:start_dump)
           formatter.should_receive(:dump_pending)
           formatter.should_receive(:dump_summary).with(anything(), 1, 0, 1)
           formatter.should_receive(:close).with(no_args)
           formatter.should_receive(:add_example_group).with(example_group)
           reporter.add_example_group(example_group)
-          reporter.example_finished(example, Spec::Example::ExamplePendingError.new("reason"))
+          reporter.example_finished(example, @pending_error)
           reporter.dump
         end
+        
+        describe "to formatters which have example_pending's arity of 2 (which is now deprecated)" do
+          before :each do
+            Kernel.stub!(:warn).with(Spec::Runner::Reporter::EXAMPLE_PENDING_DEPRECATION_WARNING)
+          
+            @deprecated_formatter = Class.new(@formatter.class) do
+              attr_reader :example_passed_to_method, :message_passed_to_method
+
+              def example_pending(example_passed_to_method, message_passed_to_method)
+                @example_passed_to_method = example_passed_to_method
+                @message_passed_to_method = message_passed_to_method
+              end
+            end.new(options, formatter_output)
+            
+            options.formatters << @deprecated_formatter
+          end
+          
+          it "should pass the correct example to the formatter" do
+            example = ExampleGroup.new("example")
+            reporter.add_example_group(example_group)
+            reporter.example_finished(example, @pending_error)
+            
+            @deprecated_formatter.example_passed_to_method.should == example
+          end
+          
+          it "should pass the correct pending error message to the formatter" do
+            example = ExampleGroup.new("example")
+            reporter.add_example_group(example_group)
+            reporter.example_finished(example, @pending_error)
+            
+            @deprecated_formatter.message_passed_to_method.should ==  @pending_error.message
+          end
+          
+          it "should raise a deprecation warning" do
+            Kernel.should_receive(:warn).with(Spec::Runner::Reporter::EXAMPLE_PENDING_DEPRECATION_WARNING)
+            
+            example = ExampleGroup.new("example")
+            reporter.add_example_group(example_group)
+            reporter.example_finished(example, @pending_error)
+          end
+        end
       end
 
       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/vendor/plugins/rspec/spec/spec/runner/spec_drb.opts

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

data/vendor/plugins/rspec/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 = Spec::Runner.options
+    Spec::Runner.use ::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(:each) do
+    Spec::Runner.use @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/vendor/plugins/rspec/spec/spec/story/runner/plain_text_story_runner_spec.rb

@@ -22,28 +22,26 @@ module Spec
         
         it "should parse a story file" do
           runner = PlainTextStoryRunner.new("path")
-          
-          during {
-            runner.run
-          }.expect {
-            @parser.should_receive(:parse).with(["this", "and that"])
-          }
+          @parser.should_receive(:parse).with(["this", "and that"])
+          runner.run(mock('runner'))
         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 +49,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 +57,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 +72,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 +81,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/vendor/plugins/rspec/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

data/vendor/plugins/rspec/spec/spec/story/runner/story_mediator_spec.rb

@@ -47,7 +47,7 @@ module Spec
           @runner.scenarios.first.name.should == "scenario name"
           @runner.scenarios.first.story.should == @runner.stories.first
         end
-
+        
         it "should create a given scenario step if one matches" do
           pending("need to untangle the dark mysteries of the story runner - something needs to get stubbed here") do
             story = @mediator.create_story "title", "narrative"
@@ -120,12 +120,22 @@ module Spec
         it "should pass options to the stories it creates" do
           @mediator = StoryMediator.new @step_group, @runner, :foo => :bar
           @mediator.create_story "story title", "story narrative"
-
+        
           run_stories
           
           @runner.stories.first[:foo].should == :bar
         end
         
+        it "should description" do
+          @mediator = StoryMediator.new @step_group, @runner, :foo => :bar
+          @mediator.create_story "title", "narrative"
+          @mediator.create_scenario "scenario"
+          @mediator.create_given "something"
+          given = @mediator.last_step
+          @mediator.add_to_last " else"
+          given.name.should == "something else"
+        end
+        
       end
       
     end

data/vendor/plugins/rspec/spec/spec/story/runner/story_parser_spec.rb

@@ -244,9 +244,15 @@ module Spec
 					@parser.parse(["Story: s", "Scenario: s", "Given first", "Then: and there"])
 			  end
 			  
-			  it "should ignore other" do
-					@parser.parse(["Story: s", "Scenario: s", "Given first", "this is ignored"])
+			  it "should ignore lines beginning with '#'" do
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "#this is ignored"])
+			  end
+
+			  it "should not ignore lines beginning with non-keywords" do
+          @story_mediator.should_receive(:add_to_last).with("\nthis is not ignored")
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "this is not ignored"])
 			  end
+			  
 			end
 
 			describe StoryParser, "in When state" do
@@ -309,8 +315,13 @@ module Spec
 					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: and there"])
 			  end
 			  
-			  it "should ignore other" do
-					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "this is ignored"])
+			  it "should ignore lines beginning with '#'" do
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "#this is ignored"])
+			  end
+
+			  it "should not ignore lines beginning with non-keywords" do
+          @story_mediator.should_receive(:add_to_last).with("\nthis is not ignored")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When else", "this is not ignored"])
 			  end
 			end
 
@@ -375,8 +386,14 @@ module Spec
 					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When: else", "Then: what", "And: ever"])
 			  end
 
-			  it "should ignore other" do
-					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "this is ignored"])
+			  
+			  it "should ignore lines beginning with '#'" do
+					@parser.parse(["Story: s", "Scenario: s", "Given first", "When else", "Then what", "#this is ignored"])
+			  end
+
+			  it "should not ignore lines beginning with non-keywords" do
+          @story_mediator.should_receive(:add_to_last).with("\nthis is not ignored")
+					@parser.parse(["Story: s", "Scenario: s", "Given: first", "When else", "Then what", "this is not ignored"])
 			  end
 			end
 		end

data/vendor/plugins/rspec/spec/spec/story/runner/story_runner_spec.rb

@@ -68,6 +68,44 @@ module Spec
           worlds[0].should_not == worlds[1]
         end
         
+        it "should return false if the scenario runner returns false ever" do
+          #given
+          stub_scenario_runner = stub_everything
+          story_runner = StoryRunner.new(stub_scenario_runner)
+          story_runner.Story 'story', 'narrative' do
+            Scenario 'scenario1' do end
+            Scenario 'scenario2' do end
+          end
+          
+          # expect
+          stub_scenario_runner.should_receive(:run).once.and_return(false,true)
+          
+          # when
+          success = story_runner.run_stories
+          
+          #then
+          success.should == false
+        end
+        
+        it "should return true if the scenario runner returns true for all scenarios" do
+          #given
+          stub_scenario_runner = stub_everything
+          story_runner = StoryRunner.new(stub_scenario_runner)
+          story_runner.Story 'story', 'narrative' do
+            Scenario 'scenario1' do end
+            Scenario 'scenario2' do end
+          end
+          
+          # expect
+          stub_scenario_runner.should_receive(:run).once.and_return(true,true)
+          
+          # when
+          success = story_runner.run_stories
+          
+          #then
+          success.should == true
+        end
+        
         it 'should use the provided world creator to create worlds' do
           # given
           stub_scenario_runner = stub_everything
@@ -197,13 +235,13 @@ module Spec
         it 'should find a scenario in the current story by name' do
           # given
           story_runner = StoryRunner.new(ScenarioRunner.new)
-          $scenario = nil
+          scenario = nil
           
           story_runner.Story 'title', 'narrative' do
             Scenario 'first scenario' do
             end
             Scenario 'second scenario' do
-              $scenario = StoryRunner.scenario_from_current_story 'first scenario'
+              scenario = StoryRunner.scenario_from_current_story 'first scenario'
             end
           end
           
@@ -211,7 +249,7 @@ module Spec
           story_runner.run_stories
           
           # then
-          $scenario.name.should == 'first scenario'
+          scenario.name.should == 'first scenario'
         end
         
         it "should clean the steps between stories" do
@@ -225,7 +263,7 @@ module Spec
           steps1 = StepGroup.new
           steps1.add :when, step1
           
-          story_runner.Story 'title', 'narrative', :steps => steps1 do
+          story_runner.Story 'title', 'narrative', :steps_for => steps1 do
             Scenario 'first scenario' do
               When 'step'
             end
@@ -237,7 +275,7 @@ module Spec
           steps2 = StepGroup.new
           steps2.add :when, step2
           
-          story_runner.Story 'title2', 'narrative', :steps => steps2 do
+          story_runner.Story 'title2', 'narrative', :steps_for => steps2 do
             Scenario 'second scenario' do
               When 'step'
             end