Merge pull request #1115 from rspec/switch_to_support

Use warnings from rspec-support

lib/rspec/core.rb

@@ -15,11 +15,12 @@
 require_rspec['core/version']
 
 require 'rspec/support/caller_filter'
+require 'rspec/core/warnings'
+require 'rspec/support/warnings'
 
 require_rspec['core/flat_map']
 require_rspec['core/filter_manager']
 require_rspec['core/dsl']
-require_rspec['core/warnings']
 require_rspec['core/reporter']
 
 require_rspec['core/hooks']

lib/rspec/core/warnings.rb

@@ -19,20 +19,4 @@ def self.warn_deprecation(message)
     RSpec.configuration.reporter.deprecation :message => message
   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 << " Called from #{call_site}." if call_site
-    ::Kernel.warn message
-  end
-
 end

spec/rspec/core/warnings_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 
 describe "RSpec deprecations and warnings" do
+
   describe "#deprecate" do
     it "passes the hash to the reporter" do
       expect(RSpec.configuration.reporter).to receive(:deprecation).with(hash_including :deprecated => "deprecated_method", :replacement => "replacement")
@@ -25,27 +26,4 @@
     end
   end
 
-  shared_examples_for "warning helper" do |helper|
-    it 'warns with the message text' do
-      expect(::Kernel).to receive(:warn).with(/Message/)
-      RSpec.send(helper, 'Message')
-    end
-
-    it 'sets the calling line' do
-      expect(::Kernel).to receive(:warn).with(/#{__FILE__}:#{__LINE__+1}/)
-      RSpec.send(helper, 'Message')
-    end
-  end
-
-  describe "#warning" do
-    it 'prepends WARNING:' do
-      expect(::Kernel).to receive(:warn).with(/WARNING: Message\./)
-      RSpec.warning 'Message'
-    end
-    it_should_behave_like 'warning helper', :warning
-  end
-
-  describe "#warn_with message, options" do
-    it_should_behave_like 'warning helper', :warn_with
-  end
 end