rspec-core 2.4.0 → 2.5.0

data/features/hooks/filtering.feature

@@ -1,11 +1,11 @@
-Feature: Global Hook Filtering
+Feature: filters
 
-  Before/After/Around hooks defined in the RSpec configuration block
-  can be filtered using metadata.  Arbitrary metadata can be applied
-  to an example or example group, and used to make a hook only apply
-  to examples with the given metadata.
+  `before`/`after`/`around` hooks defined in the RSpec configuration block can
+  be filtered using metadata.  Arbitrary metadata can be applied to an example
+  or example group, and used to make a hook only apply to examples with the
+  given metadata.
 
-  Scenario: Filter before(:each) hooks using arbitrary metadata
+  Scenario: filter `before(:each)` hooks using arbitrary metadata
     Given a file named "filter_before_each_hooks_spec.rb" with:
       """
       RSpec.configure do |config|
@@ -23,8 +23,7 @@ Feature: Global Hook Filtering
       end
       """
     When I run "rspec filter_before_each_hooks_spec.rb --format documentation"
-    Then the output should contain "4 examples, 0 failures"
-    And the output should contain:
+    Then the output should contain:
       """
       group 1
         example 1
@@ -38,7 +37,7 @@ Feature: Global Hook Filtering
         example 2
       """
 
-  Scenario: Filter after(:each) hooks using arbitrary metadata
+  Scenario: filter `after(:each)` hooks using arbitrary metadata
     Given a file named "filter_after_each_hooks_spec.rb" with:
       """
       RSpec.configure do |config|
@@ -56,8 +55,7 @@ Feature: Global Hook Filtering
       end
       """
     When I run "rspec filter_after_each_hooks_spec.rb --format documentation"
-    Then the output should contain "4 examples, 0 failures"
-    And the output should contain:
+    Then the output should contain:
       """
       group 1
         example 1
@@ -71,7 +69,7 @@ Feature: Global Hook Filtering
         example 2
       """
 
-  Scenario: Filter around(:each) hooks using arbitrary metadata
+  Scenario: filter around(:each) hooks using arbitrary metadata
     Given a file named "filter_around_each_hooks_spec.rb" with:
       """
       RSpec.configure do |config|
@@ -93,8 +91,7 @@ Feature: Global Hook Filtering
       end
       """
     When I run "rspec filter_around_each_hooks_spec.rb --format documentation"
-    Then the output should contain "4 examples, 0 failures"
-    And the output should contain:
+    Then the output should contain:
       """
       group 1
         example 1
@@ -111,7 +108,7 @@ Feature: Global Hook Filtering
         example 2
       """
 
-  Scenario: Filter before(:all) hooks using arbitrary metadata
+  Scenario: filter before(:all) hooks using arbitrary metadata
     Given a file named "filter_before_all_hooks_spec.rb" with:
       """
       RSpec.configure do |config|
@@ -127,10 +124,15 @@ Feature: Global Hook Filtering
         it("example 1") { }
         it("example 2") { }
       end
+
+      describe "group 3" do
+        describe "subgroup 1", :foo => :bar do
+          it("example 1") { }
+        end
+      end
       """
     When I run "rspec filter_before_all_hooks_spec.rb --format documentation"
-    Then the output should contain "4 examples, 0 failures"
-    And the output should contain:
+    Then the output should contain:
       """
       group 1
         example 1
@@ -140,9 +142,14 @@ Feature: Global Hook Filtering
       In hook
         example 1
         example 2
+
+      group 3
+        subgroup 1
+      In hook
+          example 1
       """
 
-  Scenario: Filter after(:all) hooks using arbitrary metadata
+  Scenario: filter after(:all) hooks using arbitrary metadata
     Given a file named "filter_after_all_hooks_spec.rb" with:
       """
       RSpec.configure do |config|
@@ -158,10 +165,15 @@ Feature: Global Hook Filtering
         it("example 1") { }
         it("example 2") { }
       end
+
+      describe "group 3" do
+        describe "subgroup 1", :foo => :bar do
+          it("example 1") { }
+        end
+      end
       """
     When I run "rspec filter_after_all_hooks_spec.rb --format documentation"
-    Then the output should contain "4 examples, 0 failures"
-    And the output should contain:
+    Then the output should contain:
       """
       group 1
         example 1
@@ -171,4 +183,9 @@ Feature: Global Hook Filtering
         example 1
         example 2
       In hook
+
+      group 3
+        subgroup 1
+          example 1
+      In hook
       """

data/features/metadata/described_class.feature

@@ -13,5 +13,5 @@ Feature: described class
       end
       """
     When I run "rspec ./spec/example_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 

data/features/mock_framework_integration/use_flexmock.feature

@@ -19,5 +19,5 @@ Feature: mock with flexmock
       end
       """
     When I run "rspec ./flexmock_example_spec.rb"
-    Then the output should contain "1 example, 0 failures" 
+    Then the examples should all pass 
     And the exit status should be 0

data/features/mock_framework_integration/use_mocha.feature

@@ -19,5 +19,5 @@ Feature: mock with mocha
       end
       """
     When I run "rspec ./mocha_example_spec.rb"
-    Then the output should contain "1 example, 0 failures" 
+    Then the examples should all pass 
     And the exit status should be 0

data/features/mock_framework_integration/use_rr.feature

@@ -19,5 +19,5 @@ Feature: mock with rr
       end
       """
     When I run "rspec ./rr_example_spec.rb"
-    Then the output should contain "1 example, 0 failures" 
+    Then the examples should all pass 
     And the exit status should be 0

data/features/mock_framework_integration/use_rspec.feature

@@ -19,5 +19,5 @@ Feature: mock with rspec
       end
       """
     When I run "rspec ./rspec_example_spec.rb"
-    Then the output should contain "1 example, 0 failures" 
+    Then the examples should all pass 
     And the exit status should be 0

data/features/spec_files/arbitrary_file_suffix.feature

@@ -10,4 +10,4 @@ Feature: arbitrary file suffix
       end
       """
     When I run "rspec a.spec"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/step_definitions/additional_cli_steps.rb

@@ -10,7 +10,7 @@ Then /^the output should not contain any of these:$/ do |table|
   end
 end
 
-Then /^the example(s)? should( all)? pass$/ do |*|
+Then /^the example(?:s)? should(?: all)? pass$/ do
   Then %q{the output should contain "0 failures"}
   Then %q{the exit status should be 0}
 end

data/features/subject/attribute_of_subject.feature

@@ -82,7 +82,7 @@ Feature: attribute of subject
       end
       """
     When I run "rspec example_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: specify value for key in a hash
     Given a file named "example_spec.rb" with:
@@ -99,4 +99,4 @@ Feature: attribute of subject
       end
       """
     When I run "rspec example_spec.rb"
-    Then the output should contain "2 examples, 0 failures"
+    Then the examples should all pass

data/features/subject/explicit_subject.feature

@@ -14,7 +14,7 @@ Feature: explicit subject
       end
       """
     When I run "rspec top_level_subject_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
@@ -29,7 +29,7 @@ Feature: explicit subject
       end
       """
     When I run "rspec nested_subject_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: access subject from before block
     Given a file named "top_level_subject_spec.rb" with:
@@ -43,7 +43,7 @@ Feature: explicit subject
       end
       """
     When I run "rspec top_level_subject_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: invoke helper method from subject block
     Given a file named "helper_subject_spec.rb" with:
@@ -59,7 +59,7 @@ Feature: explicit subject
       end
       """
     When I run "rspec helper_subject_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: subject block is invoked at most once per example
     Given a file named "nil_subject_spec.rb" with:
@@ -75,4 +75,4 @@ Feature: explicit subject
       end
       """
     When I run "rspec nil_subject_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/subject/implicit_receiver.feature

@@ -13,7 +13,7 @@ Feature: implicit receiver
       end
       """
     When I run "rspec example_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: explicit subject
     Given a file named "example_spec.rb" with:
@@ -26,4 +26,4 @@ Feature: implicit receiver
       end
       """
     When I run "rspec example_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/features/subject/implicit_subject.feature

@@ -13,7 +13,7 @@ Feature: implicit subject
       end
       """
     When I run "rspec ./top_level_subject_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
@@ -27,4 +27,4 @@ Feature: implicit subject
       end
       """
     When I run "rspec nested_subject_spec.rb"
-    Then the output should contain "1 example, 0 failures"
+    Then the examples should all pass

data/lib/autotest/rspec2.rb

@@ -1,19 +1,25 @@
 require 'autotest'
+require 'rspec/core/deprecation'
 
 class RSpecCommandError < StandardError; end
 
 class Autotest::Rspec2 < Autotest
 
-  SPEC_PROGRAM = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'rspec'))
+  attr_reader :cl_args, :skip_bundler
+  alias_method :skip_bundler?, :skip_bundler
+
+  SPEC_PROGRAM = File.expand_path('../../../bin/rspec', __FILE__)
 
   def initialize
-    super
+    super()
+    @cl_args = ARGV.dup << "--tty"
+    @skip_bundler = @cl_args.delete("--skip-bundler")
     clear_mappings
     setup_rspec_project_mappings
 
     # Example for Ruby 1.8: http://rubular.com/r/AOXNVDrZpx
     # Example for Ruby 1.9: http://rubular.com/r/85ag5AZ2jP
-    self.failed_results_re = /^\s*\d+\).*\n\s+Failure.*(\n\s+#\s(.*)?:\d+(?::.*)?)+$/m
+    self.failed_results_re = /^\s*\d+\).*\n\s+(?:\e\[\d*m)?Failure.*(\n(?:\e\[\d*m)?\s+#\s(.*)?:\d+(?::.*)?(?:\e\[\d*m)?)+$/m
     self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
   end
 
@@ -40,16 +46,9 @@ class Autotest::Rspec2 < Autotest
   end
 
   def make_test_cmd(files_to_test)
+    warn_about_bundler if rspec_wants_bundler? && !autotest_wants_bundler?
     files_to_test.empty? ? '' :
-      "#{bundle_exec}#{ruby} #{require_rubygems}-S #{SPEC_PROGRAM} --tty #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
-  end
-
-  def bundle_exec
-    using_bundler? ? "bundle exec " : ""
-  end
-
-  def require_rubygems
-    using_bundler? ? "" : defined?(:Gem) ? "-rrubygems " : " "
+      "#{prefix}#{ruby}#{suffix} -S #{SPEC_PROGRAM} #{cl_args.join(' ')} #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
   end
 
   def normalize(files_to_test)
@@ -59,8 +58,59 @@ class Autotest::Rspec2 < Autotest
     end
   end
 
+  def warn_about_bundler
+    RSpec.warn_deprecation <<-WARNING
+
+****************************************************************************
+DEPRECATION WARNING: you are using deprecated behaviour that will be removed
+from a future version of RSpec.
+
+RSpec's autotest extension is relying on the presence of a Gemfile in the
+project root directory to generate a command including 'bundle exec'.
+
+You have two options to suppress this message:
+
+If you want to include 'bundle exec' in the command, add a .autotest file to
+the project root with the following content:
+
+  require 'autotest/bundler'
+
+If you want to _not_include 'bundle exec' in the command, pass --skip-bundler
+to autotest as an extra argument, like this:
+
+  autotest -- --skip-bundler
+*****************************************************************
+WARNING
+  end
+
+  alias_method :autotest_prefix, :prefix
+
+  def rspec_prefix
+    (rspec_wants_bundler? && !autotest_wants_bundler?) ? "bundle exec " : ""
+  end
+
+  def prefix
+    skip_bundler? ? "#{rspec_prefix}#{autotest_prefix}".gsub("bundle exec","") : "#{rspec_prefix}#{autotest_prefix}"
+  end
+
+  def autotest_wants_bundler?
+    autotest_prefix =~ /bundle exec/
+  end
+
+  def suffix
+    using_bundler? ? "" : defined?(:Gem) ? " -rrubygems" : ""
+  end
+
+  def rspec_wants_bundler?
+    gemfile? && !skip_bundler?
+  end
+
   def using_bundler?
-    File.exists?('./Gemfile')
+    rspec_wants_bundler? || autotest_wants_bundler?
+  end
+
+  def gemfile?
+    File.exist?('./Gemfile')
   end
 
 end

data/lib/rspec/core/configuration.rb

@@ -368,7 +368,6 @@ EOM
 
         include_or_extend_modules.each do |include_or_extend, mod, filters|
           next unless filters.empty? || group.apply?(:any?, filters)
-          next if self.class < mod
           group.send(include_or_extend, mod)
         end
       end

data/lib/rspec/core/configuration_options.rb

@@ -31,20 +31,23 @@ module RSpec
 
       def drb_argv
         argv = []
-        argv << "--color"     if options[:color_enabled]
-        argv << "--profile"   if options[:profile_examples]
-        argv << "--backtrace" if options[:full_backtrace]
-        argv << "--tty"       if options[:tty]
-        argv << "--fail-fast"  if options[:fail_fast]
+        argv << "--color"        if options[:color_enabled]
+        argv << "--profile"      if options[:profile_examples]
+        argv << "--backtrace"    if options[:full_backtrace]
+        argv << "--tty"          if options[:tty]
+        argv << "--fail-fast"    if options[:fail_fast]
         argv << "--line_number"  << options[:line_number]             if options[:line_number]
-        argv << "--options"      << options[:custom_options_file]            if options[:custom_options_file]
+        argv << "--options"      << options[:custom_options_file]     if options[:custom_options_file]
         argv << "--example"      << options[:full_description].source if options[:full_description]
+        if options[:filter]
+          options[:filter].each_pair do |k, v|
+            argv << "--tag" << k.to_s
+          end
+        end
         if options[:formatters]
           options[:formatters].each do |pair|
-            argv << "--format" << pair.shift
-            unless pair.empty?
-              argv << "--out" << pair.shift
-            end
+            argv << "--format" << pair[0]
+            argv << "--out" << pair[1] if pair[1]
           end
         end
         (options[:libs] || []).each do |path|
@@ -65,8 +68,8 @@ module RSpec
                        options_to_merge << global_options
                        options_to_merge << local_options
                      end
-                     options_to_merge << env_options
                      options_to_merge << command_line_options
+                     options_to_merge << env_options
 
                      options_to_merge.inject do |merged, options|
                        merged.merge(options)
@@ -109,7 +112,7 @@ module RSpec
         config_string = options_file_as_erb_string(path)
         config_string.split(/\n+/).map {|l| l.split}.flatten
       end
-      
+
       def options_file_as_erb_string(path)
         require 'erb'
         ERB.new(IO.read(path)).result(binding)

data/lib/rspec/core/example.rb

@@ -75,12 +75,20 @@ module RSpec
         finish(reporter)
       end
 
-      class Procsy < Proc
+      def self.procsy(metadata, &block)
+        Proc.new(&block).extend(Procsy).with(metadata)
+      end
+
+      module Procsy
         attr_reader :metadata
-        alias_method :run, :call
-        def initialize(metadata, &block)
+
+        def self.extended(object)
+          def object.run; call; end
+        end
+
+        def with(metadata)
           @metadata = metadata
-          super(&block)
+          self
         end
       end
 
@@ -93,11 +101,11 @@ module RSpec
         end
       end
 
-      def with_around_hooks
+      def with_around_hooks(&block)
         if around_hooks.empty?
           yield
         else
-          @example_group_class.eval_around_eachs(self, Procsy.new(metadata)).call
+          @example_group_class.eval_around_eachs(self, Example.procsy(metadata, &block)).call
         end
       end