Use syntax agnostic matchers for should syntax.

Signed-off-by: Sam Phippen <[email protected]>

Author: Sam Phippen

lib/rspec/mocks.rb

@@ -30,14 +30,16 @@ def any_instance_recorder_for(klass)
         space.any_instance_recorder_for(klass)
       end
 
-      def allow_message(subject, message, &block)
+      # Adds an allowance (stub) on `subject`
+      def allow_message(subject, message, opts={}, &block)
         ::RSpec::Mocks.proxy_for(subject).
-          add_stub(caller(1)[0], message.to_sym, &block)
+          add_stub(caller(1)[0], message.to_sym, opts, &block)
       end
 
-      def expect_message(subject, message, &block)
+      # Sets a message expectation on `subject`.
+      def expect_message(subject, message, opts={}, orig_caller=caller(1)[0], &block)
         ::RSpec::Mocks.proxy_for(subject).
-          add_message_expectation(caller(1)[0], message.to_sym, &block)
+          add_message_expectation(opts[:expected_from] || orig_caller, message.to_sym, opts, &block)
       end
 
       # @api private

lib/rspec/mocks/proxy_for_nil.rb

@@ -28,7 +28,7 @@ def add_stub(location, method_name, opts={}, &implementation)
       private
 
       def warn method_name
-        Kernel.warn("An expectation of :#{method_name} was set on nil. Called from #{caller[2]}. Use allow_message_expectations_on_nil to disable warnings.")
+        Kernel.warn("An expectation of :#{method_name} was set on nil. Called from #{caller[3]}. Use allow_message_expectations_on_nil to disable warnings.")
       end
 
     end

lib/rspec/mocks/syntax.rb

@@ -12,20 +12,18 @@ def self.enable_should(syntax_host = default_should_syntax_host)
 
         syntax_host.class_eval do
           def should_receive(message, opts={}, &block)
-            proxy = ::RSpec::Mocks.proxy_for(self)
-            proxy.add_message_expectation(opts[:expected_from] || caller(1)[0], message.to_sym, opts, &block)
+            ::RSpec::Mocks.expect_message(self, message.to_sym, opts, caller(1)[0], &block)
           end
 
           def should_not_receive(message, &block)
-            proxy = ::RSpec::Mocks.proxy_for(self)
-            proxy.add_negative_message_expectation(caller(1)[0], message.to_sym, &block)
+            ::RSpec::Mocks.expect_message(self, message.to_sym, {}, caller(1)[0], &block).never
           end
 
           def stub(message_or_hash, opts={}, &block)
             if ::Hash === message_or_hash
               message_or_hash.each {|message, value| stub(message).and_return value }
             else
-              ::RSpec::Mocks.proxy_for(self).add_stub(caller(1)[0], message_or_hash.to_sym, opts, &block)
+              ::RSpec::Mocks.allow_message(self, message_or_hash, opts, &block)
             end
           end
 

spec/rspec/mocks/syntax_agnostic_message_matchers_spec.rb

@@ -46,6 +46,13 @@ module Mocks
         expect { verify subject }.to raise_error(RSpec::Mocks::MockExpectationError)
       end
 
+      it "fails if never is specified and the message is called" do
+        expect {
+          ::RSpec::Mocks.expect_message(subject, :foo).never
+          subject.foo
+        }.to raise_error(/expected.*0 times/)
+      end
+
       it "sets up basic message expectation, verifies as called" do
         ::RSpec::Mocks.expect_message(subject, :basic)
         subject.basic