split! 1. deprecations + their specs 2. fixes for specs to avoid failures

Author: pirj

lib/rspec/core/configuration.rb

@@ -328,12 +328,10 @@ def exclude_pattern=(value)
       # @deprecated Use {#filter_run_when_matching} instead for the specific
       #   filters that you want to be ignored if none match.
       def run_all_when_everything_filtered=(value)
-        RSpec.deprecate("`run_all_when_everything_filtered` setting is deprecated and will be removed in RSpec 4. " \
-                        "Use `filter_run_when_matching = :focus` instead.")
+        RSpec.deprecate("`run_all_when_everything_filtered` setting", :replacement => "`filter_run_when_matching :focus`")
         @run_all_when_everything_filtered = value
       end
-      define_reader :run_all_when_everything_filtered
-      define_predicate :run_all_when_everything_filtered
+      add_read_only_setting :run_all_when_everything_filtered
 
       # @macro add_setting
       # Color to use to indicate success.  Defaults to `:green` but can be set
@@ -447,8 +445,10 @@ def shared_context_metadata_behavior=(value)
             "`:trigger_inclusion` and `:apply_to_host_groups` are valid values."
         end
 
-        RSpec.deprecate("`shared_context_metadata_behavior` setting is deprecated, and will be removed in RSpec 4. "\
-                        "`:apply_to_host_groups` will become the default and only option.")
+        if value == :trigger_inclusion
+          RSpec.deprecate("`shared_context_metadata_behavior` setting",
+                          :message => "`:apply_to_host_groups` will become the default and only option.")
+        end
       end
 
       # Record the start time of the spec suite to measure load time.
@@ -501,14 +501,11 @@ def bisect_runner=(value)
 
       # @private
       # @deprecated Use {#color_mode} = :on, instead of {#color} with {#tty}
-      add_setting :tty
       def tty=(value)
-        RSpec.deprecate("`tty` setting is deprecated and will be removed in RSpec 4. " \
-                        "Use `color_mode` instead.")
+        RSpec.deprecate("`tty` setting", :replacement => "`color_mode`")
         @tty = value
       end
-      define_reader :tty
-      define_predicate :tty
+      add_read_only_setting :tty
 
       # @private
       attr_writer :files_to_run
@@ -952,8 +949,7 @@ def color_enabled?(output=output_stream)
       #   rely on the fact that TTYs will display color by default, or set
       #   {:color_mode} to :on to display color on a non-TTY output.
       def color=(value)
-        RSpec.deprecate("`color` setting is deprecated and will be removed in RSpec 4. " \
-                        "Use `color_mode` instead.")
+        RSpec.deprecate("`color` setting", :replacement => "`color_mode`")
         @color = value
       end
 
@@ -1239,8 +1235,7 @@ def alias_it_behaves_like_to(new_name, report_label='')
         RSpec::Core::ExampleGroup.define_nested_shared_group_method(new_name, report_label)
       end
       def alias_it_should_behave_like_to(new_name, report_label='')
-        RSpec.deprecate("`alias_it_should_behave_like_to` is deprecated, and will be removed in RSpec 4. "\
-                        "Use `alias_it_behaves_like_to` instead.")
+        RSpec.deprecate("`alias_it_should_behave_like_to`", :replacement => "`alias_it_behaves_like_to`")
         alias_it_behaves_like_to(new_name, report_label)
       end
 

lib/rspec/core/dsl.rb

@@ -58,8 +58,6 @@ class << self
       def self.expose_globally!
         return if exposed_globally?
 
-        RSpec.deprecate("Globally-exposed DSL is deprecated and will be removed in RSpec 4")
-
         example_group_aliases.each do |method_name|
           expose_example_group_alias_globally(method_name)
         end
@@ -83,7 +81,10 @@ def self.remove_globally!
       def self.expose_example_group_alias_globally(method_name)
         change_global_dsl do
           remove_method(method_name) if method_defined?(method_name)
-          define_method(method_name) { |*a, &b| ::RSpec.__send__(method_name, *a, &b) }
+          define_method(method_name) do |*a, &b|
+            RSpec.deprecate("Globally-exposed DSL (`#{method_name}`)", :replacement => "`RSpec.#{method_name}`")
+            ::RSpec.__send__(method_name, *a, &b)
+          end
         end
       end
 

lib/rspec/core/example.rb

@@ -109,8 +109,7 @@ def location_rerun_argument
       # @note If there are multiple examples identified by this location, they will use {#id}
       #   to rerun instead, but this method will still return the location (that's why it is deprecated!).
       def rerun_argument
-        RSpec.deprecate("`rerun_argument` is deprecated, and will be removed in RSpec 4. "\
-                        "Use `location_rerun_argument` instead.")
+        RSpec.deprecate("`rerun_argument`", :replacement => "`location_rerun_argument`")
         location_rerun_argument
       end
 

lib/rspec/core/example_group.rb

@@ -335,8 +335,7 @@ def self.define_nested_shared_group_method(new_name, report_label="it should beh
       # Generates a nested example group and includes the shared content
       # mapped to `name` in the nested group.
       define_nested_shared_group_method(:it_should_behave_like) do
-        RSpec.deprecate("`it_should_behave_like` is deprecated, and will be removed in RSpec 4. "\
-                        "Use `it_behaves_like` instead.")
+        RSpec.deprecate("`it_should_behave_like`", :replacement => "`it_behaves_like`")
       end
 
       # Includes shared content mapped to `name` directly in the group in which
@@ -523,7 +522,8 @@ def self.top_level?
       def self.ensure_example_groups_are_configured
         unless defined?(@@example_groups_configured)
           unless RSpec.configuration.disable_monkey_patching
-            RSpec.deprecate("Monkey-patching mode is deprecated, and will be removed in RSpec 4")
+            # TODO: Remove call site, now points to the first spec file that runs
+            RSpec.deprecate("Monkey-patching mode")
           end
           RSpec.configuration.configure_mock_framework
           RSpec.configuration.configure_expectation_framework

lib/rspec/core/filter_manager.rb

@@ -89,13 +89,14 @@ def add_path_to_arrays_filter(filter_key, path, values)
       def prune_conditionally_filtered_examples(examples)
         examples.reject do |ex|
           meta = ex.metadata
+          # TODO: add a proper file/line number call_site
           if meta.key?(:if)
-            RSpec.deprecate("`:if` metadata is deprecated and will have no special meaning in RSpec 4. " \
-                            "Use `:skip` with a negated condition instead.")
+            RSpec.deprecate("`:if` metadata will have no special meaning in RSpec 4 and",
+                            :replacement => "`:skip` with a negated condition")
           end
           if meta.key?(:unless)
-            RSpec.deprecate("`:if` metadata is deprecated and will have no special meaning in RSpec 4. " \
-                            "Use `:skip` instead.")
+            RSpec.deprecate("`:unless` metadata will have no special meaning in RSpec 4 and",
+                            :replacement => "`:skip`")
           end
           !meta.fetch(:if, true) || meta[:unless]
         end

lib/rspec/core/memoized_helpers.rb

@@ -78,8 +78,8 @@ def subject
       # @note If you are using RSpec's newer expect-based syntax you may
       #       want to use `is_expected.to` instead of `should`.
       def should(matcher=nil, message=nil)
+        RSpec.deprecate("Monkey-patching `should`", :replacement => "RSpec Expectations' `is_expected.to`")
         enforce_value_expectation(matcher, 'should')
-        RSpec.deprecate("Monkey-patching `should` is deprecated, and will be removed in RSpec 4")
         RSpec::Expectations::PositiveExpectationHandler.handle_matcher(subject, matcher, message)
       end
 
@@ -99,8 +99,8 @@ def should(matcher=nil, message=nil)
       # @note If you are using RSpec's newer expect-based syntax you may
       #       want to use `is_expected.to_not` instead of `should_not`.
       def should_not(matcher=nil, message=nil)
+        RSpec.deprecate("Monkey-patching `should_not`", :replacement => "RSpec Expectations' `is_expected.not_to`")
         enforce_value_expectation(matcher, 'should_not')
-        RSpec.deprecate("Monkey-patching `should_not` is deprecated, and will be removed in RSpec 4")
         RSpec::Expectations::NegativeExpectationHandler.handle_matcher(subject, matcher, message)
       end
 

spec/integration/bisect_runners_spec.rb

@@ -53,8 +53,7 @@ def with_runner(&block)
     it 'honors `run_all_when_everything_filtered`' do
       write_file 'spec/a_spec.rb', "
         RSpec.configure do |c|
-          c.filter_run :focus
-          c.run_all_when_everything_filtered = true
+          c.filter_run_when_matching :focus
         end
 
         RSpec.describe 'A group' do

spec/rspec/core/formatters/profile_formatter_spec.rb

@@ -46,7 +46,7 @@ def profile *groups
         end)
       end
 
-      it_should_behave_like "profiles examples"
+      it_behaves_like "profiles examples"
 
       it "doesn't profile a single example group" do
         expect(formatter_output.string).not_to match(/slowest example groups/)
@@ -72,7 +72,7 @@ def profile *groups
         profile group1, group2
       end
 
-      it_should_behave_like "profiles examples"
+      it_behaves_like "profiles examples"
 
       it "prints the slowest example groups" do
         expect(formatter_output.string).to match(/slowest example groups/)

spec/rspec/core/memoized_helpers_spec.rb

@@ -615,17 +615,17 @@ def hello_message; "Hello from module"; end
 
     describe Object do
       context 'with implicit subject' do
-        it_should_behave_like 'a subject'
+        it_behaves_like 'a subject'
       end
 
       context 'with explicit subject' do
         subject { Object.new }
-        it_should_behave_like 'a subject'
+        it_behaves_like 'a subject'
       end
 
       context 'with a constant subject'do
         subject { 123 }
-        it_should_behave_like 'a subject'
+        it_behaves_like 'a subject'
       end
     end
   end
@@ -642,11 +642,13 @@ def supports_value_expectations?
     subject { 'value or a Proc' }
 
     it '`should` prints a deprecation warning when given a value' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 2, /Monkey-patching `should`/)
       expect_warn_deprecation(/The implicit block expectation syntax is deprecated, you should pass/)
       expect { should block_matcher }.not_to raise_error
     end
 
     it '`should_not` prints a deprecation warning when given a value' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 2, /Monkey-patching `should_not`/)
       expect_warn_deprecation(/The implicit block expectation syntax is deprecated, you should pass/)
       expect { should_not block_matcher }.to raise_error(Exception)
     end

spec/spec_helper.rb

@@ -80,8 +80,7 @@ def handle_current_dir_change
   c.disable_monkey_patching!
 
   # runtime options
-  c.raise_errors_for_deprecations!
-  c.color = true
+  # c.raise_errors_for_deprecations! # FIXME: switch me back!
   c.include CommonHelpers
 
   c.expect_with :rspec do |expectations|

spec/support/aruba_support.rb

@@ -35,8 +35,6 @@ module ArubaLoader
   attr_reader :last_cmd_stdout, :last_cmd_stderr, :last_cmd_exit_status
 
   def run_command(cmd)
-    RSpec.configuration.color = true
-
     temp_stdout = StringIO.new
     temp_stderr = StringIO.new
 
@@ -51,7 +49,6 @@ def run_command(cmd)
     end
   ensure
     RSpec.reset
-    RSpec.configuration.color = true
 
     # Ensure it gets cached with a proper value -- if we leave it set to nil,
     # and the next spec operates in a different dir, it could get set to an