rspec-mocks 2.14.0.rc1 → 2.14.0

data/spec/rspec/mocks/mock_spec.rb

@@ -42,10 +42,34 @@ module RSpec
         verify @double
       end
 
-      it "warns when should_not_receive is followed by and_return" do
-        expect(RSpec).to receive(:deprecate).with("and_return with should_not_receive")
+      it "prevents confusing double-negative expressions involving `never`" do
+        expect {
+          @double.should_not_receive(:not_expected).never
+        }.to raise_error(/trying to negate it again/)
+      end
+
+      def expect_and_return_warning
+        expect(RSpec).to receive(:deprecate).with(/`and_return` on a negative message expectation/)
+      end
 
-        @double.should_not_receive(:do_something).and_return(1)
+      it "warns when `should_not_receive().and_return` is used" do
+        expect_and_return_warning
+        @double.should_not_receive(:foo).and_return(1)
+      end
+
+      it "warns when `should_receive().never.and_return` is used" do
+        expect_and_return_warning
+        @double.should_receive(:foo).never.and_return(1)
+      end
+
+      it "warns when `expect().not_to receive().and_return` is used" do
+        expect_and_return_warning
+        expect(@double).not_to receive(:foo).and_return(1)
+      end
+
+      it "warns when `expect().to receive().never.and_return` is used" do
+        expect_and_return_warning
+        expect(@double).to receive(:foo).never.and_return(1)
       end
 
       it "passes when receiving message specified as not to be received with different args" do
@@ -92,6 +116,10 @@ module RSpec
         @double.should_not_receive(:not_expected).with("unexpected text")
         @double.not_expected "really unexpected text"
         verify @double
+
+        @double.should_receive(:not_expected).with("unexpected text").never
+        @double.not_expected "really unexpected text"
+        verify @double
       end
 
       it "allows block to calculate return values" do

data/spec/rspec/mocks/partial_mock_spec.rb

@@ -36,7 +36,7 @@ module RSpec
       end
 
       it "should_not_receive returns a negative message expectation" do
-        expect(object.should_not_receive(:foobar)).to be_kind_of(RSpec::Mocks::NegativeMessageExpectation)
+        expect(object.should_not_receive(:foobar)).to be_negative
       end
 
       it "should_receive mocks out the method" do
@@ -55,8 +55,8 @@ module RSpec
         expect(object.foobar(hash[:a])).to equal(1)
       end
 
-      it "should_receive returns a message expectation" do
-        expect(object.should_receive(:foobar)).to be_kind_of(RSpec::Mocks::MessageExpectation)
+      it "should_receive returns a positive message expectation" do
+        expect(object.should_receive(:foobar)).not_to be_negative
         object.foobar
       end
 

data/spec/rspec/mocks/syntax_agnostic_message_matchers_spec.rb

@@ -0,0 +1,81 @@
+require "spec_helper"
+
+module RSpec
+  module Mocks
+
+    describe ".allow_message" do
+      let(:subject) { Object.new }
+
+      it "sets up basic message allowance" do
+        expect {
+          ::RSpec::Mocks.allow_message(subject, :basic)
+        }.to change {
+          subject.respond_to?(:basic)
+        }.to(true)
+
+        expect(subject.basic).to eq(nil)
+      end
+
+      it "sets up message allowance with params and return value" do
+        expect {
+          ::RSpec::Mocks.allow_message(subject, :x).with(:in).and_return(:out)
+        }.to change {
+          subject.respond_to?(:x)
+        }.to(true)
+
+        expect(subject.x(:in)).to eq(:out)
+      end
+
+      it "supports block implementations" do
+        ::RSpec::Mocks.allow_message(subject, :message) { :value }
+        expect(subject.message).to eq(:value)
+      end
+
+      it "does not set an expectation that the message will be received" do
+        ::RSpec::Mocks.allow_message(subject, :message)
+        expect { verify subject }.not_to raise_error
+      end
+    end
+
+    describe ".expect_message" do
+      let(:subject) { Object.new }
+
+      it "sets up basic message expectation, verifies as uncalled" do
+        expect {
+          ::RSpec::Mocks.expect_message(subject, :basic)
+        }.to change {
+          subject.respond_to?(:basic)
+        }.to(true)
+
+        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
+        verify subject
+      end
+
+      it "sets up message expectation with params and return value" do
+        ::RSpec::Mocks.expect_message(subject, :msg).with(:in).and_return(:out)
+        expect(subject.msg(:in)).to eq(:out)
+        verify subject
+      end
+
+      it "accepts a block implementation for the expected message" do
+        ::RSpec::Mocks.expect_message(subject, :msg) { :value }
+        expect(subject.msg).to eq(:value)
+        verify subject
+      end
+
+    end
+
+  end
+end

data/spec/rspec/mocks/test_double_spec.rb

@@ -31,13 +31,18 @@ module RSpec
         expect { double.foo }.to raise_error(/Mock "MyDouble" received/)
       end
 
-      it 'stubs the methods passed in the stubs hash' do
-        double = Module.new do
-          TestDouble.extend_onto(self, "MyDouble", :a => 5, :b => 10)
-        end
+      [[:should, :expect], [:expect], [:should]].each do |syntax|
+        context "with syntax #{syntax.inspect}" do
+          include_context "with syntax", syntax
+          it 'stubs the methods passed in the stubs hash' do
+            double = Module.new do
+              TestDouble.extend_onto(self, "MyDouble", :a => 5, :b => 10)
+            end
 
-        expect(double.a).to eq(5)
-        expect(double.b).to eq(10)
+            expect(double.a).to eq(5)
+            expect(double.b).to eq(10)
+          end
+        end
       end
 
       it 'indicates what type of test double it is in error messages' do
@@ -51,6 +56,11 @@ module RSpec
         double = Module.new { TestDouble.extend_onto(self) }
         expect { double.foo }.to raise_error(/Mock received/)
       end
+
+      it 'warns of deprecation of :null_object => true' do
+        RSpec.should_receive :deprecate
+        double = Class.new { TestDouble.extend_onto self, 'name', :null_object => true }
+      end
     end
   end
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: rspec-mocks
 version: !ruby/object:Gem::Version
-  prerelease: 7
-  version: 2.14.0.rc1
+  prerelease: 
+  version: 2.14.0
 platform: ruby
 authors:
 - Steven Baker
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-27 00:00:00.000000000 Z
+date: 2013-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -114,9 +114,11 @@ files:
 - features/argument_matchers/general_matchers.feature
 - features/argument_matchers/type_matchers.feature
 - features/message_expectations/README.md
+- features/message_expectations/allow_any_instance_of.feature
 - features/message_expectations/any_instance.feature
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/call_original.feature
+- features/message_expectations/expect_any_instance_of.feature
 - features/message_expectations/expect_message_using_expect.feature
 - features/message_expectations/expect_message_using_should_receive.feature
 - features/message_expectations/receive_counts.feature
@@ -124,7 +126,8 @@ files:
 - features/method_stubs/README.md
 - features/method_stubs/any_instance.feature
 - features/method_stubs/as_null_object.feature
-- features/method_stubs/simple_return_value.feature
+- features/method_stubs/simple_return_value_with_allow.feature
+- features/method_stubs/simple_return_value_with_stub.feature
 - features/method_stubs/stub_chain.feature
 - features/method_stubs/stub_implementation.feature
 - features/method_stubs/to_ary.feature
@@ -158,8 +161,10 @@ files:
 - spec/rspec/mocks/bug_report_8165_spec.rb
 - spec/rspec/mocks/bug_report_830_spec.rb
 - spec/rspec/mocks/bug_report_957_spec.rb
+- spec/rspec/mocks/combining_implementation_instructions_spec.rb
 - spec/rspec/mocks/configuration_spec.rb
 - spec/rspec/mocks/double_spec.rb
+- spec/rspec/mocks/extensions/marshal_spec.rb
 - spec/rspec/mocks/failing_argument_matchers_spec.rb
 - spec/rspec/mocks/hash_excluding_matcher_spec.rb
 - spec/rspec/mocks/hash_including_matcher_spec.rb
@@ -187,6 +192,7 @@ files:
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
+- spec/rspec/mocks/syntax_agnostic_message_matchers_spec.rb
 - spec/rspec/mocks/test_double_spec.rb
 - spec/rspec/mocks/to_ary_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb
@@ -207,20 +213,23 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1552323332526866969
+      hash: 3612137047295133706
   none: false
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: 3612137047295133706
   none: false
 requirements: []
 rubyforge_project: rspec
 rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.14.0.rc1
+summary: rspec-mocks-2.14.0
 test_files:
 - features/README.md
 - features/Scope.md
@@ -230,9 +239,11 @@ test_files:
 - features/argument_matchers/general_matchers.feature
 - features/argument_matchers/type_matchers.feature
 - features/message_expectations/README.md
+- features/message_expectations/allow_any_instance_of.feature
 - features/message_expectations/any_instance.feature
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/call_original.feature
+- features/message_expectations/expect_any_instance_of.feature
 - features/message_expectations/expect_message_using_expect.feature
 - features/message_expectations/expect_message_using_should_receive.feature
 - features/message_expectations/receive_counts.feature
@@ -240,7 +251,8 @@ test_files:
 - features/method_stubs/README.md
 - features/method_stubs/any_instance.feature
 - features/method_stubs/as_null_object.feature
-- features/method_stubs/simple_return_value.feature
+- features/method_stubs/simple_return_value_with_allow.feature
+- features/method_stubs/simple_return_value_with_stub.feature
 - features/method_stubs/stub_chain.feature
 - features/method_stubs/stub_implementation.feature
 - features/method_stubs/to_ary.feature
@@ -274,8 +286,10 @@ test_files:
 - spec/rspec/mocks/bug_report_8165_spec.rb
 - spec/rspec/mocks/bug_report_830_spec.rb
 - spec/rspec/mocks/bug_report_957_spec.rb
+- spec/rspec/mocks/combining_implementation_instructions_spec.rb
 - spec/rspec/mocks/configuration_spec.rb
 - spec/rspec/mocks/double_spec.rb
+- spec/rspec/mocks/extensions/marshal_spec.rb
 - spec/rspec/mocks/failing_argument_matchers_spec.rb
 - spec/rspec/mocks/hash_excluding_matcher_spec.rb
 - spec/rspec/mocks/hash_including_matcher_spec.rb
@@ -303,6 +317,7 @@ test_files:
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
+- spec/rspec/mocks/syntax_agnostic_message_matchers_spec.rb
 - spec/rspec/mocks/test_double_spec.rb
 - spec/rspec/mocks/to_ary_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb