rspec-mocks 2.9.0 → 2.10.0

data/spec/rspec/mocks/once_counts_spec.rb

@@ -2,52 +2,51 @@ require 'spec_helper'
 
 module RSpec
   module Mocks
-    describe "OnceCounts" do
+    describe "#once" do
       before(:each) do
-        @mock = double("test mock")
+        @double = double
       end
 
-      it "once fails when called once with wrong args" do
-        @mock.should_receive(:random_call).once.with("a", "b", "c")
+      it "passes when called once" do
+        @double.should_receive(:do_something).once
+        @double.do_something
+        @double.rspec_verify
+      end
+
+      it "passes when called once with specified args" do
+        @double.should_receive(:do_something).once.with("a", "b", "c")
+        @double.do_something("a", "b", "c")
+        @double.rspec_verify
+      end
+
+      it "passes when called once with unspecified args" do
+        @double.should_receive(:do_something).once
+        @double.do_something("a", "b", "c")
+        @double.rspec_verify
+      end
+
+      it "fails when called with wrong args" do
+        @double.should_receive(:do_something).once.with("a", "b", "c")
         lambda do
-          @mock.random_call("d", "e", "f")
+          @double.do_something("d", "e", "f")
         end.should raise_error(RSpec::Mocks::MockExpectationError)
-        @mock.rspec_reset
+        @double.rspec_reset
       end
 
-      it "once fails when called twice" do
-        @mock.should_receive(:random_call).once
-        @mock.random_call
-        @mock.random_call
+      it "fails fast when called twice" do
+        @double.should_receive(:do_something).once
+        @double.do_something
         lambda do
-          @mock.rspec_verify
+          @double.do_something
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
       
-      it "once fails when not called" do
-        @mock.should_receive(:random_call).once
+      it "fails when not called" do
+        @double.should_receive(:do_something).once
         lambda do
-          @mock.rspec_verify
+          @double.rspec_verify
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
-
-      it "once passes when called once" do
-        @mock.should_receive(:random_call).once
-        @mock.random_call
-        @mock.rspec_verify
-      end
-
-      it "once passes when called once with specified args" do
-        @mock.should_receive(:random_call).once.with("a", "b", "c")
-        @mock.random_call("a", "b", "c")
-        @mock.rspec_verify
-      end
-
-      it "once passes when called once with unspecified args" do
-        @mock.should_receive(:random_call).once
-        @mock.random_call("a", "b", "c")
-        @mock.rspec_verify
-      end
     end
   end
 end

data/spec/rspec/mocks/precise_counts_spec.rb

@@ -4,54 +4,64 @@ module RSpec
   module Mocks
     describe "PreciseCounts" do
       before(:each) do
-        @mock = double("test mock")
+        @double = double("test double")
       end
 
       it "fails when exactly n times method is called less than n times" do
-        @mock.should_receive(:random_call).exactly(3).times
-        @mock.random_call
-        @mock.random_call
+        @double.should_receive(:do_something).exactly(3).times
+        @double.do_something
+        @double.do_something
         lambda do
-          @mock.rspec_verify
+          @double.rspec_verify
+        end.should raise_error(RSpec::Mocks::MockExpectationError)
+      end
+
+      it "fails fast when exactly n times method is called more than n times" do
+        @double.should_receive(:do_something).exactly(3).times
+        @double.do_something
+        @double.do_something
+        @double.do_something
+        lambda do
+          @double.do_something
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "fails when exactly n times method is never called" do
-        @mock.should_receive(:random_call).exactly(3).times
+        @double.should_receive(:do_something).exactly(3).times
         lambda do
-          @mock.rspec_verify
+          @double.rspec_verify
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
 
       it "passes if exactly n times method is called exactly n times" do
-        @mock.should_receive(:random_call).exactly(3).times
-        @mock.random_call
-        @mock.random_call
-        @mock.random_call
-        @mock.rspec_verify
+        @double.should_receive(:do_something).exactly(3).times
+        @double.do_something
+        @double.do_something
+        @double.do_something
+        @double.rspec_verify
       end
 
       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 eq "testing"
-        @mock.rspec_verify
+        @double.should_receive(:to_s).exactly(:once) { "testing" }
+        @double.to_s.should eq "testing"
+        @double.rspec_verify
       end
 
-      it "passes multiple calls with different args and counts" do
-        @mock.should_receive(:random_call).twice.with(1)
-        @mock.should_receive(:random_call).once.with(2)
-        @mock.random_call(1)
-        @mock.random_call(2)
-        @mock.random_call(1)
-        @mock.rspec_verify
+      it "passes mutiple calls with different args" do
+        @double.should_receive(:do_something).once.with(1)
+        @double.should_receive(:do_something).once.with(2)
+        @double.do_something(1)
+        @double.do_something(2)
+        @double.rspec_verify
       end
 
-      it "passes mutiple calls with different args" do
-        @mock.should_receive(:random_call).once.with(1)
-        @mock.should_receive(:random_call).once.with(2)
-        @mock.random_call(1)
-        @mock.random_call(2)
-        @mock.rspec_verify
+      it "passes multiple calls with different args and counts" do
+        @double.should_receive(:do_something).twice.with(1)
+        @double.should_receive(:do_something).once.with(2)
+        @double.do_something(1)
+        @double.do_something(2)
+        @double.do_something(1)
+        @double.rspec_verify
       end
     end
   end

data/spec/rspec/mocks/serialization_spec.rb

@@ -2,21 +2,22 @@ require 'spec_helper'
 
 module RSpec
   module Mocks
-    class SerializableStruct < Struct.new(:foo, :bar); end
+    describe Serialization do
 
-    class SerializableMockProxy
-      attr_reader :mock_proxy
+      class SerializableObject < Struct.new(:foo, :bar); end
 
-      def initialize(mock_proxy)
-        @mock_proxy = mock_proxy
-      end
+      class SerializableMockProxy
+        attr_reader :mock_proxy
+
+        def initialize(mock_proxy)
+          @mock_proxy = mock_proxy
+        end
 
-      def ==(other)
-        other.class == self.class && other.mock_proxy == mock_proxy
+        def ==(other)
+          other.class == self.class && other.mock_proxy == mock_proxy
+        end
       end
-    end
 
-    describe Serialization do
       def self.with_yaml_loaded(&block)
         context 'with YAML loaded' do
           module_eval(&block)
@@ -25,7 +26,7 @@ module RSpec
 
       def self.without_yaml_loaded(&block)
         context 'without YAML loaded' do
-          before(:each) do
+          before do
             # We can't really unload yaml, but we can fake it here...
             @orig_yaml_constant = Object.send(:remove_const, :YAML)
             Struct.class_eval do
@@ -36,7 +37,7 @@ module RSpec
 
           module_eval(&block)
 
-          after(:each) do
+          after do
             Object.const_set(:YAML, @orig_yaml_constant)
             Struct.class_eval do
               alias to_yaml __old_to_yaml
@@ -46,19 +47,19 @@ module RSpec
         end
       end
 
-      subject { RSpec::Mocks::SerializableStruct.new(7, "something") }
+      let(:serializable_object) { RSpec::Mocks::SerializableObject.new(7, "something") }
 
       def set_stub
-        subject.stub(:bazz => 5)
+        serializable_object.stub(:bazz => 5)
       end
 
       shared_examples_for 'normal YAML serialization' do
         it 'serializes to yaml the same with and without stubbing, using #to_yaml' do
-          expect { set_stub }.to_not change { subject.to_yaml }
+          expect { set_stub }.to_not change { serializable_object.to_yaml }
         end
 
         it 'serializes to yaml the same with and without stubbing, using YAML.dump' do
-          expect { set_stub }.to_not change { YAML.dump(subject) }
+          expect { set_stub }.to_not change { YAML.dump(serializable_object) }
         end
       end
 
@@ -87,22 +88,22 @@ module RSpec
 
       without_yaml_loaded do
         it 'does not add #to_yaml to the stubbed object' do
-          subject.should_not respond_to(:to_yaml)
+          serializable_object.should_not respond_to(:to_yaml)
           set_stub
-          subject.should_not respond_to(:to_yaml)
+          serializable_object.should_not respond_to(:to_yaml)
         end
       end
 
       it 'marshals the same with and without stubbing' do
-        expect { set_stub }.to_not change { Marshal.dump(subject) }
+        expect { set_stub }.to_not change { Marshal.dump(serializable_object) }
       end
 
       describe "an object that has its own mock_proxy instance variable" do
-        subject { RSpec::Mocks::SerializableMockProxy.new(:my_mock_proxy) }
+        let(:serializable_object) { RSpec::Mocks::SerializableMockProxy.new(:my_mock_proxy) }
 
         it 'does not interfere with its marshalling' do
-          marshalled_copy = Marshal.load(Marshal.dump(subject))
-          marshalled_copy.should eq subject
+          marshalled_copy = Marshal.load(Marshal.dump(serializable_object))
+          marshalled_copy.should eq serializable_object
         end
       end
     end

data/spec/rspec/mocks/test_double_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+module RSpec
+  module Mocks
+    describe TestDouble do
+      before(:all) do
+        Module.class_eval do
+          private
+          def use; end
+        end
+      end
+
+      after(:all) do
+        Module.class_eval do
+          undef use
+        end
+      end
+
+      it 'can be extended onto a module to make it a pure test double that can mock private methods' do
+        double = Module.new
+        double.stub(:use)
+        expect { double.use }.to raise_error(/private method `use' called/)
+
+        double = Module.new { TestDouble.extend_onto(self) }
+        double.should_receive(:use).and_return(:ok)
+        double.use.should be(:ok)
+      end
+
+      it 'sets the test double name when a name is passed' do
+        double = Module.new { TestDouble.extend_onto(self, "MyDouble") }
+        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
+
+        double.a.should eq(5)
+        double.b.should eq(10)
+      end
+
+      it 'indicates what type of test double it is in error messages' do
+        double = Module.new do
+          TestDouble.extend_onto(self, "A", :__declared_as => "ModuleMock")
+        end
+        expect { double.foo }.to raise_error(/ModuleMock "A"/)
+      end
+
+      it 'is declared as a mock by default' do
+        double = Module.new { TestDouble.extend_onto(self) }
+        expect { double.foo }.to raise_error(/Mock received/)
+      end
+    end
+  end
+end
+

data/spec/rspec/mocks/twice_counts_spec.rb

@@ -2,65 +2,64 @@ require 'spec_helper'
 
 module RSpec
   module Mocks
-    describe "TwiceCounts" do
+    describe "#twice" do
       before(:each) do
-        @mock = double("test mock")
+        @double = double("test double")
       end
 
-      it "twice should fail when call count is higher than expected" do
-        @mock.should_receive(:random_call).twice
-        @mock.random_call
-        @mock.random_call
-        @mock.random_call
+      it "passes when called twice" do
+        @double.should_receive(:do_something).twice
+        @double.do_something
+        @double.do_something
+        @double.rspec_verify
+      end
+
+      it "passes when called twice with specified args" do
+        @double.should_receive(:do_something).twice.with("1", 1)
+        @double.do_something("1", 1)
+        @double.do_something("1", 1)
+        @double.rspec_verify
+      end
+
+      it "passes when called twice with unspecified args" do
+        @double.should_receive(:do_something).twice
+        @double.do_something("1")
+        @double.do_something(1)
+        @double.rspec_verify
+      end
+
+      it "fails fast when call count is higher than expected" do
+        @double.should_receive(:do_something).twice
+        @double.do_something
+        @double.do_something
         lambda do
-          @mock.rspec_verify
+          @double.do_something
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
-      
-      it "twice should fail when call count is lower than expected" do
-        @mock.should_receive(:random_call).twice
-        @mock.random_call
+
+      it "fails when call count is lower than expected" do
+        @double.should_receive(:do_something).twice
+        @double.do_something
         lambda do
-          @mock.rspec_verify
+          @double.rspec_verify
         end.should raise_error(RSpec::Mocks::MockExpectationError)
       end
-      
-      it "twice should fail when called twice with wrong args on the first call" do
-        @mock.should_receive(:random_call).twice.with("1", 1)
+
+      it "fails when called wrong args on the first call" do
+        @double.should_receive(:do_something).twice.with("1", 1)
         lambda do
-          @mock.random_call(1, "1")
+          @double.do_something(1, "1")
         end.should raise_error(RSpec::Mocks::MockExpectationError)
-        @mock.rspec_reset
+        @double.rspec_reset
       end
-      
-      it "twice should fail when called twice with wrong args on the second call" do
-        @mock.should_receive(:random_call).twice.with("1", 1)
-        @mock.random_call("1", 1)
+
+      it "fails when called with wrong args on the second call" do
+        @double.should_receive(:do_something).twice.with("1", 1)
+        @double.do_something("1", 1)
         lambda do
-          @mock.random_call(1, "1")
+          @double.do_something(1, "1")
         end.should raise_error(RSpec::Mocks::MockExpectationError)
-        @mock.rspec_reset
-      end
-      
-      it "twice should pass when called twice" do
-        @mock.should_receive(:random_call).twice
-        @mock.random_call
-        @mock.random_call
-        @mock.rspec_verify
-      end
-      
-      it "twice should pass when called twice with specified args" do
-        @mock.should_receive(:random_call).twice.with("1", 1)
-        @mock.random_call("1", 1)
-        @mock.random_call("1", 1)
-        @mock.rspec_verify
-      end
-      
-      it "twice should pass when called twice with unspecified args" do
-        @mock.should_receive(:random_call).twice
-        @mock.random_call("1")
-        @mock.random_call(1)
-        @mock.rspec_verify
+        @double.rspec_reset
       end
     end
   end

metadata

@@ -1,80 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rspec-mocks
-version: !ruby/object:Gem::Version 
-  hash: 43
+version: !ruby/object:Gem::Version
+  version: 2.10.0
   prerelease: 
-  segments: 
-  - 2
-  - 9
-  - 0
-  version: 2.9.0
 platform: ruby
-authors: 
+authors:
 - Steven Baker
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-17 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-05-04 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
+      - !ruby/object:Gem::Version
         version: 0.9.2
-  prerelease: false
-  requirement: *id001
-  name: rake
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 1
-        - 9
-        version: 1.1.9
-  prerelease: false
-  requirement: *id002
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+- !ruby/object:Gem::Dependency
   name: cucumber
-  type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 4
-        - 11
-        version: 0.4.11
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+  type: :development
   prerelease: false
-  requirement: *id003
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.9
+- !ruby/object:Gem::Dependency
   name: aruba
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.11
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.4.11
 description: RSpec's 'test double' framework, with support for stubbing and mocking
 email: rspec-users@rubyforge.org
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/rspec/mocks.rb
 - lib/rspec/mocks/any_instance.rb
 - lib/rspec/mocks/any_instance/chain.rb
@@ -98,6 +89,7 @@ files:
 - lib/rspec/mocks/serialization.rb
 - lib/rspec/mocks/space.rb
 - lib/rspec/mocks/standalone.rb
+- lib/rspec/mocks/test_double.rb
 - lib/rspec/mocks/version.rb
 - lib/spec/mocks.rb
 - README.md
@@ -105,7 +97,7 @@ files:
 - Changelog.md
 - .yardopts
 - .document
-- features/README.markdown
+- features/README.md
 - features/Scope.md
 - features/Upgrade.md
 - features/argument_matchers/README.md
@@ -169,45 +161,45 @@ 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/test_double_spec.rb
 - spec/rspec/mocks/to_ary_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rspec/rspec-mocks
-licenses: 
+licenses:
 - MIT
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3514585856622943193
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3514585856622943193
 requirements: []
-
 rubyforge_project: rspec
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.9.0
-test_files: 
-- features/README.markdown
+summary: rspec-mocks-2.10.0
+test_files:
+- features/README.md
 - features/Scope.md
 - features/Upgrade.md
 - features/argument_matchers/README.md
@@ -271,6 +263,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/test_double_spec.rb
 - spec/rspec/mocks/to_ary_spec.rb
 - spec/rspec/mocks/twice_counts_spec.rb
 - spec/rspec/mocks_spec.rb