rspec-mocks 2.6.0 → 2.7.0.rc1

data/spec/rspec/mocks/multiple_return_value_spec.rb

@@ -10,15 +10,15 @@ module RSpec
       end
 
       it "returns values in order to consecutive calls" do
-        @mock.message.should == @return_values[0]
-        @mock.message.should == @return_values[1]
-        @mock.message.should == @return_values[2]
+        @mock.message.should eq @return_values[0]
+        @mock.message.should eq @return_values[1]
+        @mock.message.should eq @return_values[2]
         @mock.rspec_verify
       end
 
       it "complains when there are too few calls" do
-        @mock.message.should == @return_values[0]
-        @mock.message.should == @return_values[1]
+        @mock.message.should eq @return_values[0]
+        @mock.message.should eq @return_values[1]
         expect { @mock.rspec_verify }.to raise_error(
           RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 2 times|
@@ -26,10 +26,10 @@ module RSpec
       end
 
       it "complains when there are too many calls" do
-        @mock.message.should == @return_values[0]
-        @mock.message.should == @return_values[1]
-        @mock.message.should == @return_values[2]
-        @mock.message.should == @return_values[2]
+        @mock.message.should eq @return_values[0]
+        @mock.message.should eq @return_values[1]
+        @mock.message.should eq @return_values[2]
+        @mock.message.should eq @return_values[2]
         expect { @mock.rspec_verify }.to raise_error(
           RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
@@ -38,10 +38,10 @@ module RSpec
 
       it "doesn't complain when there are too many calls but method is stubbed too" do
         @mock.stub(:message).and_return :stub_result
-        @mock.message.should == @return_values[0]
-        @mock.message.should == @return_values[1]
-        @mock.message.should == @return_values[2]
-        @mock.message.should == :stub_result
+        @mock.message.should eq @return_values[0]
+        @mock.message.should eq @return_values[1]
+        @mock.message.should eq @return_values[2]
+        @mock.message.should eq :stub_result
         expect { @mock.rspec_verify }.to_not raise_error(RSpec::Mocks::MockExpectationError)
       end
     end
@@ -54,16 +54,16 @@ module RSpec
       end
 
       it "returns values in order to consecutive calls" do
-        @mock.message.should == @return_values[0]
-        @mock.message.should == @return_values[1]
-        @mock.message.should == @return_values[2]
+        @mock.message.should eq @return_values[0]
+        @mock.message.should eq @return_values[1]
+        @mock.message.should eq @return_values[2]
         @mock.rspec_verify
       end
 
       it "complains when there are too few calls" do
         third = Object.new
-        @mock.message.should == @return_values[0]
-        @mock.message.should == @return_values[1]
+        @mock.message.should eq @return_values[0]
+        @mock.message.should eq @return_values[1]
         expect { @mock.rspec_verify }.to raise_error(
           RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 2 times|
@@ -72,10 +72,10 @@ module RSpec
 
       it "complains when there are too many calls" do
         third = Object.new
-        @mock.message.should == @return_values[0]
-        @mock.message.should == @return_values[1]
-        @mock.message.should == @return_values[2]
-        @mock.message.should == @return_values[2]
+        @mock.message.should eq @return_values[0]
+        @mock.message.should eq @return_values[1]
+        @mock.message.should eq @return_values[2]
+        @mock.message.should eq @return_values[2]
         expect { @mock.rspec_verify }.to raise_error(
           RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|
@@ -85,10 +85,10 @@ module RSpec
       it "complains when there are too many calls and method is stubbed too" do
         third = Object.new
         @mock.stub(:message).and_return :stub_result
-        @mock.message.should == @return_values[0]
-        @mock.message.should == @return_values[1]
-        @mock.message.should == @return_values[2]
-        @mock.message.should == :stub_result
+        @mock.message.should eq @return_values[0]
+        @mock.message.should eq @return_values[1]
+        @mock.message.should eq @return_values[2]
+        @mock.message.should eq :stub_result
         expect { @mock.rspec_verify }.to raise_error(
           RSpec::Mocks::MockExpectationError,
           %Q|(Mock "mock").message(any args)\n    expected: 3 times\n    received: 4 times|

data/spec/rspec/mocks/partial_mock_spec.rb

@@ -84,9 +84,10 @@ module RSpec
       it "uses reports nil in the error message" do
         allow_message_expectations_on_nil
         
-        @this_will_resolve_to_nil.should_receive(:foobar)
+        @nil = nil
+        @nil.should_receive(:foobar)
         expect {
-          @this_will_resolve_to_nil.rspec_verify
+          @nil.rspec_verify
         }.to raise_error(
           RSpec::Mocks::MockExpectationError, 
           %Q|(nil).foobar(any args)\n    expected: 1 time\n    received: 0 times|

data/spec/rspec/mocks/partial_mock_using_mocks_directly_spec.rb

@@ -5,6 +5,7 @@ module RSpec::Mocks
     let(:klass) do
       Class.new do
         module MethodMissing
+          remove_method :method_missing rescue nil
           def method_missing(m, *a, &b)
             if m == :captured_by_method_missing
               "response generated by method missing"

data/spec/rspec/mocks/passing_argument_matchers_spec.rb

@@ -87,11 +87,11 @@ module RSpec
       context "handling block matchers" do
         it "matches arguments against RSpec expectations" do
           @double.should_receive(:random_call).with {|arg1, arg2, arr, *rest|
-            arg1.should == 5
+            arg1.should eq 5
             arg2.should have_at_least(3).characters
             arg2.should have_at_most(10).characters
-            arr.map {|i| i * 2}.should == [2,4,6]
-            rest.should == [:fee, "fi", 4]
+            arr.map {|i| i * 2}.should eq [2,4,6]
+            rest.should eq [:fee, "fi", 4]
           }
           @double.random_call 5, "hello", [1,2,3], :fee, "fi", 4
         end

data/spec/rspec/mocks/precise_counts_spec.rb

@@ -33,7 +33,7 @@ module RSpec
 
       it "returns the value given by a block when the exactly once method is called" do
         @mock.should_receive(:to_s).exactly(:once) { "testing" }
-        @mock.to_s.should == "testing"
+        @mock.to_s.should eq "testing"
         @mock.rspec_verify
       end
 

data/spec/rspec/mocks/serialization_spec.rb

@@ -64,7 +64,12 @@ module RSpec
       end
 
       with_yaml_loaded do
-        compiled_with_psych = RbConfig::CONFIG['configure_args'] =~ /with-libyaml/
+        compiled_with_psych = begin
+          require 'psych'
+          true
+        rescue LoadError => e
+          false
+        end
 
         if compiled_with_psych
           context 'using Syck as the YAML engine' do
@@ -98,7 +103,7 @@ module RSpec
 
         it 'does not interfere with its marshalling' do
           marshalled_copy = Marshal.load(Marshal.dump(subject))
-          marshalled_copy.should == subject
+          marshalled_copy.should eq subject
         end
       end
     end

data/spec/rspec/mocks/stub_implementation_spec.rb

@@ -7,7 +7,7 @@ module RSpec
         it "execs the block when called" do
           obj = stub()
           obj.stub(:foo) { :bar }
-          obj.foo.should == :bar
+          obj.foo.should eq :bar
         end
       end
 
@@ -15,7 +15,7 @@ module RSpec
         it "execs the block with that arg when called" do
           obj = stub()
           obj.stub(:foo) {|given| given}
-          obj.foo(:bar).should == :bar
+          obj.foo(:bar).should eq :bar
         end
       end
 
@@ -23,7 +23,7 @@ module RSpec
         it "execs the block when called" do
           obj = stub()
           obj.stub(:foo) {|*given| given.first}
-          obj.foo(:bar).should == :bar
+          obj.foo(:bar).should eq :bar
         end        
       end
     end
@@ -35,7 +35,7 @@ module RSpec
         def obj.foo; :original; end
         obj.stub(:foo)
         obj.unstub(:foo)
-        obj.foo.should == :original
+        obj.foo.should eq :original
       end
     
       it "removes all stubs with the supplied method name" do
@@ -44,7 +44,7 @@ module RSpec
         obj.stub(:foo).with(1)
         obj.stub(:foo).with(2)
         obj.unstub(:foo)
-        obj.foo.should == :original
+        obj.foo.should eq :original
       end
     
       it "does not remove any expectations with the same method name" do
@@ -54,7 +54,7 @@ module RSpec
         obj.stub(:foo).with(1)
         obj.stub(:foo).with(2)
         obj.unstub(:foo)
-        obj.foo(3).should == :three
+        obj.foo(3).should eq :three
       end
     
       it "raises a MockExpectationError if the method has not been stubbed" do

data/spec/rspec/mocks/stub_spec.rb

@@ -134,7 +134,7 @@ module RSpec
         @instance.stub(:method_that_yields).and_yield(:yielded_obj)
         current_value = :value_before
         @instance.method_that_yields {|val| current_value = val}
-        current_value.should == :yielded_obj
+        current_value.should eq :yielded_obj
         @instance.rspec_verify
       end
 
@@ -143,7 +143,7 @@ module RSpec
                                                        and_yield(:another_value)
         current_value = []
         @instance.method_that_yields_multiple_times {|val| current_value << val}
-        current_value.should == [:yielded_value, :another_value]
+        current_value.should eq [:yielded_value, :another_value]
         @instance.rspec_verify
       end
       
@@ -151,7 +151,7 @@ module RSpec
         yielded_obj = double("my mock")
         yielded_obj.should_receive(:foo).with(:bar)
         @instance.stub(:method_that_yields_and_returns).and_yield(yielded_obj).and_return(:baz)
-        @instance.method_that_yields_and_returns { |o| o.foo :bar }.should == :baz
+        @instance.method_that_yields_and_returns { |o| o.foo :bar }.should eq :baz
       end
 
       it "throws when told to" do
@@ -163,13 +163,13 @@ module RSpec
       
       it "overrides a pre-existing method" do
         @stub.stub(:existing_instance_method).and_return(:updated_stub_value)
-        @stub.existing_instance_method.should == :updated_stub_value
+        @stub.existing_instance_method.should eq :updated_stub_value
       end
 
       it "overrides a pre-existing stub" do
         @stub.stub(:foo) { 'bar' }
         @stub.stub(:foo) { 'baz' }
-        @stub.foo.should == 'baz'
+        @stub.foo.should eq 'baz'
       end
       
       it "allows a stub and an expectation" do
@@ -181,7 +181,7 @@ module RSpec
 
       it "calculates return value by executing block passed to #and_return" do
         @stub.stub(:something).with("a","b","c").and_return { |a,b,c| c+b+a }
-        @stub.something("a","b","c").should == "cba"
+        @stub.something("a","b","c").should eq "cba"
         @stub.rspec_verify
       end
     end

data/spec/rspec/mocks/to_ary_spec.rb

@@ -7,11 +7,20 @@ describe "a double receiving to_ary" do
         obj.to_ary.should be_nil
       end.to raise_error(NoMethodError)
     end
+    
+    it "doesn't respond" do
+      obj.should_not respond_to(:to_ary)
+    end
 
     it "can be overridden with a stub" do
       obj.stub(:to_ary) { :non_nil_value }
       obj.to_ary.should be(:non_nil_value)
     end
+    
+    it "responds when overriden" do
+      obj.stub(:to_ary) { :non_nil_value }
+      obj.should respond_to(:to_ary)
+    end
 
     it "supports Array#flatten" do
       obj = double('foo')

metadata

@@ -1,13 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 23
-  prerelease: 
+  hash: 15424039
+  prerelease: 6
   segments: 
   - 2
-  - 6
+  - 7
   - 0
-  version: 2.6.0
+  - rc
+  - 1
+  version: 2.7.0.rc1
 platform: ruby
 authors: 
 - David Chelimsky
@@ -16,8 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-12 00:00:00 -05:00
-default_executable: 
+date: 2011-10-09 00:00:00 Z
 dependencies: []
 
 description: RSpec's 'test double' framework, with support for stubbing and mocking
@@ -29,39 +30,14 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- .autotest
-- .document
-- .gitignore
-- .travis.yml
-- Gemfile
-- Guardfile
-- License.txt
-- README.md
-- Rakefile
-- autotest/discover.rb
-- cucumber.yml
-- features/.nav
-- features/Changelog.md
-- features/README.markdown
-- features/Upgrade.md
-- features/message_expectations/README.md
-- features/message_expectations/any_instance.feature
-- features/message_expectations/block_local_expectations.feature.pending
-- features/message_expectations/expect_message.feature
-- features/message_expectations/warn_when_expectation_is_set_on_nil.feature
-- 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/stub_chain.feature
-- features/method_stubs/stub_implementation.feature
-- features/method_stubs/to_ary.feature
-- features/outside_rspec/configuration.feature
-- features/outside_rspec/standalone.feature
-- features/step_definitions/additional_cli_steps.rb
-- features/support/env.rb
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance.rb
+- lib/rspec/mocks/any_instance/chain.rb
+- lib/rspec/mocks/any_instance/expectation_chain.rb
+- lib/rspec/mocks/any_instance/message_chains.rb
+- lib/rspec/mocks/any_instance/recorder.rb
+- lib/rspec/mocks/any_instance/stub_chain.rb
+- lib/rspec/mocks/any_instance/stub_chain_chain.rb
 - lib/rspec/mocks/argument_expectation.rb
 - lib/rspec/mocks/argument_matchers.rb
 - lib/rspec/mocks/error_generator.rb
@@ -82,8 +58,33 @@ files:
 - lib/rspec/mocks/standalone.rb
 - lib/rspec/mocks/version.rb
 - lib/spec/mocks.rb
-- rspec-mocks.gemspec
+- README.md
+- features/README.markdown
+- features/Scope.md
+- features/Upgrade.md
+- features/argument_matchers/README.md
+- features/argument_matchers/explicit.feature
+- features/argument_matchers/general_matchers.feature
+- features/argument_matchers/type_matchers.feature
+- features/message_expectations/README.md
+- features/message_expectations/any_instance.feature
+- features/message_expectations/block_local_expectations.feature.pending
+- features/message_expectations/expect_message.feature
+- features/message_expectations/receive_counts.feature
+- features/message_expectations/warn_when_expectation_is_set_on_nil.feature
+- 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/stub_chain.feature
+- features/method_stubs/stub_implementation.feature
+- features/method_stubs/to_ary.feature
+- features/outside_rspec/configuration.feature
+- features/outside_rspec/standalone.feature
+- features/step_definitions/additional_cli_steps.rb
+- features/support/env.rb
 - spec/rspec/mocks/and_yield_spec.rb
+- spec/rspec/mocks/any_instance/message_chains_spec.rb
 - spec/rspec/mocks/any_instance_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb
 - spec/rspec/mocks/argument_expectation_spec.rb
@@ -126,8 +127,6 @@ files:
 - spec/rspec/mocks/twice_counts_spec.rb
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
-- specs.watchr
-has_rdoc: true
 homepage: http://github.com/rspec/rspec-mocks
 licenses: []
 
@@ -148,27 +147,34 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 25
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.6.2
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.6.0
+summary: rspec-mocks-2.7.0.rc1
 test_files: 
-- features/Changelog.md
 - features/README.markdown
+- features/Scope.md
 - features/Upgrade.md
+- features/argument_matchers/README.md
+- features/argument_matchers/explicit.feature
+- features/argument_matchers/general_matchers.feature
+- features/argument_matchers/type_matchers.feature
 - features/message_expectations/README.md
 - features/message_expectations/any_instance.feature
 - features/message_expectations/block_local_expectations.feature.pending
 - features/message_expectations/expect_message.feature
+- features/message_expectations/receive_counts.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
 - features/method_stubs/README.md
 - features/method_stubs/any_instance.feature
@@ -182,6 +188,7 @@ test_files:
 - features/step_definitions/additional_cli_steps.rb
 - features/support/env.rb
 - spec/rspec/mocks/and_yield_spec.rb
+- spec/rspec/mocks/any_instance/message_chains_spec.rb
 - spec/rspec/mocks/any_instance_spec.rb
 - spec/rspec/mocks/any_number_of_times_spec.rb
 - spec/rspec/mocks/argument_expectation_spec.rb