Merge pull request #1410 from rspec/remove-deprecated-allow_message_expectations_on_nil-example-method

Remove deprecated `allow_message_expectations_on_nil` example method

Author: pirj

Changelog.md

@@ -9,6 +9,8 @@ Breaking Changes:
   (Phil Pirozhkov, #1400)
 * Change the default setting for `RSpec::Mocks::Configuration#verify_partial_doubles`
   to `true`. (Phil Pirozhkov, #1409)
+* Remove deprecated `allow_message_expectations_on_nil` example method.
+  (Phil Pirozhkov, #1410)
 
 Bug Fixes:
 

lib/rspec/mocks/example_methods.rb

@@ -192,16 +192,6 @@ def class_spy(*args)
         class_double(*args).as_null_object
       end
 
-      # Disables warning messages about expectations being set on nil.
-      #
-      # By default warning messages are issued when expectations are set on
-      # nil.  This is to prevent false-positives and to catch potential bugs
-      # early on.
-      # @deprecated Use {RSpec::Mocks::Configuration#allow_message_expectations_on_nil} instead.
-      def allow_message_expectations_on_nil
-        RSpec::Mocks.space.proxy_for(nil).warn_about_expectations = false
-      end
-
       # Stubs the named constant with the given value.
       # Like method stubs, the constant will be restored
       # to its original value (or lack of one, if it was

spec/rspec/mocks/nil_expectation_warning_spec.rb

@@ -21,30 +21,27 @@ module Mocks
         )).to_stderr
       end
 
-      it 'does not issue a warning when expectations are set to be allowed' do
-        allow_message_expectations_on_nil
-
-        expect {
-          expect(nil).to receive(:foo)
-          expect(nil).to_not receive(:bar)
-        }.not_to output.to_stderr
-
-        nil.foo
-      end
-
       context 'configured to allow expectation on nil' do
         include_context 'with isolated configuration'
 
-        it 'does not issue a warning when expectations are set to be allowed' do
-          RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
+        before { RSpec::Mocks.configuration.allow_message_expectations_on_nil = true }
 
+        it 'does not issue a warning when expectations are set to be allowed' do
           expect {
             expect(nil).to receive(:foo)
             expect(nil).not_to receive(:bar)
           }.not_to output.to_stderr
 
           nil.foo
         end
+
+        describe "marshalled `nil`" do
+          include_context "with monkey-patched marshal"
+
+          it 'doesnt error when marshalled' do
+            expect(Marshal.dump(nil)).to eq Marshal.dump_without_rspec_mocks(nil)
+          end
+        end
       end
 
       context 'configured to disallow expectations on nil' do
@@ -63,29 +60,5 @@ module Mocks
         dbl.nil?
       end
     end
-
-    RSpec.describe "#allow_message_expectations_on_nil" do
-      include_context "with monkey-patched marshal"
-
-      it "does not affect subsequent examples" do
-        allow_message_expectations_on_nil
-        RSpec::Mocks.teardown
-        RSpec::Mocks.setup
-
-        expect {
-          expect(nil).to receive(:foo)
-        }.to output(a_string_including(
-          "An expectation of `:foo` was set on `nil`",
-          "#{__FILE__}:#{__LINE__ - 3}"
-        )).to_stderr
-
-        nil.foo
-      end
-
-      it 'doesnt error when marshalled' do
-        allow_message_expectations_on_nil
-        expect(Marshal.dump(nil)).to eq Marshal.dump_without_rspec_mocks(nil)
-      end
-    end
   end
 end

spec/rspec/mocks/partial_double_spec.rb

@@ -123,17 +123,21 @@ def call(name)
         end
       end
 
-      it "uses reports nil in the error message" do
-        allow_message_expectations_on_nil
+      context 'configured to allow expectation on nil' do
+        include_context 'with isolated configuration'
 
-        nil_var = nil
-        expect(nil_var).to receive(:foobar)
-        expect {
-          verify nil_var
-        }.to raise_error(
-          RSpec::Mocks::MockExpectationError,
-          %Q|(nil).foobar(*(any args))\n    expected: 1 time with any arguments\n    received: 0 times with any arguments|
-        )
+        it "uses reports nil in the error message" do
+          RSpec::Mocks.configuration.allow_message_expectations_on_nil = true
+
+          nil_var = nil
+          expect(nil_var).to receive(:foobar)
+          expect {
+            verify nil_var
+          }.to raise_error(
+            RSpec::Mocks::MockExpectationError,
+            %Q|(nil).foobar(*(any args))\n    expected: 1 time with any arguments\n    received: 0 times with any arguments|
+          )
+        end
       end
 
       it "includes the class name in the error when mocking a class method that is called an extra time with the wrong args" do