rspec-core 2.99.0.beta2 → 2.99.0.rc1

data/features/command_line/line_number_option.feature

@@ -27,17 +27,13 @@ Feature: --line_number option
 
       end
       """
-    When I run `rspec example_spec.rb --line_number 5 --format doc`
+    When I run `rspec example_spec.rb --line_number 5`
     Then the examples should all pass
-    And the output should contain "should be > 8"
-    But the output should not contain "should be < 10"
-    And the output should not contain "should be 3*3"
+    And the output should contain "1 example"
 
-    When I run `rspec example_spec.rb --line_number 5 --line_number 9 --format doc`
+    When I run `rspec example_spec.rb --line_number 5 --line_number 9`
     Then the examples should all pass
-    And the output should contain "should be > 8"
-    And the output should contain "should be < 10"
-    But the output should not contain "should be 3*3"
+    And the output should contain "2 examples"
 
   Scenario: one liner
     Given a file named "example_spec.rb" with:
@@ -52,7 +48,6 @@ Feature: --line_number option
 
       end
       """
-    When I run `rspec example_spec.rb --line_number 5 --format doc`
+    When I run `rspec example_spec.rb --line_number 5`
     Then the examples should all pass
-    Then the output should contain "should be > 8"
-    But the output should not contain "should be < 10"
+    And the output should contain "1 example"

data/features/configuration/read_options_from_file.feature

@@ -19,7 +19,7 @@ Feature: read command line configuration options from files
       """
     And a file named "spec/example_spec.rb" with:
       """ruby
-      describe "color_enabled" do
+      describe "color" do
         context "when set with RSpec.configure" do
           before do
             # color is disabled for non-tty output, so stub the output stream
@@ -66,7 +66,7 @@ Feature: read command line configuration options from files
       """ruby
       describe "custom options file" do
         it "causes .rspec to be ignored" do
-          RSpec.configuration.color_enabled.should be_falsey
+          RSpec.configuration.color.should be_falsey
         end
       end
       """

data/features/expectation_framework_integration/configure_expectation_framework.feature

@@ -4,16 +4,16 @@ Feature: configure expectation framework
   desired outcomes. You can also configure RSpec to use:
 
   * rspec/expectations (explicitly)
-  * stdlib assertions
-    * test/unit assertions in ruby 1.8
-    * minitest assertions in ruby 1.9
-  * rspec/expectations _and_ stlib assertions
+  * stdlib assertions **DEPRECATED: Use test/unit or minitest explicitly**
+  * test/unit assertions
+  * minitest assertions
+  * any combination of the above libraries
 
-  Note that when you do not use rspec-expectations, you must explicitly
-  provide a description to every example.  You cannot rely on the generated
-  descriptions provided by rspec-expectations.
+  Note that when you do not use rspec-expectations, you must explicitly provide
+  a description to every example.  You cannot rely on the generated descriptions
+  provided by rspec-expectations.
 
-  Scenario: rspec-expectations can be used by default if nothing is configured
+  Scenario: Default configuration uses rspec-expectations
     Given a file named "example_spec.rb" with:
       """ruby
       RSpec::Matchers.define :be_a_multiple_of do |factor|
@@ -29,7 +29,7 @@ Feature: configure expectation framework
     When I run `rspec example_spec.rb`
     Then the examples should all pass
 
-  Scenario: configure rspec-expectations (explicitly)
+  Scenario: Configure rspec-expectations (explicitly)
     Given a file named "example_spec.rb" with:
       """ruby
       RSpec.configure do |config|
@@ -45,7 +45,8 @@ Feature: configure expectation framework
     When I run `rspec example_spec.rb`
     Then the examples should all pass
 
-  Scenario: configure test/unit assertions (passing examples)
+  @deprecated
+  Scenario: Configure 'stdlib' assertions
     Given a file named "example_spec.rb" with:
       """ruby
       RSpec.configure do |config|
@@ -58,45 +59,139 @@ Feature: configure expectation framework
         end
 
         specify { assert 5 < 6 }
+
+        it "is greater than 6 (no it isn't!)" do
+          assert 5 > 6, "errantly expected 5 to be greater than 5"
+        end
       end
       """
     When I run `rspec example_spec.rb`
-    Then the output should contain "2 examples, 0 failures"
+    Then the output should match:
+      """
+           (Test::Unit::AssertionFailedError|Mini(T|t)est::Assertion):
+             errantly expected 5 to be greater than 5
+      """
+    And  the output should contain "3 examples, 1 failure"
+    And  the output should contain ":stdlib is deprecated. Use :test_unit or :minitest instead"
 
-  Scenario: configure test/unit assertions (failing examples)
+  Scenario: Configure test/unit assertions
     Given a file named "example_spec.rb" with:
       """ruby
       RSpec.configure do |config|
-        config.expect_with :stdlib
+        config.expect_with :test_unit
       end
 
-      describe 5 do
-        it "is greater than 6 (no it isn't!)" do
-          assert 5 > 6, "errantly expected 5 to be greater than 5"
+      RSpec.describe [1] do
+        it "is equal to [1]" do
+          assert_equal [1], [1], "expected [1] to equal [1]"
         end
 
-        specify { assert 5 > 6 }
+        specify { assert_not_equal [1], [] }
+
+        it "is equal to [2] (intentional failure)" do
+          assert [1] == [2], "errantly expected [2] to equal [1]"
+        end
       end
       """
     When I run `rspec example_spec.rb`
-    Then the output should contain "2 examples, 2 failures"
+    Then the output should match:
+      """
+           (Test::Unit::AssertionFailedError|Mini(T|t)est::Assertion):
+             errantly expected \[2\] to equal \[1\]
+      """
+    And  the output should contain "3 examples, 1 failure"
 
-  Scenario: configure rspec/expecations AND test/unit assertions
+  Scenario: Configure minitest assertions
     Given a file named "example_spec.rb" with:
       """ruby
       RSpec.configure do |config|
-        config.expect_with :rspec, :stdlib
+        config.expect_with :minitest
       end
 
-      describe 5 do
-        it "is greater than 4" do
-          assert 5 > 4, "expected 5 to be greater than 4"
+      RSpec.describe "Object identity" do
+        it "the an object is the same as itself" do
+          x = [1]
+          assert_same x, x, "expected x to be the same x"
         end
 
-        it "is less than 6" do
-          5.should be < 6
+        specify { refute_same [1], [1] }
+
+        it "is empty (intentional failure)" do
+          assert_empty [1], "errantly expected [1] to be empty"
         end
       end
       """
+    When I run `rspec -b example_spec.rb`
+    Then the output should match:
+      """
+           MiniT|test::Assertion:
+             errantly expected \[1\] to be empty
+      """
+    And  the output should contain "3 examples, 1 failure"
+    And  the output should not contain "Warning: you should require 'minitest/autorun' instead."
+
+  Scenario: Configure rspec/expectations AND test/unit assertions
+    Given a file named "example_spec.rb" with:
+      """ruby
+      RSpec.configure do |config|
+        config.expect_with :rspec, :test_unit
+      end
+
+      RSpec.describe [1] do
+        it "is equal to [1]" do
+          assert_equal [1], [1], "expected [1] to equal [1]"
+        end
+
+        it "matches array [1]" do
+          is_expected.to match_array([1])
+        end
+      end
+      """
+    When I run `rspec example_spec.rb`
+    Then the examples should all pass
+
+  Scenario: Configure rspec/expecations AND minitest assertions
+    Given a file named "example_spec.rb" with:
+      """ruby
+      RSpec.configure do |config|
+        config.expect_with :rspec, :minitest
+      end
+
+      RSpec.describe "Object identity" do
+        it "two arrays are not the same object" do
+          refute_same [1], [1]
+        end
+
+        it "an array is itself" do
+          array = [1]
+          expect(array).to be array
+        end
+      end
+      """
+    When I run `rspec example_spec.rb`
+    Then the examples should all pass
+
+  Scenario: Configure test/unit and minitest assertions
+    Given a file named "example_spec.rb" with:
+      """ruby
+      RSpec.configure do |config|
+        config.expect_with :test_unit, :minitest
+      end
+
+      RSpec.describe [1] do
+        it "is equal to [1]" do
+          assert_equal [1], [1], "expected [1] to equal [1]"
+        end
+
+        specify { assert_not_equal [1], [] }
+
+        it "the an object is the same as itself" do
+          x = [1]
+          assert_same x, x, "expected x to be the same x"
+        end
+
+        specify { refute_same [1], [1] }
+      end
+      """
     When I run `rspec example_spec.rb`
     Then the examples should all pass

data/lib/autotest/discover.rb

@@ -1 +1,10 @@
-Autotest.add_discovery { "rspec2" } if File.exist?("./.rspec")
+begin
+  # try to load rspec/autotest so we can check if the constant is defined below.
+  require 'rspec/autotest'
+rescue LoadError
+  # ignore. We print a deprecation warning later.
+end
+
+if File.exist?("./.rspec") && !defined?(::RSpec::Autotest)
+  Autotest.add_discovery { "rspec2" }
+end

data/lib/autotest/rspec2.rb

@@ -73,5 +73,5 @@ rescue LoadError
       File.exist?('./Gemfile')
     end
   end
-  Autotest.add_hook(:ran_command) { warn "\n\e[31mUsing the built in rspec-core autotest support is deprecated and will be removed in RSpec 3. Please switch to the rspec-autotest gem\e[0m" }
+  Autotest.add_hook(:ran_command) { warn "\n\e[31mrspec-core's built in autotest support is deprecated and will be removed in RSpec 3. Please switch to the rspec-autotest gem.\e[0m" }
 end

data/lib/rspec/core/command_line.rb

@@ -1,11 +1,7 @@
 module RSpec
   module Core
-    class CommandLine
+    class Runner
       def initialize(options, configuration=RSpec::configuration, world=RSpec::world)
-        if Array === options
-          options = ConfigurationOptions.new(options)
-          options.parse_options
-        end
         @options       = options
         @configuration = configuration
         @world         = world
@@ -32,5 +28,20 @@ module RSpec
         end
       end
     end
+
+    class CommandLine < Runner
+      def initialize(options, configuration=RSpec.configuration, world=RSpec.world)
+        if Array === options
+          RSpec.deprecate("Instantiating a `RSpec::Core::CommandLine` with an array of options",
+                          :replacement => "Instantiate a `RSpec::Core::Runner` with a `RSpec::Core::ConfigurationOptions` instance")
+          options = ConfigurationOptions.new(options)
+          options.parse_options
+        else
+          RSpec.deprecate("`RSpec::Core::CommandLine`", :replacement => "`RSpec::Core::Runner`")
+        end
+
+        super
+      end
+    end
   end
 end

data/lib/rspec/core/configuration.rb

@@ -1,6 +1,7 @@
 require 'fileutils'
 require 'rspec/core/backtrace_cleaner'
 require 'rspec/core/ruby_project'
+require 'rspec/core/deprecated_mutable_array_proxy'
 require 'rspec/core/formatters/deprecation_formatter'
 
 module RSpec
@@ -96,7 +97,18 @@ module RSpec
       add_setting :error_stream
 
       # Default: `$stderr`.
-      add_setting :deprecation_stream
+      define_reader :deprecation_stream
+      def deprecation_stream=(value)
+        if @reporter && !value.equal?(@deprecation_stream)
+          warn "RSpec's reporter has already been initialized with " +
+            "#{deprecation_stream.inspect} as the deprecation stream, so your change to "+
+            "`deprecation_stream` will be ignored. You should configure it earlier for " +
+            "it to take effect, or use the `--deprecation-out` CLI option. " +
+            "(Called from #{CallerFilter.first_non_rspec_line})"
+        else
+          @deprecation_stream = value
+        end
+      end
 
       # Clean up and exit after the first failure (default: `false`).
       add_setting :fail_fast
@@ -149,7 +161,13 @@ module RSpec
       end
 
       # Load files matching this pattern (default: `'**/*_spec.rb'`)
-      add_setting :pattern, :alias_with => :filename_pattern
+      add_setting :pattern
+
+      def filename_pattern
+        RSpec.deprecate "`RSpec::Core::Configuration#filename_pattern`",
+                        :replacement => "`RSpec::Core::Configuration#pattern`"
+        pattern
+      end
 
       def pattern= value
         if @spec_files_loaded
@@ -157,7 +175,13 @@ module RSpec
         end
         @pattern = value
       end
-      alias :filename_pattern= :pattern=
+
+      def filename_pattern=(value)
+        RSpec.deprecate "`RSpec::Core::Configuration#filename_pattern=`",
+                        :replacement => "`RSpec::Core::Configuration#pattern=`"
+        self.pattern = value
+      end
+
 
       # Report the times for the slowest examples (default: `false`).
       # Use this to specify the number of examples to include in the profile.
@@ -247,21 +271,26 @@ module RSpec
       # @private
       attr_accessor :filter_manager
 
-      attr_reader :backtrace_cleaner
+      attr_reader :backtrace_formatter
+
+      def backtrace_cleaner
+        RSpec.deprecate "`RSpec::Core::Configuration#backtrace_cleaner`",
+                        :replacement => "`RSpec::Core::Configuration#backtrace_formatter`"
+        @backtrace_formatter
+      end
 
       def initialize
         @expectation_frameworks = []
         @include_or_extend_modules = []
         @mock_framework = nil
         @files_to_run = []
-        @formatters = []
         @color = false
         @order = nil
         @pattern = '**/*_spec.rb'
         @failure_exit_code = 1
         @spec_files_loaded = false
 
-        @backtrace_cleaner = BacktraceCleaner.new
+        @backtrace_formatter = BacktraceCleaner.new
 
         @default_path = 'spec'
         @deprecation_stream = $stderr
@@ -280,6 +309,7 @@ module RSpec
         @profile_examples = false
         @requires = []
         @libs = []
+        @show_failures_in_pending_blocks = false
       end
 
       # @private
@@ -299,7 +329,7 @@ module RSpec
       def reset
         @spec_files_loaded = false
         @reporter = nil
-        @formatters.clear
+        @formatter_loader = nil
       end
 
       # @overload add_setting(name)
@@ -370,13 +400,13 @@ module RSpec
       def backtrace_clean_patterns
         RSpec.deprecate("RSpec::Core::Configuration#backtrace_clean_patterns",
                         :replacement => "RSpec::Core::Configuration#backtrace_exclusion_patterns")
-        @backtrace_cleaner.exclusion_patterns
+        @backtrace_formatter.exclusion_patterns
       end
 
       def backtrace_clean_patterns=(patterns)
         RSpec.deprecate("RSpec::Core::Configuration#backtrace_clean_patterns",
                         :replacement => "RSpec::Core::Configuration#backtrace_exclusion_patterns")
-        @backtrace_cleaner.exclusion_patterns = patterns
+        @backtrace_formatter.exclusion_patterns = patterns
       end
 
       # The patterns to always include to backtraces.
@@ -387,11 +417,11 @@ module RSpec
       # One can replace the list by using the setter or modify it through the
       # getter
       def backtrace_inclusion_patterns
-        @backtrace_cleaner.inclusion_patterns
+        @backtrace_formatter.inclusion_patterns
       end
 
       def backtrace_inclusion_patterns=(patterns)
-        @backtrace_cleaner.inclusion_patterns = patterns
+        @backtrace_formatter.inclusion_patterns = patterns
       end
 
       # The patterns to discard from backtraces.
@@ -405,11 +435,11 @@ module RSpec
       # `--backtrace`on the command line, in a `.rspec` file, or in the
       # `rspec_options` attribute of RSpec's rake task.
       def backtrace_exclusion_patterns
-        @backtrace_cleaner.exclusion_patterns
+        @backtrace_formatter.exclusion_patterns
       end
 
       def backtrace_exclusion_patterns=(patterns)
-        @backtrace_cleaner.exclusion_patterns = patterns
+        @backtrace_formatter.exclusion_patterns = patterns
       end
 
       # Sets the mock framework adapter module.
@@ -496,16 +526,17 @@ module RSpec
       # Sets the expectation framework module(s) to be included in each example
       # group.
       #
-      # `frameworks` can be `:rspec`, `:stdlib`, a custom module, or any
-      # combination thereof:
+      # `frameworks` can be `:rspec`, `:test_unit`, `:minitest`, a custom
+      # module, or any combination thereof:
       #
       #     config.expect_with :rspec
-      #     config.expect_with :stdlib
-      #     config.expect_with :rspec, :stdlib
+      #     config.expect_with :test_unit
+      #     config.expect_with :minitest
+      #     config.expect_with :rspec, :minitest
       #     config.expect_with OtherExpectationFramework
       #
-      # RSpec will translate `:rspec` and `:stdlib` into the appropriate
-      # modules.
+      # RSpec will translate `:rspec`, `:minitest`, and `:test_unit` into the
+      # appropriate modules.
       #
       # ## Configuration
       #
@@ -525,8 +556,15 @@ module RSpec
             self.expecting_with_rspec = true
             ::RSpec::Matchers
           when :stdlib
+            RSpec.deprecate ':stdlib', :replacement => ":test_unit or :minitest"
             require 'test/unit/assertions'
             ::Test::Unit::Assertions
+          when :test_unit
+            require 'rspec/core/test_unit_assertions_adapter'
+            ::RSpec::Core::TestUnitAssertionsAdapter
+          when :minitest
+            require 'rspec/core/minitest_assertions_adapter'
+            ::RSpec::Core::MinitestAssertionsAdapter
           else
             raise ArgumentError, "#{framework.inspect} is not supported"
           end
@@ -546,19 +584,33 @@ module RSpec
       end
 
       def full_backtrace?
-        @backtrace_cleaner.full_backtrace?
+        @backtrace_formatter.full_backtrace?
       end
 
       def full_backtrace=(true_or_false)
-        @backtrace_cleaner.full_backtrace = true_or_false
-      end
+        @backtrace_formatter.full_backtrace = true_or_false
+      end
+
+      NoArgument = "No such argument"
+      def color(output = NoArgument)
+        if output == NoArgument
+          output = output_stream
+          if !output_to_tty?(output) && value_for(:color, @color)
+            RSpec.warn_deprecation <<-MSG.gsub(/\s+|/,'')
+              | Calling `RSpec::Core::Configuration#color` in RSpec 3 will
+              | return the value of the configuration setting, in RSpec 2
+              | this value is `false` as your output doesn't support color.
+              | Use `RSpec::Core::Configuration#color_enabled?` if you depend
+              | on this behavior.
+              | Called from #{CallerFilter.first_non_rspec_line}.
+            MSG
+          end
+        else
+          RSpec.deprecate '`RSpec::Core::Configuration#color(output)`',
+                          :replacement => '`RSpec::Core::Configuration#color_enabled?(output)`'
+        end
 
-      def color(output=output_stream)
-        # rspec's built-in formatters all call this with the output argument,
-        # but defaulting to output_stream for backward compatibility with
-        # formatters in extension libs
-        return false unless output_to_tty?(output)
-        value_for(:color, @color)
+        color_enabled? output
       end
 
       def color=(bool)
@@ -572,11 +624,31 @@ module RSpec
         end
       end
 
-      # TODO - deprecate color_enabled - probably not until the last 2.x
-      # release before 3.0
-      alias_method :color_enabled, :color
-      alias_method :color_enabled=, :color=
-      define_predicate_for :color_enabled, :color
+      def color_enabled?(output=output_stream)
+        output_to_tty?(output) && value_for(:color, @color)
+      end
+
+      def color_enabled(output=output_stream)
+        RSpec.deprecate "`RSpec::Core::Configuration#color_enabled`",
+          :replacement =>
+            "`RSpec::Core::Configuration#color` if you want the configuration " +
+            "value, or `RSpec::Core::Configuration#color_enabled?(output)` if " +
+            " you want to know if color output is supported."
+
+        color_enabled? output
+      end
+
+      def color_enabled=(bool)
+        RSpec.deprecate "RSpec::Core::Configuration#color_enabled=",
+                        :replacement => "RSpec::Core::Configuration#color="
+        self.color = bool
+      end
+
+      def color?(output=output_stream)
+        RSpec.deprecate "RSpec::Core::Configuration#color?",
+                        :replacement => "RSpec::Core::Configuration#color_enabled?"
+        color_enabled? output_stream
+      end
 
       def libs=(libs)
         libs.map do |lib|
@@ -664,27 +736,27 @@ EOM
       # and paths to use for output streams, but you should consider that a
       # private api that may change at any time without notice.
       def add_formatter(formatter_to_use, *paths)
-        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'?.")
-
         paths << output_stream if paths.empty?
-        formatters << formatter_class.new(*paths.map {|p| String === p ? file_at(p) : p})
+        formatter_loader.add formatter_to_use, *paths
       end
-
       alias_method :formatter=, :add_formatter
 
       def formatters
-        @formatters ||= []
+        DeprecatedMutableArrayProxy.new(formatter_loader.formatters)
       end
 
+      # @private
+      def formatter_loader
+        @formatter_loader ||= Formatters::Loader.new(Reporter.new)
+      end
+
+      # @private
       def reporter
-        @reporter ||= begin
-                        add_formatter('progress') if formatters.empty?
-                        add_formatter(RSpec::Core::Formatters::DeprecationFormatter, deprecation_stream, output_stream)
-                        Reporter.new(*formatters)
-                      end
+        @reporter ||=
+          begin
+            formatter_loader.setup_default output_stream, deprecation_stream
+            formatter_loader.reporter
+          end
       end
 
       # @api private
@@ -730,7 +802,7 @@ EOM
       #     end
       def alias_example_to(new_name, *args)
         extra_options = build_metadata_hash_from(args)
-        RSpec::Core::ExampleGroup.alias_example_to(new_name, extra_options)
+        RSpec::Core::ExampleGroup.define_example_method(new_name, extra_options)
       end
 
       # Define an alias for it_should_behave_like that allows different
@@ -755,7 +827,7 @@ EOM
       #       has behavior: sortability
       #         # sortability examples here
       def alias_it_behaves_like_to(new_name, report_label = '')
-        RSpec::Core::ExampleGroup.alias_it_behaves_like_to(new_name, report_label)
+        RSpec::Core::ExampleGroup.define_nested_shared_group_method(new_name, report_label)
       end
 
       alias_method :alias_it_should_behave_like_to, :alias_it_behaves_like_to
@@ -792,10 +864,12 @@ EOM
       #     # with treat_symbols_as_metadata_keys_with_true_values = true
       #     filter_run_including :foo # same as filter_run_including :foo => true
       def filter_run_including(*args)
-        filter_manager.include_with_low_priority build_metadata_hash_from(args)
+        __filter_run(__method__, *args)
       end
 
-      alias_method :filter_run, :filter_run_including
+      def filter_run(*args)
+        __filter_run(__method__, *args)
+      end
 
       # Clears and reassigns the `inclusion_filter`. Set to `nil` if you don't
       # want any inclusion filter at all.
@@ -805,7 +879,7 @@ EOM
       # This overrides any inclusion filters/tags set on the command line or in
       # configuration files.
       def inclusion_filter=(filter)
-        filter_manager.include! build_metadata_hash_from([filter])
+        filter_manager.include_only build_metadata_hash_from([filter])
       end
 
       alias_method :filter=, :inclusion_filter=
@@ -861,7 +935,7 @@ EOM
       # This overrides any exclusion filters/tags set on the command line or in
       # configuration files.
       def exclusion_filter=(filter)
-        filter_manager.exclude! build_metadata_hash_from([filter])
+        filter_manager.exclude_only build_metadata_hash_from([filter])
       end
 
       # Returns the `exclusion_filter`. If none has been set, returns an empty
@@ -1172,10 +1246,16 @@ EOM
         $VERBOSE = !!value
       end
 
-      def warnings
+      def warnings?
         $VERBOSE
       end
 
+      def warnings
+        RSpec.deprecate("`RSpec::Core::Configuration#warnings`",
+                        :replacement => "`RSpec::Core::Configuration#warnings?`")
+        warnings?
+      end
+
       # Exposes the current running example via the named
       # helper method. RSpec 2.x exposed this via `example`,
       # but in RSpec 3.0, the example is instead exposed via
@@ -1287,72 +1367,6 @@ MESSAGE
         tty? || (output.respond_to?(:tty?) && output.tty?)
       end
 
-      def built_in_formatter(key)
-        case key.to_s
-        when 'd', 'doc', 'documentation'
-          require 'rspec/core/formatters/documentation_formatter'
-          RSpec::Core::Formatters::DocumentationFormatter
-        when 's', 'n', 'spec', 'nested'
-          RSpec.deprecate "Using `#{key.to_s}` as a shortcut for the DocumentationFormatter",
-            :replacement => "`d`, `doc`, or `documentation`"
-          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
-        when 'j', 'json'
-          require 'rspec/core/formatters/json_formatter'
-          RSpec::Core::Formatters::JsonFormatter
-        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
-
-      def file_at(path)
-        FileUtils.mkdir_p(File.dirname(path))
-        File.new(path, 'w')
-      end
-
       def order_and_seed_from_seed(value, force = false)
         order_and_seed_from_order "rand:#{value}", force
       end
@@ -1397,6 +1411,24 @@ MESSAGE
         RSpec.deprecate("`config.mock_with #{name.inspect}`", :replacement => "`config.mock_with :#{expected}`")
       end
 
+      def __filter_run(method_name, *args)
+        metadata_hash = build_metadata_hash_from(args)
+
+        if metadata_hash[:focused]
+          RSpec.warn_deprecation(<<-EOS.gsub(/^\s*\|/, ''))
+            |In RSpec 2.x, `config.#{method_name} :focused => true` filters
+            |examples defined using `focus` or `fit` since those example aliases
+            |have attached `:focus => true, :focused => true` metadata. In RSpec 3,
+            |the metadata for those example aliases will only have `:focus => true`,
+            |so if you want to continue filtering examples defined with those example
+            |aliases you should update to `config.#{method_name} :focus => true`.
+            |(Called from #{CallerFilter.first_non_rspec_line}).
+          EOS
+        end
+
+        filter_manager.include_with_low_priority metadata_hash
+      end
+
     end
   end
 end