remove call sites from command line warnings

rspec · Oct 6, 2013 · 2185450 · 2185450
1 parent 5e4c520
commit 2185450
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/lib/rspec/core/option_parser.rb b/lib/rspec/core/option_parser.rb
@@ -107,7 +107,7 @@ def parser(options)
         end
 
         parser.on('--configure', 'Deprecated. Use --init instead.') do |cmd|
-          RSpec.warning "--configure is deprecated with no effect. Use --init instead."
+          RSpec.warning "--configure is deprecated with no effect. Use --init instead.", :call_site => nil
           exit
         end
 
@@ -151,7 +151,8 @@ def parser(options)
                                          rescue ArgumentError
                                            RSpec.warning "Non integer specified as profile count, seperate " +
                                                        "your path from options with -- e.g. " +
-                                                       "`rspec --profile -- #{argument}`"
+                                                       "`rspec --profile -- #{argument}`",
+                                                       :call_site => nil
                                            true
                                          end
                                        end

diff --git a/spec/rspec/core/option_parser_spec.rb b/spec/rspec/core/option_parser_spec.rb
@@ -238,7 +238,7 @@ module RSpec::Core
       end
 
       it 'warns when accidentally combined with path' do
-        expect_warning_with_call_site __FILE__, __LINE__+1, "Non integer specified as profile count"
+        expect_warning_without_call_site "Non integer specified as profile count"
         options = Parser.parse!(%w[--profile some/path])
         expect(options[:profile_examples]).to eq true
       end

diff --git a/spec/support/helper_methods.rb b/spec/support/helper_methods.rb
@@ -33,6 +33,13 @@ def allow_deprecation
     allow(RSpec.configuration.reporter).to receive(:deprecation)
   end
 
+  def expect_warning_without_call_site(expected = //)
+    expect(::Kernel).to receive(:warn) do |message|
+      expect(message).to match expected
+      expect(message).to_not match /Called from/
+    end
+  end
+
   def expect_warning_with_call_site(file, line, expected = //)
     expect(::Kernel).to receive(:warn) do |message|
       expect(message).to match expected