rspec-mocks 2.8.0.rc1 → 2.8.0.rc2

data/lib/rspec/mocks/serialization.rb

@@ -3,12 +3,16 @@ require 'rspec/mocks/extensions/psych' if defined?(::Psych)
 
 module RSpec
   module Mocks
+    # @private
     module Serialization
+      # @private
       def self.fix_for(object)
         object.extend(YAML) if defined?(::YAML)
       end
 
+      # @private
       module YAML
+        # @private
         def to_yaml(options = {})
           return nil if defined?(::Psych) && options.respond_to?(:[]) && options[:nodump]
           return super(options) unless instance_variable_defined?(:@mock_proxy)

data/lib/rspec/mocks/space.rb

@@ -1,5 +1,6 @@
 module RSpec
   module Mocks
+    # @api private
     class Space
       def add(obj)
         mocks << obj unless mocks.detect {|m| m.equal? obj}

data/lib/rspec/mocks/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Mocks
     module Version
-      STRING = '2.8.0.rc1'
+      STRING = '2.8.0.rc2'
     end
   end
 end

data/spec/rspec/mocks/{hash_not_including_matcher_spec.rb → hash_excluding_matcher_spec.rb}

@@ -3,10 +3,10 @@ require 'spec_helper'
 module RSpec
   module Mocks
     module ArgumentMatchers
-      describe HashNotIncludingMatcher do
+      describe HashExcludingMatcher do
         
         it "describes itself properly" do
-          HashNotIncludingMatcher.new(:a => 5).description.should eq "hash_not_including(:a=>5)"
+          HashExcludingMatcher.new(:a => 5).description.should eq "hash_not_including(:a=>5)"
         end      
 
         describe "passing" do

data/spec/rspec/mocks/stub_spec.rb

@@ -28,7 +28,7 @@ module RSpec
         @instance = @class.new
         @stub = Object.new
       end
-      
+
       [:stub!, :stub].each do |method|
         describe "using #{method}" do
           it "returns declared value when message is received" do
@@ -146,7 +146,7 @@ module RSpec
         current_value.should eq [:yielded_value, :another_value]
         @instance.rspec_verify
       end
-      
+
       it "yields a specified object and return another specified object" do
         yielded_obj = double("my mock")
         yielded_obj.should_receive(:foo).with(:bar)
@@ -156,11 +156,14 @@ module RSpec
 
       it "throws when told to" do
         @stub.stub(:something).and_throw(:up)
-        lambda do
-          @stub.something
-        end.should throw_symbol(:up)
+        expect { @stub.something }.to throw_symbol(:up)
+      end
+
+      it "throws with argument when told to" do
+        @stub.stub(:something).and_throw(:up, 'high')
+        expect { @stub.something }.to throw_symbol(:up, 'high')
       end
-      
+
       it "overrides a pre-existing method" do
         @stub.stub(:existing_instance_method).and_return(:updated_stub_value)
         @stub.existing_instance_method.should eq :updated_stub_value
@@ -171,7 +174,7 @@ module RSpec
         @stub.stub(:foo) { 'baz' }
         @stub.foo.should eq 'baz'
       end
-      
+
       it "allows a stub and an expectation" do
         @stub.stub(:foo).with("bar")
         @stub.should_receive(:foo).with("baz")
@@ -185,7 +188,7 @@ module RSpec
         @stub.rspec_verify
       end
     end
-    
+
     describe "A method stub with args" do
       before(:each) do
         @stub = Object.new
@@ -225,7 +228,7 @@ module RSpec
           @stub.foo("other")
         end.should raise_error
       end
-      
+
       it "supports options" do
         @stub.stub(:foo, :expected_from => "bar")
       end

metadata

@@ -1,47 +1,46 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-mocks
 version: !ruby/object:Gem::Version 
-  hash: 15424215
+  hash: 15424209
   prerelease: 6
   segments: 
   - 2
   - 8
   - 0
   - rc
-  - 1
-  version: 2.8.0.rc1
+  - 2
+  version: 2.8.0.rc2
 platform: ruby
 authors: 
+- Steven Baker
 - David Chelimsky
-- Chad Humphries
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-11-06 00:00:00 Z
+date: 2011-12-20 00:00:00 Z
 dependencies: []
 
 description: RSpec's 'test double' framework, with support for stubbing and mocking
-email: dchelimsky@gmail.com;chad.humphries@gmail.com
+email: rspec-users@rubyforge.org
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
 - README.md
+- License.txt
 files: 
 - 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
 - lib/rspec/mocks/errors.rb
+- lib/rspec/mocks/example_methods.rb
 - lib/rspec/mocks/extensions/instance_exec.rb
 - lib/rspec/mocks/extensions/marshal.rb
 - lib/rspec/mocks/extensions/psych.rb
@@ -54,10 +53,10 @@ files:
 - lib/rspec/mocks/proxy.rb
 - lib/rspec/mocks/serialization.rb
 - lib/rspec/mocks/space.rb
-- lib/rspec/mocks/spec_methods.rb
 - lib/rspec/mocks/standalone.rb
 - lib/rspec/mocks/version.rb
 - lib/spec/mocks.rb
+- License.txt
 - README.md
 - features/README.markdown
 - features/Scope.md
@@ -102,8 +101,8 @@ files:
 - spec/rspec/mocks/bug_report_957_spec.rb
 - spec/rspec/mocks/double_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
-- spec/rspec/mocks/hash_not_including_matcher_spec.rb
 - spec/rspec/mocks/mock_ordering_spec.rb
 - spec/rspec/mocks/mock_space_spec.rb
 - spec/rspec/mocks/mock_spec.rb
@@ -128,8 +127,8 @@ files:
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/rspec/rspec-mocks
-licenses: []
-
+licenses: 
+- MIT
 post_install_message: 
 rdoc_options: 
 - --charset=UTF-8
@@ -161,7 +160,7 @@ rubyforge_project: rspec
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.8.0.rc1
+summary: rspec-mocks-2.8.0.rc2
 test_files: 
 - features/README.markdown
 - features/Scope.md
@@ -206,8 +205,8 @@ test_files:
 - spec/rspec/mocks/bug_report_957_spec.rb
 - spec/rspec/mocks/double_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
-- spec/rspec/mocks/hash_not_including_matcher_spec.rb
 - spec/rspec/mocks/mock_ordering_spec.rb
 - spec/rspec/mocks/mock_space_spec.rb
 - spec/rspec/mocks/mock_spec.rb
@@ -231,3 +230,4 @@ test_files:
 - spec/rspec/mocks/twice_counts_spec.rb
 - spec/rspec/mocks_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

data/lib/rspec/mocks/any_instance/expectation_chain.rb

@@ -1,33 +0,0 @@
-module RSpec
-  module Mocks
-    module AnyInstance
-      class ExpectationChain < Chain
-        def initialize(*args, &block)
-          record(:should_receive, *args, &block)
-          @expectation_fulfilled = false
-        end
-
-        def invocation_order
-          @invocation_order ||= {
-            :should_receive => [nil],
-            :with => [:should_receive],
-            :and_return => [:with, :should_receive],
-            :and_raise => [:with, :should_receive]
-          }
-        end
-
-        def expectation_fulfilled!
-          @expectation_fulfilled = true
-        end
-
-        def expectation_fulfilled?
-          @expectation_fulfilled || constrained_to_any_of?(:never, :any_number_of_times)
-        end
-
-        private
-        def verify_invocation_order(rspec_method_name, *args, &block)
-        end
-      end
-    end
-  end
-end

data/lib/rspec/mocks/any_instance/stub_chain.rb

@@ -1,35 +0,0 @@
-module RSpec
-  module Mocks
-    module AnyInstance
-      class StubChain < Chain
-        def initialize(*args, &block)
-          record(:stub, *args, &block)
-        end
-
-        def invocation_order
-          @invocation_order ||= {
-            :stub => [nil],
-            :with => [:stub],
-            :and_return => [:with, :stub],
-            :and_raise => [:with, :stub],
-            :and_yield => [:with, :stub]
-          }
-        end
-
-        def expectation_fulfilled?
-          true
-        end
-        
-        def expectation_fulfilled!
-        end
-
-        private
-        def verify_invocation_order(rspec_method_name, *args, &block)
-          unless invocation_order[rspec_method_name].include?(last_message)
-            raise(NoMethodError, "Undefined method #{rspec_method_name}")
-          end
-        end
-      end
-    end
-  end
-end

data/lib/rspec/mocks/any_instance/stub_chain_chain.rb

@@ -1,34 +0,0 @@
-module RSpec
-  module Mocks
-    module AnyInstance
-      class StubChainChain < Chain
-        def initialize(*args, &block)
-          record(:stub_chain, *args, &block)
-        end
-
-        def invocation_order
-          @invocation_order ||= {
-            :stub_chain => [nil],
-            :and_return => [:stub_chain],
-            :and_raise => [:stub_chain],
-            :and_yield => [:stub_chain]
-          }
-        end
-
-        def expectation_fulfilled?
-          true
-        end
-        
-        def expectation_fulfilled!
-        end
-
-        private
-        def verify_invocation_order(rspec_method_name, *args, &block)
-          unless invocation_order[rspec_method_name].include?(last_message)
-            raise(NoMethodError, "Undefined method #{rspec_method_name}")
-          end
-        end
-      end
-    end
-  end
-end