rspec 1.1.1 → 1.1.2

data/CHANGES

@@ -1,3 +1,18 @@
+== Version 1.1.2
+
+Minor bug fixes/enhancements.
+
+* RSpec's Autotest subclasses compatible with ZenTest-3.8.0 (thanks to Ryan Davis for making it easier on Autotest subs).
+* Applied patch from idl to add spec/lib to rake stats. Closes #226.
+* calling setup_fixtures and teardown_fixtures for Rails >= r8570. Closes #219.
+* Applied patch from Josh Knowles using ActiveSupport's Inflector (when available) to make 'should have' read a bit better. Closes #197.
+* Fixed regression in 1.1 that caused failing examples to fail to generate their own names. Closes #209.
+* Applied doc patch from Jens Krämer for capturing content_for
+* Applied patch from Alexander Lang to clean up story steps after each story. Closes #198.
+* Applied patch from Josh Knowles to support 'string_or_response.should have_text(...)'. Closes #193.
+* Applied patch from Ian Dees to quiet the Story Runner backtrace. Closes #183.
+* Complete support for defining steps with regexp 'names'.
+
 == Version 1.1.1
 
 Bug fix release.
@@ -12,7 +27,7 @@ The "tell me a story and go nest yourself" release.
 * Applied patch from Mike Vincent to handle generators rails > 2.0.1. Closes LH[#181]
 * Formatter.pending signature changed so it gets passed an ExampleGroup instance instead of the name ( LH[#180])
 * Fixed LH[#180] Spec::Rails::Example::ModelExampleGroup and friends show up in rspec/rails output
-* Spec::Rails no longer loads ActiveRecord extensions if it's disablet in config/boot.rb
+* Spec::Rails no longer loads ActiveRecord extensions if it's disabled in config/boot.rb
 * Applied LH[#178] small annoyances running specs with warnings enabled (Patch from Mikko Lehtonen)
 * Tighter integration with Rails fixtures. Take advantage of fixture caching to get performance improvements (Thanks to Pat Maddox, Nick Kallen, Jonathan Barnes, and Curtis)
 

data/README

@@ -38,9 +38,8 @@ In order to run RSpec's full suite of specs (rake pre_commit) you must install t
 
 * rake          # Runs the build script
 * rcov          # Verifies that the code is 100% covered by specs
-* webgen        # Generates the static HTML website
-* RedCloth      # Required by webgen
-* syntax        # Required by our own custom webgen extension to highlight ruby code
+* webby         # Generates the static HTML website
+* syntax        # Required to highlight ruby code
 * diff-lcs      # Required if you use the --diff switch
 * win32console  # Required by the --colour switch if you're on Windows
 * meta_project  # Required in order to make releases at RubyForge

data/Rakefile

@@ -87,7 +87,6 @@ spec = Gem::Specification.new do |s|
   s.rdoc_options = rd.options
   s.extra_rdoc_files = rd.rdoc_files.reject { |fn| fn =~ /\.rb$|^EXAMPLES.rd$/ }.to_a
 
-  s.autorequire = 'spec'
   s.bindir = 'bin'
   s.executables = ['spec', 'spec_translator']
   s.default_executable = 'spec'

data/bin/spec

@@ -1,3 +1,4 @@
+#!/usr/bin/env ruby
 $LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
 require 'spec'
 exit ::Spec::Runner::CommandLine.run(rspec_options)

data/examples/pure/helper_method_example.rb

@@ -1,11 +1,14 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
-describe "a context with helper a method" do
-  def helper_method
-    "received call"
-  end
+module HelperMethodExample
+  describe "an example group with helper a method" do
+    def helper_method
+      "received call"
+    end
   
-  it "should make that method available to specs" do
-    helper_method.should == "received call"
+    it "should make that method available to specs" do
+      helper_method.should == "received call"
+    end
   end
 end
+

data/lib/autotest/rspec.rb

@@ -1,30 +1,24 @@
 require 'autotest'
 
+Autotest.add_hook :initialize do |at|
+  at.clear_mappings
+  # watch out: Ruby bug (1.8.6):
+  # %r(/) != /\//
+  at.add_mapping(%r%^spec/.*\.rb$%) { |filename, _| 
+    filename 
+  }
+  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| 
+    ["spec/#{m[1]}_spec.rb"]
+  }
+  at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) { 
+    at.files_matching %r%^spec/.*_spec\.rb$%
+  }
+end
+
 class RspecCommandError < StandardError; end
 
 class Autotest::Rspec < Autotest
   
-  def initialize(kernel=Kernel, separator=File::SEPARATOR, alt_separator=File::ALT_SEPARATOR) # :nodoc:
-    super()
-    @kernel, @separator, @alt_separator = kernel, separator, alt_separator
-    @spec_command = spec_command
-
-    # watch out: Ruby bug (1.8.6):
-    # %r(/) != /\//
-    # since Ruby compares the REGEXP source, not the resulting pattern
-    @test_mappings = {
-      %r%^spec/.*\.rb$% => kernel.proc { |filename, _| 
-        filename 
-      },
-      %r%^lib/(.*)\.rb$% => kernel.proc { |_, m| 
-        ["spec/#{m[1]}_spec.rb"] 
-      },
-      %r%^spec/(spec_helper|shared/.*)\.rb$% => kernel.proc { 
-        files_matching %r%^spec/.*_spec\.rb$% 
-      }
-    }
-  end
-  
   def tests_for_file(filename)
     super.select { |f| @files.has_key? f }
   end
@@ -59,7 +53,7 @@ class Autotest::Rspec < Autotest
   end
 
   def make_test_cmd(files_to_test)
-    return "#{ruby} -S #{@spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}"
+    return "#{ruby} -S #{spec_command} #{add_options_if_present} #{files_to_test.keys.flatten.join(' ')}"
   end
   
   def add_options_if_present
@@ -71,7 +65,7 @@ class Autotest::Rspec < Autotest
   # that in ~/.autotest to provide a different spec command
   # then the default paths provided.
   def spec_command
-    spec_commands.each do |command|
+    @spec_command ||= spec_commands.each do |command|
       if File.exists?(command)
         return @alt_separator ? (command.gsub @separator, @alt_separator) : command
       end

data/lib/spec/example/example_methods.rb

@@ -64,21 +64,22 @@ module Spec
         @_defined_description || @_matcher_description || "NO NAME"
       end
       
-      def set_instance_variables_from_hash(instance_variables)
-        instance_variables.each do |variable_name, value|
-          unless ['@_implementation', '@_defined_description', '@_matcher_description', '@method_name'].index(variable_name)
+      def set_instance_variables_from_hash(ivars)
+        ivars.each do |variable_name, value|
+          # Ruby 1.9 requires variable.to_s on the next line
+          unless ['@_implementation', '@_defined_description', '@_matcher_description', '@method_name'].include?(variable_name.to_s)
             instance_variable_set variable_name, value
           end
         end
       end
 
       def run_with_description_capturing
-        return_value = nil
-        
-        @_matcher_description = Matchers.capture_generated_description do
-          return_value = instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK))
+        begin
+          return instance_eval(&(@_implementation || PENDING_EXAMPLE_BLOCK))
+        ensure
+          @_matcher_description = Spec::Matchers.generated_description
+          Spec::Matchers.clear_generated_description
         end
-        return_value
       end
       
       protected

data/lib/spec/matchers.rb

@@ -139,14 +139,8 @@ module Spec
       def clear_generated_description
         self.generated_description = nil
       end
-
-      def capture_generated_description
-        yield
-        description = generated_description
-        clear_generated_description
-        description
-      end
     end
+
     extend ModuleMethods
 
     def method_missing(sym, *args, &block) # :nodoc:

data/lib/spec/matchers/be.rb

@@ -124,8 +124,9 @@ module Spec
         def parse_expected(expected)
           if Symbol === expected
             @handling_predicate = true
-            ["be_an_","be_a_","be_"].each do |@prefix|
-              if expected.starts_with?(@prefix)
+            ["be_an_","be_a_","be_"].each do |prefix|
+              if expected.starts_with?(prefix)
+                @prefix = prefix
                 return "#{expected.to_s.sub(@prefix,"")}".to_sym
               end
             end

data/lib/spec/matchers/have.rb

@@ -17,6 +17,7 @@ module Spec
     
       def method_missing(sym, *args, &block)
         @collection_name = sym
+        @plural_collection_name = Inflector.pluralize(sym.to_s) if Object.const_defined?(:Inflector)
         @args = args
         @block = block
         self
@@ -25,6 +26,8 @@ module Spec
       def matches?(collection_owner)
         if collection_owner.respond_to?(@collection_name)
           collection = collection_owner.send(@collection_name, *@args, &@block)
+        elsif (@plural_collection_name && collection_owner.respond_to?(@plural_collection_name))
+          collection = collection_owner.send(@plural_collection_name, *@args, &@block)
         elsif (collection_owner.respond_to?(:length) || collection_owner.respond_to?(:size))
           collection = collection_owner
         else

data/lib/spec/mocks/message_expectation.rb

@@ -39,6 +39,8 @@ module Spec
                                                     @expected_received_count < values.size
         end
         @return_block = block_given? ? return_block : lambda { value }
+        # Ruby 1.9 - see where this is used below
+        @ignore_args = !block_given?
       end
       
       # :call-seq:
@@ -128,9 +130,14 @@ module Spec
       
       def invoke_return_block(args, block)
         args << block unless block.nil?
-        value = @return_block.call(*args)
-    
-        value
+        # Ruby 1.9 - when we set @return_block to return values
+        # regardless of arguments, any arguments will result in
+        # a "wrong number of arguments" error
+        if @ignore_args
+          @return_block.call()
+        else
+          @return_block.call(*args)
+        end
       end
     end
     

data/lib/spec/runner/formatter/story/html_formatter.rb

@@ -112,11 +112,12 @@ EOF
           
           def print_step(klass, type, description, *args)
             spans = args.map { |arg| "<span class=\"param\">#{arg}</span>" }
+            desc_string = description.step_name
+            arg_regexp = description.arg_regexp           
             i = -1
-            inner = type.to_s.capitalize + ' ' + description.gsub(::Spec::Story::Step::PARAM_PATTERN) { |param| spans[i+=1] }
+            inner = type.to_s.capitalize + ' ' + desc_string.gsub(arg_regexp) { |param| spans[i+=1] }
             @output.puts "                <li class=\"#{klass}\">#{inner}</li>"
           end
-
         end
       end
     end

data/lib/spec/runner/formatter/story/plain_text_formatter.rb

@@ -20,6 +20,7 @@ module Spec
           end
 
           def story_started(title, narrative)
+            @current_story_title = title
             @output.puts "Story: #{title}\n\n"
             narrative.each_line do |line|
               @output.print "  "
@@ -33,6 +34,7 @@ module Spec
           end
 
           def scenario_started(story_title, scenario_name)
+            @current_scenario_name = scenario_name
             @scenario_already_failed = false
             @output.print "\n\n  Scenario: #{scenario_name}"
             @scenario_ok = true
@@ -43,12 +45,12 @@ module Spec
           end
         
           def scenario_failed(story_title, scenario_name, err)
+            @options.backtrace_tweaker.tweak_backtrace(err)
             @failed_scenarios << [story_title, scenario_name, err] unless @scenario_already_failed
             @scenario_already_failed = true
           end
         
           def scenario_pending(story_title, scenario_name, msg)
-            @pending_steps << [story_title, scenario_name, msg]
             @pending_scenario_count += 1 unless @scenario_already_failed
             @scenario_already_failed = true
           end
@@ -58,8 +60,8 @@ module Spec
             unless @pending_steps.empty?
               @output.puts "\nPending Steps:"
               @pending_steps.each_with_index do |pending, i|
-                title, scenario_name, msg = pending
-                @output.puts "#{i+1}) #{title} (#{scenario_name}): #{msg}"
+                story_name, scenario_name, msg = pending
+                @output.puts "#{i+1}) #{story_name} (#{scenario_name}): #{msg}"
               end
             end
             unless @failed_scenarios.empty?
@@ -70,9 +72,9 @@ module Spec
     #{i+1}) #{title} (#{scenario_name}) FAILED
     #{err.class}: #{err.message}
     #{err.backtrace.join("\n")}
-    ]
+]
               end
-            end
+            end            
           end
         
           def step_succeeded(type, description, *args)
@@ -81,6 +83,7 @@ module Spec
         
           def step_pending(type, description, *args)
             found_step(type, description, false, *args)
+            @pending_steps << [@current_story_title, @current_scenario_name, description]
             @output.print " (PENDING)"
             @scenario_ok = false
           end
@@ -101,13 +104,15 @@ module Spec
         private
 
           def found_step(type, description, failed, *args)
+            desc_string = description.step_name
+            arg_regexp = description.arg_regexp
             text = if(type == @previous_type)
               "\n    And "
             else
               "\n\n    #{type.to_s.capitalize} "
             end
             i = -1
-            text << description.gsub(::Spec::Story::Step::PARAM_PATTERN) { |param| args[i+=1] }
+            text << desc_string.gsub(arg_regexp) { |param| args[i+=1] }
             @output.print(failed ? red(text) : green(text))
 
             if type == :'given scenario'

data/lib/spec/story/extensions.rb

@@ -1 +1,3 @@
 require 'spec/story/extensions/main'
+require 'spec/story/extensions/string'
+require 'spec/story/extensions/regexp'

data/lib/spec/story/extensions/regexp.rb

@@ -0,0 +1,9 @@
+class Regexp
+  def step_name
+    self.source
+  end
+  
+  def arg_regexp
+    ::Spec::Story::Step::PARAM_OR_GROUP_PATTERN
+  end
+end

data/lib/spec/story/extensions/string.rb

@@ -0,0 +1,9 @@
+class String
+  def step_name
+    self
+  end
+  
+  def arg_regexp
+    ::Spec::Story::Step::PARAM_PATTERN
+  end
+end

data/lib/spec/story/runner/story_parser.rb

@@ -26,14 +26,14 @@ module Spec
         def process_line(line)
           line.strip!
           case line
-          when /^Story: /           : @state.story(line)
-          when /^Scenario: /        : @state.scenario(line)
-          when /^Given:? /          : @state.given(line)
-          when /^GivenScenario:? /  : @state.given_scenario(line)
-          when /^When:? /           : @state.event(line)
-          when /^Then:? /           : @state.outcome(line)
-          when /^And:? /            : @state.one_more_of_the_same(line)
-          else                        @state.other(line)
+          when /^Story: /           then @state.story(line)
+          when /^Scenario: /        then @state.scenario(line)
+          when /^Given:? /          then @state.given(line)
+          when /^GivenScenario:? /  then @state.given_scenario(line)
+          when /^When:? /           then @state.event(line)
+          when /^Then:? /           then @state.outcome(line)
+          when /^And:? /            then @state.one_more_of_the_same(line)
+          else                           @state.other(line)
           end
         end
 

data/lib/spec/story/runner/story_runner.rb

@@ -48,8 +48,9 @@ module Spec
               @scenario_runner.run(scenario, world)
             end
             @listeners.each { |l| l.story_ended(story.title, story.narrative) }
+            World.step_mother.clear
           end
-          unique_steps = World.step_names.uniq.sort
+          unique_steps = (World.step_names.collect {|n| Regexp === n ? n.source : n.to_s}).uniq.sort
           @listeners.each { |l| l.collected_steps(unique_steps) }
           @listeners.each { |l| l.run_ended }
         end

data/lib/spec/story/step.rb

@@ -2,6 +2,7 @@ module Spec
   module Story
     class Step
       PARAM_PATTERN = /(\$\w*)/
+      PARAM_OR_GROUP_PATTERN = /(\$\w*)|\(.*?\)/
       
       attr_reader :name
       def initialize(name, &block)
@@ -12,14 +13,21 @@ module Spec
 
       def perform(instance, *args)
         instance.extend(@mod)
-        instance.__send__(@name, *args)
+        instance.__send__(sanitize(@name), *args)
       end
 
       def init_module(name, &block)
+        sanitized_name = sanitize(name)
         @mod = Module.new do
-          define_method(name.to_s, &block)
+          define_method(sanitized_name, &block)
         end
       end
+      
+      def sanitize(a_string_or_regexp)
+        return a_string_or_regexp.source if Regexp == a_string_or_regexp
+        a_string_or_regexp.to_s
+      end
+      
 
       def matches?(name)
         !(matches = name.match(@expression)).nil?

data/lib/spec/version.rb

@@ -3,10 +3,10 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 1
-      TINY   = 1
+      TINY   = 2
       RELEASE_CANDIDATE = nil
 
-      BUILD_TIME_UTC = 20071217181808
+      BUILD_TIME_UTC = 20080114022430
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/spec/autotest/rspec_spec.rb

@@ -51,7 +51,7 @@ HERE
     
     before :each do
       common_setup
-      @rspec_autotest = Rspec.new(@kernel)
+      @rspec_autotest = Rspec.new
     end
     
     it "should try to find the spec command if it exists in ./bin and use it above everything else" do
@@ -88,7 +88,8 @@ HERE
     end
     
     it "should use the ALT_SEPARATOR if it is non-nil" do
-      @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator)
+      pending("autotest got re-worked so this is failing for the moment")
+      @rspec_autotest = Rspec.new
       spec_command = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec")
       @rspec_autotest.stub!(:spec_commands).and_return [spec_command]
       @rspec_autotest.spec_command.should == spec_command.gsub('/', '\\')
@@ -96,7 +97,7 @@ HERE
     
     it "should not use the ALT_SEPATOR if it is nil" do
       @windows_alt_separator = nil
-      @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator)
+      @rspec_autotest = Rspec.new
       spec_command = File.expand_path("#{File.dirname(__FILE__)}/../../bin/spec")
       @rspec_autotest.stub!(:spec_commands).and_return [spec_command]
       @rspec_autotest.spec_command.should == spec_command
@@ -144,22 +145,20 @@ HERE
   
   describe Rspec, "test mappings" do
     before :each do
-      @proc = mock Proc
-      @kernel = mock Kernel
-      @kernel.stub!(:proc).and_return @proc
-      @rspec_autotest = Rspec.new(@kernel)
+      @rspec_autotest = Rspec.new
+      @rspec_autotest.hook :initialize
     end
       
     it "should map all filenames in spec/ which end in .rb" do
-      @rspec_autotest.test_mappings[%r%^spec/.*\.rb$%].should == @proc
+      @rspec_autotest.instance_eval{@test_mappings}.should have_key(%r%^spec/.*\.rb$%)
     end
     
     it "should map all names in lib which end in .rb to the corresponding ones in spec/" do
-      @rspec_autotest.test_mappings[%r%^lib/(.*)\.rb$%].should == @proc
+      @rspec_autotest.instance_eval{@test_mappings}.should have_key(%r%^lib/(.*)\.rb$%)
     end
     
     it "should find all files in spec/shares/* and the spec helper in spec/spec_helper"  do
-      @rspec_autotest.test_mappings[%r%^spec/(spec_helper|shared/.*)\.rb$%].should == @proc
+      @rspec_autotest.instance_eval{@test_mappings}.should have_key(%r%^spec/(spec_helper|shared/.*)\.rb$%)
     end
   end
   
@@ -168,7 +167,7 @@ HERE
     
     before :each do
       common_setup
-      @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator)
+      @rspec_autotest = Rspec.new
       @rspec_autotest.stub!(:hook)
       
       @results = mock String
@@ -214,6 +213,7 @@ HERE
       @lib_file = "lib/something.rb"
       @spec_file = "spec/something_spec.rb"
       @rspec_autotest = Rspec.new
+      @rspec_autotest.hook :initialize
 
       @rspec_autotest.instance_variable_set("@files", {@lib_file => Time.now, @spec_file => Time.now})
       @rspec_autotest.stub!(:find_files_to_test).and_return true

data/spec/spec/example/example_methods_spec.rb

@@ -70,6 +70,22 @@ module Spec
         @example_group.run
         ExampleMethods.count.should == 5
       end
+      
+      describe "run_with_description_capturing" do
+        before(:each) do
+          @example_group = Class.new(ExampleGroup) do end
+          @example = @example_group.new("foo", &(lambda { 2.should == 2 }))
+          @example.run_with_description_capturing
+        end
+      
+        it "should provide the generated description" do
+          @example.instance_eval { @_matcher_description }.should == "should == 2"
+        end
+      
+        it "should clear the global generated_description" do
+          Spec::Matchers.generated_description.should == nil
+        end
+      end
     end
   end
 end

data/spec/spec/interop/test/unit/test_unit_spec_helper.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../../../spec_helper'
 require File.dirname(__FILE__) + '/../../../../ruby_forker'
 
-describe "Test::Unit interop", :shared => true do
+module TestUnitSpecHelper
   include RubyForker
   
   def run_script(file_name)

data/spec/spec/interop/test/unit/testcase_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_unit_spec_helper'
 
 describe "Test::Unit::TestCase" do
-  it_should_behave_like "Test::Unit interop"
+  include TestUnitSpecHelper
   it "should pass" do
     dir = File.dirname(__FILE__)
     output = run_script("#{dir}/testcase_spec_with_test_unit.rb")

data/spec/spec/interop/test/unit/testsuite_adapter_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/test_unit_spec_helper'
 
 describe "TestSuiteAdapter" do
-  it_should_behave_like "Test::Unit interop"
+  include TestUnitSpecHelper
   it "should pass" do
     dir = File.dirname(__FILE__)
     run_script "#{dir}/testsuite_adapter_spec_with_test_unit.rb"

data/spec/spec/matchers/have_spec.rb

@@ -47,6 +47,25 @@ describe "should have(n).items" do
   end
 end
 
+describe 'should have(1).item when Inflector is defined' do
+  include HaveSpecHelper
+  
+  before do
+    unless Object.const_defined?(:Inflector)
+      class Inflector
+        def self.pluralize(string)
+          string.to_s + 's'
+        end
+      end
+    end
+  end
+  
+  it 'should pluralize the collection name' do
+    owner = create_collection_owner_with(1)
+    owner.should have(1).item
+  end
+end
+
 describe "should have(n).items where result responds to items but returns something other than a collection" do
   it "should provide a meaningful error" do
     owner = Class.new do

data/spec/spec/matchers/match_spec.rb

@@ -5,12 +5,12 @@ describe "should match(expected)" do
     "string".should match(/tri/)
   end
 
-  it "should fail when target (String) matches expected (Regexp)" do
+  it "should fail when target (String) does not match expected (Regexp)" do
     lambda {
       "string".should match(/rings/)
     }.should fail
   end
-
+  
   it "should provide message, expected and actual on failure" do
     matcher = match(/rings/)
     matcher.matches?("string")
@@ -19,7 +19,7 @@ describe "should match(expected)" do
 end
 
 describe "should_not match(expected)" do
-  it "should pass when target (String) matches expected (Regexp)" do
+  it "should pass when target (String) matches does not match (Regexp)" do
     "string".should_not match(/rings/)
   end
 

data/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/spec/spec/runner/formatter/story/plain_text_formatter_spec.rb

@@ -9,8 +9,11 @@ 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
         
@@ -59,6 +62,40 @@ module Spec
             @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)
@@ -146,14 +183,18 @@ module Spec
           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
@@ -226,6 +267,11 @@ module Spec
             @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')

data/spec/spec/spec_classes.rb

@@ -51,6 +51,9 @@ module Spec
           [1]
         end
         
+        def items
+          @items_in_collection_with_size_method
+        end
       end
 
       class HandCodedMock

data/spec/spec/story/runner/story_runner_spec.rb

@@ -213,6 +213,43 @@ module Spec
           # then
           $scenario.name.should == 'first scenario'
         end
+        
+        it "should clean the steps between stories" do
+          #given
+          story_runner = StoryRunner.new(ScenarioRunner.new)
+          result = mock 'result'
+          
+          step1 = Step.new('step') do
+            result.one
+          end
+          steps1 = StepGroup.new
+          steps1.add :when, step1
+          
+          story_runner.Story 'title', 'narrative', :steps => steps1 do
+            Scenario 'first scenario' do
+              When 'step'
+            end
+          end
+          
+          step2 = Step.new('step') do
+            result.two
+          end
+          steps2 = StepGroup.new
+          steps2.add :when, step2
+          
+          story_runner.Story 'title2', 'narrative', :steps => steps2 do
+            Scenario 'second scenario' do
+              When 'step'
+            end
+          end
+          
+          #then
+          result.should_receive(:one)
+          result.should_receive(:two)
+          
+          #when
+          story_runner.run_stories
+        end
       end
     end
   end

data/spec/spec/story/step_spec.rb

@@ -68,6 +68,18 @@ module Spec
         step.matches?("before () after").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
+        step.matches?("she is cool").should be_true
+      end
+      
+      it "should match alteration as well as a variable" do
+        step = Step.new(/(he|she) is (.*)/) {}
+        step.matches?("he is cool").should be_true
+        step.parse_args("he is cool").should == ['he', 'cool']
+      end
+      
     end
     
     describe Step do
@@ -142,6 +154,25 @@ module Spec
         $amount.should == "3"
       end
 
+      it "should perform itself when defined with a regexp with 2 parameters" do
+        # given
+        $pronoun = nil
+        $adjective = nil
+        step = Step.new /(he|she) is (.*)/ do |pronoun, adjective|
+          $pronoun = pronoun
+          $adjective = adjective
+        end
+        instance = Object.new
+        
+        # when
+        args = step.parse_args("he is cool")
+        step.perform(instance, *args)
+        
+        # then
+        $pronoun.should == "he"
+        $adjective.should == "cool"
+      end
+
     end
   end
 end

data/stories/example_groups/autogenerated_docstrings

@@ -4,7 +4,7 @@ Story: autogenerated docstrings
   I want examples to generate their own names
   So that I can reduce duplication between example names and example code
 
-  Scenario: run with ruby
+  Scenario: run passing examples with ruby
     Given the file ../../examples/pure/autogenerated_docstrings_example.rb
 
     When I run it with the ruby interpreter -fs
@@ -14,13 +14,32 @@ Story: autogenerated docstrings
     And the stdout should match /should include "a"/
     And the stdout should match /should respond to #size/
 
-    Scenario: run with spec
-      Given the file ../../examples/pure/autogenerated_docstrings_example.rb
+  Scenario: run failing examples with ruby
+    Given the file ../../failing_examples/failing_autogenerated_docstrings_example.rb
 
-      When I run it with the spec script -fs
+    When I run it with the ruby interpreter -fs
+
+    Then the stdout should match /should equal 2/
+    And the stdout should match /should be > 5/
+    And the stdout should match /should include "b"/
+    And the stdout should match /should not respond to #size/
+
+  Scenario: run passing examples with spec
+    Given the file ../../examples/pure/autogenerated_docstrings_example.rb
+
+    When I run it with the spec script -fs
+
+    Then the stdout should match /should equal 5/
+    And the stdout should match /should be < 5/
+    And the stdout should match /should include "a"/
+    And the stdout should match /should respond to #size/
+
+  Scenario: run failing examples with spec
+    Given the file ../../failing_examples/failing_autogenerated_docstrings_example.rb
 
-      Then the stdout should match /should equal 5/
-      And the stdout should match /should be < 5/
-      And the stdout should match /should include "a"/
-      And the stdout should match /should respond to #size/
+    When I run it with the spec script -fs
 
+    Then the stdout should match /should equal 2/
+    And the stdout should match /should be > 5/
+    And the stdout should match /should include "b"/
+    And the stdout should match /should not respond to #size/

data/stories/example_groups/output

@@ -18,3 +18,8 @@ Story: Getting correct output
     And the stdout should not match "Loaded suite"
     And the stdout should not match /\d+ tests, \d+ assertions, \d+ failures, \d+ errors/m
     And the stdout should match "1 example, 0 failures"
+
+  Scenario: Tweak backtrace
+    Given the file stories/failing_story.rb
+    When I run it with the ruby interpreter
+    Then the stdout should not match /\/lib\/spec\//

data/stories/resources/stories/failing_story.rb

@@ -0,0 +1,15 @@
+$:.push File.join(File.dirname(__FILE__), *%w[.. .. .. lib])
+
+require 'spec/story'
+
+Story "Failing story",
+%(As an RSpec user
+  I want a failing test
+  So that I can observe the output) do
+
+  Scenario "Failing scenario" do
+    Then "true should be false" do
+      true.should == false
+    end
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors: 
 - RSpec Development Team
-autorequire: spec
+autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2007-12-17 00:00:00 -06:00
+date: 2008-01-15 00:00:00 -06:00
 default_executable: spec
 dependencies: []
 
@@ -119,6 +119,8 @@ files:
 - lib/spec/runner/spec_parser.rb
 - lib/spec/runner.rb
 - lib/spec/story/extensions/main.rb
+- lib/spec/story/extensions/regexp.rb
+- lib/spec/story/extensions/string.rb
 - lib/spec/story/extensions.rb
 - lib/spec/story/given_scenario.rb
 - lib/spec/story/runner/plain_text_story_runner.rb
@@ -352,6 +354,8 @@ files:
 - stories/resources/spec/simple_spec.rb
 - stories/resources/steps
 - stories/resources/steps/running_rspec.rb
+- stories/resources/stories
+- stories/resources/stories/failing_story.rb
 - stories/resources/test
 - stories/resources/test/spec_and_test_together.rb
 - stories/resources/test/test_case_with_should_methods.rb
@@ -382,9 +386,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 0.9.5
+rubygems_version: 1.0.1
 signing_key: 
 specification_version: 2
-summary: RSpec-1.1.1 (build 20071217181808) - BDD for Ruby http://rspec.rubyforge.org/
+summary: RSpec-1.1.2 (build 20080114022430) - BDD for Ruby http://rspec.rubyforge.org/
 test_files: []