Extract warning methods into module

lib/rspec/support/warnings.rb

@@ -1,42 +1,36 @@
 module RSpec
+  module Support
+    module Warnings
+      def deprecate(deprecated, options = {})
+        warn_with "DEPRECATION: #{deprecated} is deprecated.", options
+      end
 
-  unless respond_to?(:deprecate)
+      # @private
+      #
+      # Used internally to print deprecation warnings
+      # when rspec-core isn't loaded
+      def warn_deprecation(message)
+        warn_with "DEPRECATION: \n #{message}"
+      end
 
-    # @private
-    #
-    # Used internally to print deprecation warnings
-    # when rspec-core isn't loaded
-    def self.deprecate(deprecated, options = {})
-      warn_with "DEPRECATION: #{deprecated} is deprecated.", options
-    end
-  end
+      # @private
+      #
+      # Used internally to print warnings
+      def warning(text, options={})
+        warn_with "WARNING: #{text}.", options
+      end
 
-  unless respond_to?(:warn_deprecation)
-
-    # @private
-    #
-    # Used internally to print deprecation warnings
-    # when rspec-core isn't loaded
-    def self.warn_deprecation(message)
-      warn_with "DEPRECATION: \n #{message}"
+      # @private
+      #
+      # Used internally to print longer warnings
+      def warn_with(message, options = {})
+        call_site = options.fetch(:call_site) { CallerFilter.first_non_rspec_line }
+        message << " Use #{options[:replacement]} instead." if options[:replacement]
+        message << " Called from #{call_site}." if call_site
+        ::Kernel.warn message
+      end
     end
   end
 
-  # @private
-  #
-  # Used internally to print warnings
-  def self.warning(text, options={})
-    warn_with "WARNING: #{text}.", options
-  end
-
-  # @private
-  #
-  # Used internally to print longer warnings
-  def self.warn_with(message, options = {})
-    call_site = options.fetch(:call_site) { CallerFilter.first_non_rspec_line }
-    message << " Use #{options[:replacement]} instead." if options[:replacement]
-    message << " Called from #{call_site}." if call_site
-    ::Kernel.warn message
-  end
-
+  extend RSpec::Support::Warnings
 end

spec/rspec/support/warnings_spec.rb

@@ -1,113 +1,48 @@
 require "spec_helper"
-require 'rspec/support/spec/in_sub_process'
-
-# RSpec Core has already loaded these, we wish to test there
-# definition so we undefine them first.
-module RSpec
-  class << self
-    undef deprecate        if defined?(RSpec.deprecate)
-    undef warn_deprecation if defined?(RSpec.warn_deprecation)
-    undef warn_with        if defined?(RSpec.warn_with)
-    undef warning          if defined?(RSpec.warning)
-  end
-end
+require "rspec/support/warnings"
 
 describe "rspec warnings and deprecations" do
-  include RSpec::Support::InSubProcess
-
-  def run_with_rspec_core
-    in_sub_process do
-      load 'rspec/core/warnings.rb'
-      yield
-    end
-  end
-
-  def run_without_rspec_core
-    in_sub_process do
-      load 'rspec/support/warnings.rb'
-      yield
-    end
-  end
-
-  context "when rspec-core is available" do
-    describe "#deprecate" do
-      it "passes the hash to the reporter" do
-        run_with_rspec_core do
-          expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :deprecated => "deprecated_method", :replacement => "replacement")
-          RSpec.deprecate("deprecated_method", :replacement => "replacement")
-        end
-      end
-
-      it "adds the call site" do
-        run_with_rspec_core do
-          expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
-          RSpec.deprecate("deprecated_method")
-        end
-      end
-
-      it "doesn't override a passed call site" do
-        run_with_rspec_core do
-          expect_deprecation_with_call_site("some_file.rb", 17)
-          RSpec.deprecate("deprecated_method", :call_site => "/some_file.rb:17")
-        end
-      end
-    end
-
-    describe "#warn_deprecation" do
-      it "puts message in a hash" do
-        run_with_rspec_core do
-          expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :message => "this is the message")
-          RSpec.warn_deprecation("this is the message")
-        end
-      end
-    end
-  end
+  subject(:warning_object) {
+    Object.new.tap {|o| o.extend(RSpec::Support::Warnings)}
+  }
 
   context "when rspec-core is not available" do
+    shared_examples_for "falling back to Kernel.warn" do |args|
+      let(:method_name) { args.fetch(:method_name) }
 
-    shared_examples_for "falls back to warn for" do |method|
       it 'falls back to warning with a plain message' do
-        run_without_rspec_core do
-          expect(::Kernel).to receive(:warn).with(/message/)
-          RSpec.send(method,'message')
-        end
+        expect(::Kernel).to receive(:warn).with(/message/)
+        warning_object.send(method_name, 'message')
       end
     end
 
-    it_behaves_like 'falls back to warn for', :deprecate
-    it_behaves_like 'falls back to warn for', :warn_deprecation
+    it_behaves_like 'falling back to Kernel.warn', :method_name => :deprecate
+    it_behaves_like 'falling back to Kernel.warn', :method_name => :warn_deprecation
   end
 
   shared_examples_for "warning helper" do |helper|
     it 'warns with the message text' do
-      run_without_rspec_core do
-        expect(::Kernel).to receive(:warn).with(/Message/)
-        RSpec.send(helper, 'Message')
-      end
+      expect(::Kernel).to receive(:warn).with(/Message/)
+      warning_object.send(helper, 'Message')
     end
 
     it 'sets the calling line' do
-      run_without_rspec_core do
-        expect(::Kernel).to receive(:warn).with(/#{__FILE__}:#{__LINE__+1}/)
-        RSpec.send(helper, 'Message')
-      end
+      expect(::Kernel).to receive(:warn).with(/#{__FILE__}:#{__LINE__+1}/)
+      warning_object.send(helper, 'Message')
     end
 
     it 'optionally sets the replacement' do
-      run_without_rspec_core do
-        expect(::Kernel).to receive(:warn).with(/Use Replacement instead./)
-        RSpec.send(helper, 'Message', :replacement => 'Replacement')
-      end
+      expect(::Kernel).to receive(:warn).with(/Use Replacement instead./)
+      warning_object.send(helper, 'Message', :replacement => 'Replacement')
     end
   end
 
   describe "#warning" do
     it 'prepends WARNING:' do
-      run_without_rspec_core do
-        expect(::Kernel).to receive(:warn).with(/WARNING: Message\./)
-        RSpec.warning 'Message'
-      end
+      expect(::Kernel).to receive(:warn).with(/WARNING: Message\./)
+      warning_object.warning 'Message'
     end
+
     it_should_behave_like 'warning helper', :warning
   end