rspec-core 2.0.0.beta.22 → 2.0.0.rc

data/features/filtering/run_all_when_everything_filtered.feature

@@ -0,0 +1,46 @@
+Feature: run all when everything filtered
+
+  Use the run_all_when_everything_filtered configuration option to do just
+  that.  This works well when paired with an inclusion filter like ":focus =>
+  true", as it will run all the examples when none match the inclusion filter.
+
+  Background:
+    Given a file named "spec/spec_helper.rb" with:
+      """
+      RSpec.configure do |c|
+        c.filter_run :focus => true
+        c.run_all_when_everything_filtered = true
+      end
+      """
+
+  Scenario: no examples match filter (runs all examples)
+    Given a file named "spec/sample_spec.rb" with:
+      """
+      require "spec_helper"
+
+      describe "group 1" do
+        it "group 1 example 1" do
+        end
+
+        it "group 1 example 2" do
+        end
+      end
+
+      describe "group 2" do
+        it "group 2 example 1" do
+        end
+      end
+      """
+    When I run "rspec spec/sample_spec.rb --format doc"
+    Then the output should contain "No examples were matched by {:focus=>true}, running all"
+    And the output should contain "3 examples, 0 failures"
+    And the output should contain:
+      """
+      group 1
+        group 1 example 1
+        group 1 example 2
+
+      group 2
+        group 2 example 1
+      """
+

data/features/hooks/before_and_after_hooks.feature

@@ -114,15 +114,33 @@ Feature: before and after hooks
         after(:all) do
           puts "after all ran"
         end
+
+        describe "nested group" do
+          it "fails this third example" do
+          end
+
+          it "fails this fourth example" do
+          end
+
+          describe "yet another level deep" do
+            it "fails this last example" do
+            end
+          end
+        end
       end
       """
     When I run "rspec ./before_all_spec.rb --format documentation"
-    Then the output should contain "2 examples, 2 failures"
+    Then the output should contain "5 examples, 5 failures"
     And the output should contain:
       """
       an error in before(:all)
         fails this example (FAILED - 1)
         fails this example, too (FAILED - 2)
+        nested group
+          fails this third example (FAILED - 3)
+          fails this fourth example (FAILED - 4)
+          yet another level deep
+            fails this last example (FAILED - 5)
       after all ran
       """
 
@@ -132,6 +150,8 @@ Feature: before and after hooks
       """
       an error in before(:all)
         fails this example, too (FAILED - 1)
+        nested group
+          yet another level deep
       after all ran
       """
 

data/features/pending/pending_examples.feature

@@ -1,6 +1,6 @@
 Feature: pending examples
 
-  RSpec offers three ways to indicate that an example is disabled pending
+  RSpec offers four ways to indicate that an example is disabled pending
   some action.
 
   Scenario: pending implementation
@@ -10,7 +10,7 @@ Feature: pending examples
         it "is a pending example"
       end
       """
-    When I run "rspec ./example_without_block_spec.rb"
+    When I run "rspec example_without_block_spec.rb"
     Then the exit status should be 0
     And the output should contain "1 example, 0 failures, 1 pending"
     And the output should contain "Not Yet Implemented"
@@ -26,7 +26,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec ./pending_without_block_spec.rb"
+    When I run "rspec pending_without_block_spec.rb"
     Then the exit status should be 0
     And the output should contain "1 example, 0 failures, 1 pending"
     And the output should contain:
@@ -48,7 +48,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec ./pending_with_failing_block_spec.rb"
+    When I run "rspec pending_with_failing_block_spec.rb"
     Then the exit status should be 0
     And the output should contain "1 example, 0 failures, 1 pending"
     And the output should contain:
@@ -70,9 +70,28 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec ./pending_with_passing_block_spec.rb"
+    When I run "rspec pending_with_passing_block_spec.rb"
     Then the exit status should not be 0
     And the output should contain "1 example, 1 failure"
     And the output should contain "FIXED"
     And the output should contain "Expected pending 'something else getting finished' to fail. No Error was raised."
     And the output should contain "pending_with_passing_block_spec.rb:3"
+
+  Scenario: temporarily pending by changing "it" to "xit"
+    Given a file named "pending_with_xit_spec.rb" with:
+      """
+      describe "an example" do
+        xit "is pending using xit" do
+          true.should be(true)
+        end
+      end
+      """
+     When I run "rspec pending_with_xit_spec.rb"
+     Then the exit status should be 0
+      And the output should contain "1 example, 0 failures, 1 pending"
+      And the output should contain:
+      """
+      Pending:
+        an example is pending using xit
+      """
+

data/lib/rspec/autorun.rb

@@ -0,0 +1,2 @@
+require 'rspec/core'
+RSpec::Core::Runner.autorun

data/lib/rspec/core.rb

@@ -2,7 +2,6 @@ require 'rspec/core/extensions'
 require 'rspec/core/load_path'
 require 'rspec/core/deprecation'
 require 'rspec/core/reporter'
-require 'rspec/core/formatters'
 
 require 'rspec/core/hooks'
 require 'rspec/core/subject'
@@ -10,7 +9,6 @@ require 'rspec/core/let'
 require 'rspec/core/metadata'
 require 'rspec/core/pending'
 
-require 'rspec/core/around_proxy'
 require 'rspec/core/world'
 require 'rspec/core/configuration'
 require 'rspec/core/command_line_configuration'
@@ -49,8 +47,12 @@ module RSpec
 
   end
 
-  class << self
-    attr_accessor :wants_to_quit
+  def self.wants_to_quit
+    world.wants_to_quit
+  end
+
+  def self.wants_to_quit=(maybe)
+    world.wants_to_quit=(maybe)
   end
 
   def self.world

data/lib/rspec/core/configuration.rb

@@ -20,10 +20,12 @@ module RSpec
       add_setting :error_stream
       add_setting :output_stream
       add_setting :output, :alias => :output_stream
+      add_setting :out, :alias => :output_stream
       add_setting :drb
       add_setting :drb_port
       add_setting :color_enabled
       add_setting :profile_examples
+      add_setting :fail_fast, :default => false
       add_setting :run_all_when_everything_filtered
       add_setting :mock_framework, :default => :rspec
       add_setting :filter
@@ -31,7 +33,6 @@ module RSpec
       add_setting :filename_pattern, :default => '**/*_spec.rb'
       add_setting :files_to_run
       add_setting :include_or_extend_modules
-      add_setting :formatter_class, :default => RSpec::Core::Formatters::ProgressFormatter
       add_setting :backtrace_clean_patterns
 
       def initialize
@@ -180,30 +181,20 @@ EOM
         filter_run :full_description => /#{description}/
       end
 
-      def formatter=(formatter_to_use)
-        if string_const?(formatter_to_use) && (class_name = eval(formatter_to_use)).is_a?(Class)
-          formatter_class = class_name
-        elsif formatter_to_use.is_a?(Class)
-          formatter_class = formatter_to_use
-        else
-          formatter_class = case formatter_to_use.to_s
-          when 'd', 'doc', 'documentation', 's', 'n', 'spec', 'nested'
-            RSpec::Core::Formatters::DocumentationFormatter
-          when 'h', 'html'
-            RSpec::Core::Formatters::HtmlFormatter
-          when 't', 'textmate'
-            RSpec::Core::Formatters::TextMateFormatter
-          when 'p', 'progress'
-            RSpec::Core::Formatters::ProgressFormatter
-          else
-            raise ArgumentError, "Formatter '#{formatter_to_use}' unknown - maybe you meant 'documentation' or 'progress'?."
-          end
-        end
-        self.formatter_class = formatter_class
+      attr_writer :formatter_class
+
+      def formatter_class
+        @formatter_class ||= begin
+                               require 'rspec/core/formatters/progress_formatter'
+                               RSpec::Core::Formatters::ProgressFormatter
+                             end
       end
 
-      def string_const?(str)
-        str.is_a?(String) && /\A[A-Z][a-zA-Z0-9_:]*\z/ =~ str
+      def formatter=(formatter_to_use)
+        self.formatter_class = 
+          built_in_formatter(formatter_to_use) ||
+          custom_formatter(formatter_to_use) ||
+          (raise ArgumentError, "Formatter '#{formatter_to_use}' unknown - maybe you meant 'documentation' or 'progress'?.")
       end
 
       def formatter
@@ -307,6 +298,61 @@ EOM
       def load_spec_files
         files_to_run.map {|f| load File.expand_path(f) }
       end
+
+    private
+
+      def built_in_formatter(key)
+        case key.to_s
+        when 'd', 'doc', 'documentation', 's', 'n', 'spec', 'nested'
+          require 'rspec/core/formatters/documentation_formatter'
+          RSpec::Core::Formatters::DocumentationFormatter
+        when 'h', 'html'
+          require 'rspec/core/formatters/html_formatter'
+          RSpec::Core::Formatters::HtmlFormatter
+        when 't', 'textmate'
+          require 'rspec/core/formatters/text_mate_formatter'
+          RSpec::Core::Formatters::TextMateFormatter
+        when 'p', 'progress'
+          require 'rspec/core/formatters/progress_formatter'
+          RSpec::Core::Formatters::ProgressFormatter
+        end
+      end
+
+      def custom_formatter(formatter_ref)
+        if Class === formatter_ref
+          formatter_ref
+        elsif string_const?(formatter_ref)
+          begin
+            eval(formatter_ref)
+          rescue NameError
+            require path_for(formatter_ref)
+            eval(formatter_ref)
+          end
+        end
+      end
+
+      def string_const?(str)
+        str.is_a?(String) && /\A[A-Z][a-zA-Z0-9_:]*\z/ =~ str
+      end
+
+      def path_for(const_ref)
+        underscore_with_fix_for_non_standard_rspec_naming(const_ref)
+      end
+
+      def underscore_with_fix_for_non_standard_rspec_naming(string)
+        underscore(string).sub(%r{(^|/)r_spec($|/)}, '\\1rspec\\2') 
+      end
+
+      # activesupport/lib/active_support/inflector/methods.rb, line 48
+      def underscore(camel_cased_word)
+        word = camel_cased_word.to_s.dup
+        word.gsub!(/::/, '/')
+        word.gsub!(/([A-Z]+)([A-Z][a-z])/,'\1_\2')
+        word.gsub!(/([a-z\d])([A-Z])/,'\1_\2')
+        word.tr!("-", "_")
+        word.downcase!
+        word
+      end
     end
   end
 end

data/lib/rspec/core/configuration_options.rb

@@ -84,6 +84,7 @@ module RSpec
       end
       
       def options_file_as_erb_string(path)
+        require 'erb'
         ERB.new(IO.read(path)).result(binding)
       end
 

data/lib/rspec/core/example.rb

@@ -37,7 +37,6 @@ module RSpec
       end
 
       def run(example_group_instance, reporter)
-        return if RSpec.wants_to_quit
         @example_group_instance = example_group_instance
         @example_group_instance.example = self
 

data/lib/rspec/core/example_group.rb

@@ -20,7 +20,8 @@ module RSpec
       end
 
       def self.inherited(klass)
-        world.example_groups << klass if klass.superclass == ExampleGroup
+        RSpec::Core::Runner.autorun
+        world.example_groups << klass if klass.top_level?
       end
 
       class << self
@@ -59,6 +60,7 @@ module RSpec
       alias_example_to :specify
       alias_example_to :focused, :focused => true
       alias_example_to :pending, :pending => true
+      alias_example_to :xit,     :pending => true
 
       def self.define_shared_group_method(new_name, report_label=nil)
         module_eval(<<-END_RUBY, __FILE__, __LINE__)
@@ -93,7 +95,7 @@ module RSpec
       end
 
       def self.descendant_filtered_examples
-        filtered_examples + children.collect{|c| c.descendant_filtered_examples}
+        @descendant_filtered_examples ||= filtered_examples + children.collect{|c| c.descendant_filtered_examples}.flatten
       end
 
       def self.metadata
@@ -101,7 +103,7 @@ module RSpec
       end
 
       def self.superclass_metadata
-        self.superclass.respond_to?(:metadata) ? self.superclass.metadata : nil
+        @superclass_metadata ||= self.superclass.respond_to?(:metadata) ? self.superclass.metadata : nil
       end
 
       def self.describe(*args, &example_group_block)
@@ -136,7 +138,7 @@ module RSpec
       end
 
       def self.descendants
-        [self] + children.collect {|c| c.descendants}.flatten
+        @_descendants ||= [self] + children.collect {|c| c.descendants}.flatten
       end
 
       def self.ancestors
@@ -144,7 +146,7 @@ module RSpec
       end
 
       def self.top_level?
-        ancestors.size == 1
+        @top_level ||= superclass == ExampleGroup
       end
 
       def self.set_it_up(*args)
@@ -199,7 +201,7 @@ module RSpec
       end
 
       def self.around_hooks
-        (world.find_hook(:around, :each, self) + ancestors.reverse.map{|a| a.find_hook(:around, :each, self)}).flatten
+        @around_hooks ||= (world.find_hook(:around, :each, self) + ancestors.reverse.map{|a| a.find_hook(:around, :each, self)}).flatten
       end
 
       def self.run(reporter)
@@ -226,13 +228,26 @@ module RSpec
 
       def self.fail_filtered_examples(exception, reporter)
         filtered_examples.each { |example| example.fail_fast(reporter, exception) }
+
+        children.each do |child|
+          reporter.example_group_started(child)
+          child.fail_filtered_examples(exception, reporter)
+          reporter.example_group_finished(child)
+        end
+      end
+
+      def self.fail_fast?
+        RSpec.configuration.fail_fast?
       end
 
       def self.run_examples(instance, reporter)
         filtered_examples.map do |example|
+          next if RSpec.wants_to_quit
           begin
             set_ivars(instance, before_all_ivars)
-            example.run(instance, reporter)
+            succeeded = example.run(instance, reporter)
+            RSpec.wants_to_quit = true if fail_fast? && !succeeded
+            succeeded
           ensure
             clear_ivars(instance)
             clear_memoized(instance)
@@ -245,7 +260,7 @@ module RSpec
       end
 
       def self.declaration_line_numbers
-        [metadata[:example_group][:line_number]] +
+        @declaration_line_numbers ||= [metadata[:example_group][:line_number]] +
           examples.collect {|e| e.metadata[:line_number]} +
           children.collect {|c| c.declaration_line_numbers}.flatten
       end

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

@@ -1,3 +1,5 @@
+require 'rspec/core/formatters/helpers'
+
 module RSpec
   module Core
     module Formatters
@@ -117,12 +119,12 @@ module RSpec
         end
 
         def read_failed_line(exception, example)
-          original_file = example.file_path.to_s.downcase
-          matching_line = exception.backtrace.detect { |line| line.match(/(.+?):(\d+)(|:\d+)/)[1].downcase == original_file.downcase }
-
-          return "Unable to find matching line from backtrace" if matching_line.nil?
+          unless matching_line = find_failed_line(exception.backtrace, example.file_path)
+            return "Unable to find matching line from backtrace"
+          end
 
           file_path, line_number = matching_line.match(/(.+?):(\d+)(|:\d+)/)[1..2]
+
           if File.exist?(file_path)
             open(file_path, 'r') { |f| f.readlines[line_number.to_i - 1] }
           else
@@ -130,6 +132,14 @@ module RSpec
           end
         end
 
+        def find_failed_line(backtrace, path)
+          backtrace.detect { |line|
+            match = line.match(/(.+?):(\d+)(|:\d+)/)
+            match && match[1].downcase == path.downcase
+          }
+
+        end
+
         def start_sync_output
           @old_sync, output.sync = output.sync, true if output_supports_sync
         end