rspec 1.1.4 → 1.1.5

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

@@ -0,0 +1,82 @@
+require File.dirname(__FILE__) + '/../../../../spec_helper'
+require 'spec/runner/formatter/story/progress_bar_formatter'
+
+module Spec
+  module Runner
+    module Formatter
+      module Story
+        describe ProgressBarFormatter do
+          before :each do
+            # given
+            @out = StringIO.new
+            @out.stub!(:tty?).and_return(true)
+            @tweaker = mock('tweaker')
+            @tweaker.stub!(:tweak_backtrace)
+            @options = mock('options')
+            @options.stub!(:colour).and_return(true)
+            @options.stub!(:backtrace_tweaker).and_return(@tweaker)
+
+            @formatter = ProgressBarFormatter.new(@options, @out)
+          end
+
+          it 'should print some white space before test summary' do
+            #when
+            @formatter.run_started(1)
+            @formatter.run_ended
+
+            #then
+            @out.string.should =~ /^\n{2}/
+          end
+
+          it "should print how long tests took to complete" do
+            #when
+            now = Time.now
+            future = now+1
+            Time.stub!(:now).and_return(now)
+            @formatter.run_started(1)
+            Time.stub!(:now).and_return(future)
+            @formatter.run_ended
+
+            #then
+            @out.string.should include("Finished in %f seconds" % (future-now))
+          end
+
+
+          it "should push green dot for passing scenario" do
+            #when
+            @formatter.scenario_started('','')
+            @formatter.step_succeeded('', '')
+            @formatter.scenario_ended
+            @formatter.story_ended '', ''
+
+            #then
+            @out.string.should eql("\e[32m.\e[0m")
+          end
+
+          it "should push red F for failure scenario" do
+            #when
+            @formatter.scenario_started('','')
+            @formatter.step_failed('', '')
+            @formatter.scenario_failed('', '', '')
+            @formatter.story_ended '', ''
+
+            #then
+            @out.string.should eql("\e[31mF\e[0m")
+          end
+
+          it "should push yellow P for pending scenario" do
+            #when
+            @formatter.scenario_started('','')
+            @formatter.step_pending('', '')
+            @formatter.scenario_pending('story', '', '')
+            @formatter.story_ended '', ''
+
+            #then
+            @out.string.should eql("\e[33mP\e[0m")
+          end
+
+        end
+      end
+    end
+  end
+end

data/spec/spec/runner/heckle_runner_spec.rb

@@ -21,18 +21,18 @@ unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
     end
 
     it "should heckle all methods in all classes in a module" do
-      @heckle_class.should_receive(:new).with("Foo::Bar", "one", rspec_options).and_return(@heckle)
-      @heckle_class.should_receive(:new).with("Foo::Bar", "two", rspec_options).and_return(@heckle)
-      @heckle_class.should_receive(:new).with("Foo::Zap", "three", rspec_options).and_return(@heckle)
-      @heckle_class.should_receive(:new).with("Foo::Zap", "four", rspec_options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "one", Spec::Runner.options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", Spec::Runner.options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Zap", "three", Spec::Runner.options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Zap", "four", Spec::Runner.options).and_return(@heckle)
 
       heckle_runner = Spec::Runner::HeckleRunner.new("Foo", @heckle_class)
       heckle_runner.heckle_with
     end
 
     it "should heckle all methods in a class" do
-      @heckle_class.should_receive(:new).with("Foo::Bar", "one", rspec_options).and_return(@heckle)
-      @heckle_class.should_receive(:new).with("Foo::Bar", "two", rspec_options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "one", Spec::Runner.options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", Spec::Runner.options).and_return(@heckle)
 
       heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bar", @heckle_class)
       heckle_runner.heckle_with
@@ -46,14 +46,14 @@ unless [/mswin/, /java/].detect{|p| p =~ RUBY_PLATFORM}
     end
 
     it "should heckle specific method in a class (with #)" do
-      @heckle_class.should_receive(:new).with("Foo::Bar", "two", rspec_options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", Spec::Runner.options).and_return(@heckle)
 
       heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bar#two", @heckle_class)
       heckle_runner.heckle_with
     end
 
     it "should heckle specific method in a class (with .)" do
-      @heckle_class.should_receive(:new).with("Foo::Bar", "two", rspec_options).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", Spec::Runner.options).and_return(@heckle)
 
       heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bar.two", @heckle_class)
       heckle_runner.heckle_with

data/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
@@ -76,7 +91,7 @@ describe "OptionParser" do
   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 version \d+\.\d+\.\d+/n)
   end
   
   it "should require file when require specified" do
@@ -231,19 +246,19 @@ describe "OptionParser" do
   
   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

data/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/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

data/spec/spec/runner/reporter_spec.rb

@@ -17,7 +17,7 @@ module Spec
       end
 
       def failure
-        Mocks::DuckTypeArgConstraint.new(:header, :exception)
+        Mocks::ArgumentConstraints::DuckTypeArgConstraint.new(:header, :exception)
       end
 
       def create_example_group(description_text)
@@ -155,26 +155,72 @@ 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, "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, "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

data/spec/spec/runner/spec_parser_spec.rb

@@ -3,15 +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)
+    @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"
     load file
   end
 
-  after do
-    $rspec_options = @original_rspec_options
+  after(:each) do
+    Spec::Runner.use @original_rspec_options
   end
 
   it "should find spec name for 'specify' at same line" do

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

@@ -22,11 +22,8 @@ module Spec
         
         it "should parse a story file" do
           runner = PlainTextStoryRunner.new("path")
-          during {
-            runner.run(mock('runner'))
-          }.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

data/spec/spec/story/runner/story_mediator_spec.rb

@@ -126,6 +126,16 @@ module Spec
           @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/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/spec/spec/story/scenario_spec.rb

@@ -8,9 +8,7 @@ module Spec
         story = StoryBuilder.new.to_story
         
         # when
-        error = exception_from do
-          Scenario.new story, 'name'
-        end
+        error = exception_from { Scenario.new story, 'name' }
         
         # then
         error.should be_nil

data/spec/spec/story/step_mother_spec.rb

@@ -42,6 +42,18 @@ module Spec
         end.should raise_error(Spec::Example::ExamplePendingError, /Unimplemented/)
       end
       
+      it "should create a default step with it's name stripped" do
+        # given
+        step_mother = StepMother.new
+        
+        # when
+        step = step_mother.find(:given, "doesn't exist\n\n")
+        
+        # then
+        step.should be_an_instance_of(Step)
+        step.name.should == "doesn't exist"
+      end
+      
       it 'should clear itself' do
         # given
         step_mother = StepMother.new

data/spec/spec/story/step_spec.rb

@@ -2,12 +2,17 @@ require File.dirname(__FILE__) + '/story_helper'
 
 module Spec
   module Story
-    describe Step, "matching" do
+    describe Step, "#matching" do
       it "should match a text string" do
         step = Step.new("this text") {}
         step.matches?("this text").should be_true
       end
       
+      it "should match a text string that has additional line returns" do
+        step = Step.new("this text") {}
+        step.matches?("this text\n\n").should be_true
+      end
+      
       it "should not match a text string that does not start the same" do
         step = Step.new("this text") {}
         step.matches?("Xthis text").should be_false
@@ -32,6 +37,11 @@ module Spec
         step = Step.new("1 $one 2 $two 3 $three 4") {}
         step.matches?("1 a 2 b 3 c 4").should be_true
       end
+
+      it "should match a text string with two params sharing a prefix" do
+        step = Step.new("I am cool $n times out of $n_total")
+        step.matches?("I am cool 3 times out of 7").should be_true
+      end
       
       it "should match a text string with a param at the beginning" do
         step = Step.new("$one 2 3") {}
@@ -88,6 +98,11 @@ module Spec
         step.matches?("before () after").should be_true
       end
       
+      it "should not get bogged down by regular expression special characters in strings" do
+        step = Step.new("These characters should work ? ( ) [ ] { } ^ !") {}
+        step.matches?("These characters should work ? ( ) [ ] { } ^ !").should be_true
+      end
+      
       it "should match any option of an alteration" do
         step = Step.new(/(he|she) is cool/) {}
         step.matches?("he is cool").should be_true
@@ -121,13 +136,51 @@ module Spec
         step = Step.new(/show me the \$$money/) {}
         step.matches?("show me the $123").should be_true
       end
+      
+      it "should match a multiline regex" do
+        step = Step.new(/.*should have text.$text/) {}
+        step.matches?(<<TEXT).should be_true
+          should have text
+          this is the text
+          and so is this
+TEXT
+      end
+      
+      it "should match the beginning of the string, not the line" do
+        step = Step.new(/should have text/) {}
+        step.matches?(<<TEXT).should be_false
+whatever
+should have text
+TEXT
+      end
+
+      it "should match the end of the string, not the line" do
+        step = Step.new(/should have text/) {}
+        step.matches?(<<TEXT).should be_false
+should have text
+whatever
+TEXT
+      end
+    end
+    
+    describe Step, "#parse_args" do
+      it "should return an empty array for a text string with no parameters" do
+        step = Step.new("this text") {}
+        step.parse_args("this text").should == []
+      end
+      
+      it "should return an empty array for a text string with additional line returns and no parameters" do
+        step = Step.new("this text") {}
+        step.parse_args("this text\n\n").should == []
+      end
     end
     
     describe Step do
-      it "should make complain with no block" do
+      it "should be pending with no block" do
+        step = Step.new("foo")
         lambda {
-          step = Step.new("foo")
-        }.should raise_error
+          step.perform(Object.new)
+        }.should raise_error(Spec::Example::ExamplePendingError, "Not Yet Implemented")
       end
       
       it "should perform itself on an object" do