rspec-core 2.0.0.beta.4 → 2.0.0.beta.5

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.4
+2.0.0.beta.5

data/features/subject/explicit_subject.feature

@@ -33,3 +33,36 @@ Feature: explicit subject
       """
     When I run "rspec nested_subject_spec.rb"
     Then I should see "1 example, 0 failures"
+
+@wip
+  Scenario: access subject from before block
+    Given a file named "top_level_subject_spec.rb" with:
+      """
+      describe Array, "with some elements" do
+        subject { [] }
+        before { subject += [1,2,3] }
+        it "should have the prescribed elements" do
+          subject.should == [1,2,3]
+        end
+      end
+      """
+    When I run "spec top_level_subject_spec.rb"
+    Then I should see "1 example, 0 failures"
+
+  Scenario: subject using helper method
+    Given a file named "helper_subject_spec.rb" with:
+      """
+      require 'rspec/expectations'
+
+      describe Array do
+        def prepared_array; [1,2,3] end
+        subject { prepared_array }
+        describe "with some elements" do
+          it "should have the prescribed elements" do
+            subject.should == [1,2,3]
+          end
+        end
+      end
+      """
+    When I run "rspec helper_subject_spec.rb"
+    Then I should see "1 example, 0 failures"

data/lib/autotest/rspec2.rb

@@ -38,7 +38,11 @@ class Autotest::Rspec2 < Autotest
 
   def make_test_cmd(files_to_test)
     files_to_test.empty? ? '' :
-      "#{ruby} #{SPEC_PROGRAM} #{normalize(files_to_test).keys.flatten.join(' ')} #{add_options_if_present}"
+      "#{ruby} #{require_rubygems}#{SPEC_PROGRAM} #{normalize(files_to_test).keys.flatten.join(' ')}"
+  end
+
+  def require_rubygems
+    defined?(:Gem) ? "-rrubygems " : ""
   end
 
   def normalize(files_to_test)
@@ -48,7 +52,4 @@ class Autotest::Rspec2 < Autotest
     end
   end
 
-  def add_options_if_present # :nodoc:
-    File.exist?("spec/spec.opts") ? "-O #{File.join('spec','spec.opts')} " : ""
-  end
 end

data/lib/rspec/core/command_line_options.rb

@@ -26,7 +26,9 @@ module Rspec
             options[:color_enabled] = o
           end
           
-          opts.on('-f', '--formatter [FORMATTER]', 'Choose an optional formatter') do |o|
+          opts.on('-f', '--formatter [FORMATTER]', 'Choose a formatter',
+                  '  [p]rogress (default - dots)',
+                  '  [d]ocumentation (group and example names)') do |o|
             options[:formatter] = o
           end
 

data/lib/rspec/core/configuration.rb

@@ -10,6 +10,8 @@ module Rspec
       # Run all examples if the run is filtered, and no examples were found.
       attr_writer :run_all_when_everything_filtered
 
+      attr_reader :options
+
       def initialize
         @run_all_when_everything_filtered = false
         @hooks = { 
@@ -25,6 +27,7 @@ module Rspec
         {
           :color_enabled => false,
           :mock_framework => nil,
+          :use_transactional_examples => true,
           :profile_examples => false,
           :files_to_run => [],
           :filename_pattern => '**/*_spec.rb',
@@ -48,31 +51,29 @@ module Rspec
 
       def mock_framework=(use_me_to_mock)
         @options[:mock_framework] = use_me_to_mock
-        
-        mock_framework_class = case use_me_to_mock.to_s
-        when /rspec/i
-          require 'rspec/core/mocking/with_rspec'
-          Rspec::Core::Mocking::WithRspec
+      end
+
+      def use_transactional_examples=(value)
+        @options[:use_transactional_examples] = value
+      end
+
+      def use_transactional_examples?
+        @options[:use_transactional_examples]
+      end
+      
+      def require_mock_framework_adapter
+        require case @options[:mock_framework].to_s
+        when "", /rspec/i
+          'rspec/core/mocking/with_rspec'
         when /mocha/i
-          require 'rspec/core/mocking/with_mocha'
-          Rspec::Core::Mocking::WithMocha
+          'rspec/core/mocking/with_mocha'
         when /rr/i
-          require 'rspec/core/mocking/with_rr'
-          Rspec::Core::Mocking::WithRR
+          'rspec/core/mocking/with_rr'
         when /flexmock/i
-          require 'rspec/core/mocking/with_flexmock'
-          Rspec::Core::Mocking::WithFlexmock
+          'rspec/core/mocking/with_flexmock'
         else
-          require 'rspec/core/mocking/with_absolutely_nothing'
-          Rspec::Core::Mocking::WithAbsolutelyNothing
+          'rspec/core/mocking/with_absolutely_nothing'
         end 
-        
-        @options[:mock_framework_class] = mock_framework_class
-        Rspec::Core::ExampleGroup.send(:include, mock_framework_class)
-      end
-      
-      def mock_framework
-        @options[:mock_framework]
       end
 
       def filename_pattern
@@ -136,7 +137,7 @@ EOM
      
       def formatter=(formatter_to_use)
         formatter_class = case formatter_to_use.to_s
-        when /doc/, 's', 'n'
+        when 'd', 'doc', 'documentation', 's', 'n', 'spec', 'nested'
           Rspec::Core::Formatters::DocumentationFormatter
         when 'progress' 
           Rspec::Core::Formatters::ProgressFormatter
@@ -224,6 +225,11 @@ EOM
         end.map { |filters, block| block }
       end
 
+      def configure_mock_framework
+        require_mock_framework_adapter
+        Rspec::Core::ExampleGroup.send(:include, Rspec::Core::MockFrameworkAdapter)
+      end
+
     end
   end
 end

data/lib/rspec/core/example_group.rb

@@ -110,7 +110,7 @@ module Rspec
         @_subclass_count ||= 0
         @_subclass_count += 1
         const_set(
-          "NestedLevel_#{@_subclass_count}",
+          "Nested_#{@_subclass_count}",
           _build(Class.new(self), caller, args, &example_group_block)
         )
       end

data/lib/rspec/core/example_group_subject.rb

@@ -9,7 +9,7 @@ module Rspec
       end
       
       def subject
-        @subject ||= self.class.subject.call
+        @subject ||= instance_eval(&self.class.subject)
       end
       
       # When +should+ is called with no explicit receiver, the call is
@@ -52,8 +52,7 @@ module Rspec
         #
         # See +ExampleMethods#should+ for more information about this approach.
         def subject(&block)
-          block.nil? ?
-          explicit_subject || implicit_subject : @explicit_subject_block = block
+          block ? @explicit_subject_block = block : explicit_subject || implicit_subject
         end
       
         attr_reader :explicit_subject_block # :nodoc:
@@ -69,12 +68,9 @@ module Rspec
         end
 
         def implicit_subject
+          described = describes || description
           Class === described ? lambda { described.new } : lambda { described }
         end
-
-        def described
-          @described ||= describes || description
-        end
       end
     end
   end

data/lib/rspec/core/formatters.rb

@@ -1,3 +1,4 @@
+require 'rspec/core/formatters/helpers'
 require 'rspec/core/formatters/base_formatter'
 require 'rspec/core/formatters/base_text_formatter'
 require 'rspec/core/formatters/documentation_formatter'

data/lib/rspec/core/formatters/base_formatter.rb

@@ -5,6 +5,7 @@ module Rspec
     module Formatters
 
       class BaseFormatter
+        include Helpers
         attr_accessor :example_group
         attr_reader :example_count, :duration, :examples
 
@@ -98,6 +99,7 @@ module Rspec
 
         def backtrace_line(line)
           return nil if configuration.cleaned_from_backtrace?(line)
+          line.sub!(File.expand_path("."), ".")
           line.sub!(/\A([^:]+:\d+)$/, '\\1')
           return nil if line == '-e:1'
           line
@@ -122,4 +124,4 @@ module Rspec
     end
   end
 
-end
+end

data/lib/rspec/core/formatters/base_text_formatter.rb

@@ -31,12 +31,13 @@ module Rspec
         def colorise(s, failure)
           red(s)
         end
-
+        
         def dump_summary
           failure_count = failed_examples.size
           pending_count = pending_examples.size
+          
 
-          output.puts "\nFinished in #{duration} seconds\n"
+            output.puts "\nFinished in #{format_seconds(duration)} seconds\n"
 
           summary = "#{example_count} example#{'s' unless example_count == 1}, #{failure_count} failures"
           summary << ", #{pending_count} pending" if pending_count > 0  
@@ -56,7 +57,7 @@ module Rspec
             sorted_examples = examples.sort_by { |example| example.execution_result[:run_time] }.reverse.first(10)
             output.puts "\nTop #{sorted_examples.size} slowest examples:\n"        
             sorted_examples.each do |example|
-              output.puts "  (#{sprintf("%.7f", example.execution_result[:run_time])} seconds) #{example}"
+              output.puts "  (#{format_seconds(duration, 7)} seconds) #{example}"
               output.puts grey("   # #{format_caller(example.metadata[:caller])}")
             end
           end
@@ -64,11 +65,6 @@ module Rspec
           output.flush
         end
 
-        # def textmate_link_backtrace(path)
-        #   file, line = path.split(':')
-        #   "txmt://open/?url=file://#{File.expand_path(file)}&line=#{line}"
-        # end
-
         def format_caller(caller_info)
           caller_info.to_s.split(':in `block').first
         end

data/lib/rspec/core/formatters/helpers.rb

@@ -0,0 +1,27 @@
+module Rspec
+
+  module Core
+
+    module Formatters
+
+      module Helpers
+        SUB_SECOND_PRECISION = 5
+        DEFAULT_PRECISION = 2
+        
+        def format_seconds(float, precision = nil)
+          precision ||= (float < 1) ? SUB_SECOND_PRECISION : DEFAULT_PRECISION
+          formatted = sprintf("%.#{precision}f", float)
+          strip_trailing_zeroes(formatted)
+        end
+        
+        def strip_trailing_zeroes(string)
+          string.sub(/[^1-9]+$/, '')
+        end
+        
+      end
+      
+    end
+    
+  end
+  
+end

data/lib/rspec/core/metadata.rb

@@ -130,19 +130,24 @@ EOM
       end
 
       def file_path_from(metadata, given_file_path=nil)
-        given_file_path || file_and_line_number(metadata)[0].strip
+        return given_file_path if given_file_path
+        file = file_and_line_number(metadata)[0] if file_and_line_number(metadata)
+        file.strip if file
       end
 
       def line_number_from(metadata, given_line_number=nil)
-        given_line_number || file_and_line_number(metadata)[1].to_i
+        return given_line_number if given_line_number
+        line_number = file_and_line_number(metadata)[1] if file_and_line_number(metadata)
+        line_number && line_number.to_i
       end
-
+      
       def location_from(metadata)
         "#{metadata[:file_path]}:#{metadata[:line_number]}"
       end
 
       def file_and_line_number(metadata)
-        candidate_entries_from_caller(metadata).first.split(':')
+        entry = candidate_entries_from_caller(metadata).first
+        entry && entry.split(":")
       end
 
       def candidate_entries_from_caller(metadata)

data/lib/rspec/core/mocking/with_absolutely_nothing.rb

@@ -1,13 +1,11 @@
 module Rspec
   module Core
-    module Mocking
-      module WithAbsolutelyNothing
+    module MockFrameworkAdapter
 
-        def _setup_mocks; end
-        def _verify_mocks; end
-        def _teardown_mocks; end
+      def _setup_mocks; end
+      def _verify_mocks; end
+      def _teardown_mocks; end
 
-      end
     end
   end
-end
+end

data/lib/rspec/core/mocking/with_flexmock.rb

@@ -7,19 +7,19 @@ require 'flexmock/rspec'
 
 module Rspec
   module Core
-    module Mocking
-      module WithFlexmock
-        include FlexMock::MockContainer
-        def setup_mocks_for_rspec
-          # No setup required
-        end
-        def verify_mocks_for_rspec
-          flexmock_verify
-        end
-        def teardown_mocks_for_rspec
-          flexmock_close
-        end
+    module MockFrameworkAdapter
+
+      include FlexMock::MockContainer
+      def setup_mocks_for_rspec
+        # No setup required
+      end
+      def verify_mocks_for_rspec
+        flexmock_verify
       end
+      def teardown_mocks_for_rspec
+        flexmock_close
+      end
+
     end
   end
-end
+end

data/lib/rspec/core/mocking/with_mocha.rb

@@ -3,20 +3,19 @@ require 'mocha/object'
 
 module Rspec
   module Core
-    module Mocking
-      module WithMocha
-        # Mocha::Standalone was deprecated as of Mocha 0.9.7.  
-        begin
-          include Mocha::API
-        rescue NameError
-          include Mocha::Standalone
-        end
-        
-        alias :_setup_mocks :mocha_setup
-        alias :_verify_mocks :mocha_verify
-        alias :_teardown_mocks :mocha_teardown
+    module MockFrameworkAdapter
 
+      # Mocha::Standalone was deprecated as of Mocha 0.9.7.  
+      begin
+        include Mocha::API
+      rescue NameError
+        include Mocha::Standalone
       end
+      
+      alias :_setup_mocks :mocha_setup
+      alias :_verify_mocks :mocha_verify
+      alias :_teardown_mocks :mocha_teardown
+
     end
   end
-end
+end

data/lib/rspec/core/mocking/with_rr.rb

@@ -4,23 +4,22 @@ Rspec.configuration.backtrace_clean_patterns.push(RR::Errors::BACKTRACE_IDENTIFI
 
 module Rspec
   module Core
-    module Mocking
-      module WithRR
-        include RR::Extensions::InstanceMethods
+    module MockFrameworkAdapter
 
-        def _setup_mocks
-          RR::Space.instance.reset
-        end
+      include RR::Extensions::InstanceMethods
 
-        def _verify_mocks
-          RR::Space.instance.verify_doubles
-        end
+      def _setup_mocks
+        RR::Space.instance.reset
+      end
 
-        def _teardown_mocks
-          RR::Space.instance.reset
-        end
+      def _verify_mocks
+        RR::Space.instance.verify_doubles
+      end
 
+      def _teardown_mocks
+        RR::Space.instance.reset
       end
+
     end
   end
-end
+end

data/lib/rspec/core/mocking/with_rspec.rb

@@ -3,19 +3,19 @@ require 'rspec/mocks/extensions'
 
 module Rspec
   module Core
-    module Mocking
-      module WithRspec
-        include Rspec::Mocks::ExampleMethods
-        def _setup_mocks
-          $rspec_mocks ||= Rspec::Mocks::Space.new
-        end
-        def _verify_mocks
-          $rspec_mocks.verify_all
-        end
-        def _teardown_mocks
-          $rspec_mocks.reset_all
-        end
+    module MockFrameworkAdapter
+
+      include Rspec::Mocks::ExampleMethods
+      def _setup_mocks
+        $rspec_mocks ||= Rspec::Mocks::Space.new
+      end
+      def _verify_mocks
+        $rspec_mocks.verify_all
       end
+      def _teardown_mocks
+        $rspec_mocks.reset_all
+      end
+
     end
   end
 end

data/lib/rspec/core/runner.rb

@@ -29,6 +29,8 @@ module Rspec
         Rspec::Core::CommandLineOptions.parse(args).apply(configuration)
 
         require_all_files(configuration)
+
+        configuration.configure_mock_framework
         
         total_examples_to_run = Rspec::Core.world.total_examples_to_run
 

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.4"
+  s.version = "2.0.0.beta.5"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-03-15}
+  s.date = %q{2010-04-04}
   s.description = %q{Rspec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
@@ -111,6 +111,7 @@ Gem::Specification.new do |s|
      "lib/rspec/core/formatters/base_formatter.rb",
      "lib/rspec/core/formatters/base_text_formatter.rb",
      "lib/rspec/core/formatters/documentation_formatter.rb",
+     "lib/rspec/core/formatters/helpers.rb",
      "lib/rspec/core/formatters/progress_formatter.rb",
      "lib/rspec/core/hooks.rb",
      "lib/rspec/core/kernel_extensions.rb",
@@ -139,7 +140,9 @@ Gem::Specification.new do |s|
      "spec/rspec/core/example_group_subject_spec.rb",
      "spec/rspec/core/example_spec.rb",
      "spec/rspec/core/formatters/base_formatter_spec.rb",
+     "spec/rspec/core/formatters/base_text_formatter_spec.rb",
      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
+     "spec/rspec/core/formatters/helpers_spec.rb",
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/metadata_spec.rb",
@@ -163,7 +166,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.4
+  Thank you for installing rspec-core-2.0.0.beta.5
 
   This is beta software. If you are looking
   for a supported production release, please
@@ -175,7 +178,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-core-2.0.0.beta.4}
+  s.summary = %q{rspec-core-2.0.0.beta.5}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
@@ -185,7 +188,9 @@ Gem::Specification.new do |s|
      "spec/rspec/core/example_group_subject_spec.rb",
      "spec/rspec/core/example_spec.rb",
      "spec/rspec/core/formatters/base_formatter_spec.rb",
+     "spec/rspec/core/formatters/base_text_formatter_spec.rb",
      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
+     "spec/rspec/core/formatters/helpers_spec.rb",
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/metadata_spec.rb",
@@ -211,19 +216,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.4"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.5"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.5"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_development_dependency(%q<autotest>, [">= 4.2.9"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.4"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.5"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.5"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_dependency(%q<autotest>, [">= 4.2.9"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.4"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.4"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.5"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.5"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/autotest/rspec_spec.rb

@@ -1,31 +1,13 @@
 require "spec_helper"
 
-describe Autotest::Rspec do
-  describe "adding spec.opts --options" do 
-    before(:each) do
-      @rspec_autotest = Autotest::Rspec2.new
-    end
-
-    it "should return the command line option to add spec.opts if the options file exists" do
-      File.stub!(:exist?).and_return true
-      @rspec_autotest.add_options_if_present.should == "-O spec/spec.opts "
-    end
-
-    it "should return an empty string if no spec.opts exists" do
-      File.stub!(:exist?).and_return false
-      Autotest::Rspec2.new.add_options_if_present.should == ""
-    end
-  end  
-
+describe Autotest::Rspec2 do
   describe "commands" do
     before(:each) do
       @rspec_autotest = Autotest::Rspec2.new
       @rspec_autotest.stub!(:ruby).and_return "ruby"
-      @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts"
     
       @ruby = @rspec_autotest.ruby
       @spec_cmd = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec'))
-      @options = @rspec_autotest.add_options_if_present
       files = %w[file_one file_two]
       @files_to_test = {
         files[0] => [],
@@ -38,7 +20,7 @@ describe Autotest::Rspec do
   
     it "should make the appropriate test command" do
       actual = @rspec_autotest.make_test_cmd(@files_to_test)
-      expected = /#{@ruby} #{@spec_cmd} (.*) #{@options}/
+      expected = /#{@ruby}.*#{@spec_cmd} (.*)/
 
       actual.should match(expected)
 

data/spec/rspec/core/configuration_spec.rb

@@ -6,28 +6,34 @@ module Rspec::Core
 
     let(:config) { Configuration.new }
 
-    context "setting the mock framework" do
+    describe "#mock_framework_class" do
+      before(:each) do
+        config.stub(:require)
+      end
 
-      it "requires and includes the rspec adapter when the mock_framework is :rspec" do
+      it "defaults to :rspec" do
         config.should_receive(:require).with('rspec/core/mocking/with_rspec')
-        ExampleGroup.should_receive(:send)
-        config.mock_framework = :rspec
+        config.require_mock_framework_adapter
       end
 
-      it "supports mock_with for backward compatibility with rspec-1.x" do
-        config.stub!(:require)
-        ExampleGroup.stub!(:send)
-        config.mock_with :rspec
+      [:rspec, :mocha, :rr, :flexmock].each do |framework|
+        it "uses #{framework.inspect} framework when set explicitly" do
+          config.should_receive(:require).with("rspec/core/mocking/with_#{framework}")
+          config.mock_framework = framework
+          config.require_mock_framework_adapter
+        end
       end
-      
-      it "includes the null adapter when the mock_framework is not :rspec, :mocha, or :rr" do
-        ExampleGroup.should_receive(:send).with(:include, Mocking::WithAbsolutelyNothing)
+
+      it "uses the null adapter when set to any unknown key" do
+        config.should_receive(:require).with('rspec/core/mocking/with_absolutely_nothing')
         config.mock_framework = :crazy_new_mocking_framework_ive_not_yet_heard_of
+        config.require_mock_framework_adapter
       end
 
-      pending "includes the rspec adapter when the mock_framework is not set" do
-        ExampleGroup.stub!(:send)
-        config.mock_framework.should == :rspec
+      it "supports mock_with for backward compatibility with rspec-1.x" do
+        config.should_receive(:require).with('rspec/core/mocking/with_rspec')
+        config.mock_with :rspec
+        config.require_mock_framework_adapter
       end
       
     end  
@@ -231,6 +237,19 @@ module Rspec::Core
       end
     end
 
+
+    context "transactional examples" do
+      it "defaults to use transactional examples" do
+          config.use_transactional_examples?.should be_true
+      end
+      describe "#use_transactional_examples=" do
+        it "remembers that I don't want transactional exmaples" do
+          config.use_transactional_examples = false
+          config.use_transactional_examples?.should be_false
+        end
+      end
+    end
+
   end
 
 end

data/spec/rspec/core/formatters/base_formatter_spec.rb

@@ -37,9 +37,13 @@ describe Rspec::Core::Formatters::BaseFormatter do
   end
   
   describe '#format_backtrace' do
-    
     it "displays the full backtrace when the example is given the :full_backtrace => true option", :full_backtrace => true
-    
+  end
+
+  describe "backtrace_line" do
+    it "trims current working directory" do
+      formatter.__send__(:backtrace_line, File.expand_path(__FILE__)).should == "./spec/rspec/core/formatters/base_formatter_spec.rb"
+    end
   end
   
 end

data/spec/rspec/core/formatters/base_text_formatter_spec.rb

@@ -0,0 +1,5 @@
+require "spec_helper"
+
+describe Rspec::Core::Formatters::BaseTextFormatter do
+  
+end

data/spec/rspec/core/formatters/helpers_spec.rb

@@ -0,0 +1,38 @@
+require 'spec_helper'
+require 'stringio'
+
+describe Rspec::Core::Formatters::Helpers do
+  let(:helper) { helper = Object.new.extend(Rspec::Core::Formatters::Helpers) }
+
+  describe "format seconds" do
+    pending "uses passed in precision if specified" do
+      # can't get regex right to handle this case where we don't want it to consume all zeroes
+      helper.format_seconds(0.00005, 2).should == "0.00"
+    end
+    
+    context "sub second times" do
+      it "returns 5 digits of precision" do
+        helper.format_seconds(0.000005).should == "0.00001"
+      end
+
+      it "strips off trailing zeroes" do
+        helper.format_seconds(0.02000).should == "0.02"
+      end
+    end
+
+    context "second and greater times" do
+
+      it "returns 2 digits of precision" do
+        helper.format_seconds(50.330340).should == "50.33"
+      end
+
+      it "returns human friendly elasped time" do
+        helper.format_seconds(50.1).should == "50.1"
+        helper.format_seconds(5).should == "5"
+        helper.format_seconds(5.0).should == "5"
+      end
+    end    
+  end
+
+  
+end

data/spec/rspec/core/metadata_spec.rb

@@ -4,7 +4,7 @@ module Rspec
   module Core
     describe Metadata do
 
-      describe "#process" do
+      describe "process" do
         Metadata::RESERVED_KEYS.each do |key|
           it "prohibits :#{key} as a hash key" do
             m = Metadata.new
@@ -15,7 +15,7 @@ module Rspec
         end
       end
 
-      describe "[:description]" do
+      describe "description" do
         it "just has the example description" do
           m = Metadata.new
           m.process('group')
@@ -25,7 +25,7 @@ module Rspec
         end
       end
 
-      describe "[:full_description]" do
+      describe "full description" do
         it "concats the example group name and description" do
           m = Metadata.new
           m.process('group')
@@ -35,7 +35,7 @@ module Rspec
         end
       end
 
-      describe "[:example_group][:description]" do
+      describe "description" do
         context "with a string" do
           it "provides the submitted description" do
             m = Metadata.new
@@ -64,7 +64,7 @@ module Rspec
         end
       end
 
-      describe "[:example_group][:full_description]" do
+      describe "full description" do
         it "concats the nested example group descriptions" do
           parent = Metadata.new
           parent.process(Object, 'parent')
@@ -76,7 +76,7 @@ module Rspec
         end
       end
 
-      describe "#determine_file_path" do
+      describe "file path" do
         it "finds the first spec file in the caller array" do
           m = Metadata.new
           m.process(:caller => [
@@ -87,9 +87,18 @@ module Rspec
           ])
           m[:example_group][:file_path].should == __FILE__
         end
+        it "is nil if there are no spec files found", :full_backtrace => true do
+          m = Metadata.new
+          m.process(:caller => [
+            "foo",
+            "metadata_example.rb:#{__LINE__}",
+            "baz"
+          ])
+          m[:example_group][:file_path].should be_nil
+        end
       end
 
-      describe "#determine_line_number" do
+      describe "line number" do
         it "finds the line number with the first spec file " do
           m = Metadata.new
           m.process(:caller => [
@@ -112,7 +121,7 @@ module Rspec
         end
       end
 
-      describe "#metadata_for_example" do
+      describe "metadata for example" do
         let(:caller_for_example) { caller(0) }
         let(:line_number)        { __LINE__ - 1 }
         let(:metadata)           { Metadata.new.process("group description") }
@@ -151,7 +160,7 @@ module Rspec
         end
       end
 
-      describe "#apply_condition" do
+      describe "apply_condition" do
         let(:group_metadata) { Metadata.new.process('group', :caller => ["foo_spec.rb:#{__LINE__}"]) }
         let(:group_line_number) { __LINE__ -1 }
         let(:example_metadata) { group_metadata.for_example('example', :caller => ["foo_spec.rb:#{__LINE__}"]) }

data/spec/rspec/core/shared_example_group_spec.rb

@@ -144,10 +144,10 @@ module Rspec::Core
       end
 
       describe "running shared examples" do
-        module RunningSharedExamplesJustForTesting; end
+        module ::RunningSharedExamplesJustForTesting; end
 
         share_examples_for("it runs shared examples") do
-          include RunningSharedExamplesJustForTesting
+          include ::RunningSharedExamplesJustForTesting
 
           class << self
             def magic

data/spec/spec_helper.rb

@@ -9,13 +9,11 @@ require 'rspec/mocks'
 begin
   require 'autotest'
 rescue LoadError
-  raise "You must install ZenTest to use autotest"
+  raise "You must install autotest to use it"
 end
 
 require 'autotest/rspec2'
 
-Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
-
 Dir['./spec/support/**/*.rb'].map {|f| require f}
 
 module Rspec
@@ -45,7 +43,6 @@ def in_editor?
 end
 
 Rspec.configure do |c|
-  c.mock_framework = :rspec
   c.color_enabled = !in_editor?
   c.exclusion_filter = { :ruby => lambda {|version|
     !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 4
-  version: 2.0.0.beta.4
+  - 5
+  version: 2.0.0.beta.5
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-15 00:00:00 -05:00
+date: 2010-04-04 00:00:00 -03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 4
-        version: 2.0.0.beta.4
+        - 5
+        version: 2.0.0.beta.5
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 4
-        version: 2.0.0.beta.4
+        - 5
+        version: 2.0.0.beta.5
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -184,6 +184,7 @@ files:
 - lib/rspec/core/formatters/base_formatter.rb
 - lib/rspec/core/formatters/base_text_formatter.rb
 - lib/rspec/core/formatters/documentation_formatter.rb
+- lib/rspec/core/formatters/helpers.rb
 - lib/rspec/core/formatters/progress_formatter.rb
 - lib/rspec/core/hooks.rb
 - lib/rspec/core/kernel_extensions.rb
@@ -212,7 +213,9 @@ files:
 - spec/rspec/core/example_group_subject_spec.rb
 - spec/rspec/core/example_spec.rb
 - spec/rspec/core/formatters/base_formatter_spec.rb
+- spec/rspec/core/formatters/base_text_formatter_spec.rb
 - spec/rspec/core/formatters/documentation_formatter_spec.rb
+- spec/rspec/core/formatters/helpers_spec.rb
 - spec/rspec/core/formatters/progress_formatter_spec.rb
 - spec/rspec/core/kernel_extensions_spec.rb
 - spec/rspec/core/metadata_spec.rb
@@ -239,7 +242,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.beta.4
+    Thank you for installing rspec-core-2.0.0.beta.5
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -273,7 +276,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.4
+summary: rspec-core-2.0.0.beta.5
 test_files: 
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
@@ -283,7 +286,9 @@ test_files:
 - spec/rspec/core/example_group_subject_spec.rb
 - spec/rspec/core/example_spec.rb
 - spec/rspec/core/formatters/base_formatter_spec.rb
+- spec/rspec/core/formatters/base_text_formatter_spec.rb
 - spec/rspec/core/formatters/documentation_formatter_spec.rb
+- spec/rspec/core/formatters/helpers_spec.rb
 - spec/rspec/core/formatters/progress_formatter_spec.rb
 - spec/rspec/core/kernel_extensions_spec.rb
 - spec/rspec/core/metadata_spec.rb