rspec-mocks 2.11.3 → 2.12.0

data/spec/rspec/mocks/serialization_spec.rb

@@ -28,7 +28,7 @@ module RSpec
         context 'without YAML loaded' do
           before do
             # We can't really unload yaml, but we can fake it here...
-            @orig_yaml_constant = Object.send(:remove_const, :YAML)
+            hide_const("YAML")
             Struct.class_eval do
               alias __old_to_yaml to_yaml
               undef to_yaml
@@ -38,7 +38,6 @@ module RSpec
           module_eval(&block)
 
           after do
-            Object.const_set(:YAML, @orig_yaml_constant)
             Struct.class_eval do
               alias to_yaml __old_to_yaml
               undef __old_to_yaml

data/spec/rspec/mocks/stub_implementation_spec.rb

@@ -24,12 +24,12 @@ module RSpec
           obj = stub()
           obj.stub(:foo) {|*given| given.first}
           obj.foo(:bar).should eq :bar
-        end        
+        end
       end
     end
 
-  
-    describe "unstub implementation" do      
+
+    describe "unstub implementation" do
       it "replaces the stubbed method with the original method" do
         obj = Object.new
         def obj.foo; :original; end
@@ -37,7 +37,7 @@ module RSpec
         obj.unstub(:foo)
         obj.foo.should eq :original
       end
-    
+
       it "removes all stubs with the supplied method name" do
         obj = Object.new
         def obj.foo; :original; end
@@ -46,7 +46,7 @@ module RSpec
         obj.unstub(:foo)
         obj.foo.should eq :original
       end
-    
+
       it "does not remove any expectations with the same method name" do
         obj = Object.new
         def obj.foo; :original; end
@@ -69,7 +69,7 @@ module RSpec
         parent.new.should be_an_instance_of parent
         child.new.should be_an_instance_of child
       end
-    
+
       it "raises a MockExpectationError if the method has not been stubbed" do
         obj = Object.new
         lambda do

data/spec/rspec/mocks_spec.rb

@@ -48,4 +48,11 @@ describe RSpec::Mocks do
       end.to raise_error(/received unexpected message/)
     end
   end
+
+  describe ".configuration" do
+    it 'returns a memoized configuration instance' do
+      RSpec::Mocks.configuration.should be_a(RSpec::Mocks::Configuration)
+      RSpec::Mocks.configuration.should be(RSpec::Mocks.configuration)
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -18,4 +18,15 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.filter_run_including :focus
+
+  old_verbose = nil
+  config.before(:each, :silence_warnings) do
+    old_verbose = $VERBOSE
+    $VERBOSE = nil
+  end
+
+  config.after(:each, :silence_warnings) do
+    $VERBOSE = old_verbose
+  end
 end
+

metadata

@@ -1,80 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: rspec-mocks
-version: !ruby/object:Gem::Version 
-  hash: 37
+version: !ruby/object:Gem::Version
+  version: 2.12.0
   prerelease: 
-  segments: 
-  - 2
-  - 11
-  - 3
-  version: 2.11.3
 platform: ruby
-authors: 
+authors:
 - Steven Baker
 - David Chelimsky
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-09-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-11-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 10.0.0
   type: :development
   prerelease: false
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  requirement: *id001
-- !ruby/object:Gem::Dependency 
+      - !ruby/object:Gem::Version
+        version: 10.0.0
+- !ruby/object:Gem::Dependency
   name: cucumber
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.9
   type: :development
   prerelease: false
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 1
-        segments: 
-        - 1
-        - 1
-        - 9
+      - !ruby/object:Gem::Version
         version: 1.1.9
-  requirement: *id002
-- !ruby/object:Gem::Dependency 
+- !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: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 4
-        - 11
+      - !ruby/object:Gem::Version
         version: 0.4.11
-  requirement: *id003
 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
@@ -85,6 +76,7 @@ files:
 - lib/rspec/mocks/any_instance/stub_chain_chain.rb
 - lib/rspec/mocks/argument_list_matcher.rb
 - lib/rspec/mocks/argument_matchers.rb
+- lib/rspec/mocks/configuration.rb
 - lib/rspec/mocks/error_generator.rb
 - lib/rspec/mocks/errors.rb
 - lib/rspec/mocks/example_methods.rb
@@ -92,17 +84,17 @@ files:
 - lib/rspec/mocks/extensions/marshal.rb
 - lib/rspec/mocks/extensions/psych.rb
 - lib/rspec/mocks/framework.rb
+- lib/rspec/mocks/instance_method_stasher.rb
 - lib/rspec/mocks/message_expectation.rb
 - lib/rspec/mocks/method_double.rb
 - lib/rspec/mocks/methods.rb
 - lib/rspec/mocks/mock.rb
+- lib/rspec/mocks/mutate_const.rb
 - lib/rspec/mocks/order_group.rb
 - lib/rspec/mocks/proxy.rb
 - lib/rspec/mocks/serialization.rb
 - lib/rspec/mocks/space.rb
 - lib/rspec/mocks/standalone.rb
-- lib/rspec/mocks/stashed_instance_method.rb
-- lib/rspec/mocks/stub_const.rb
 - lib/rspec/mocks/test_double.rb
 - lib/rspec/mocks/version.rb
 - lib/spec/mocks.rb
@@ -121,6 +113,7 @@ files:
 - features/message_expectations/README.md
 - features/message_expectations/any_instance.feature
 - features/message_expectations/block_local_expectations.feature.pending
+- features/message_expectations/call_original.feature
 - features/message_expectations/expect_message.feature
 - features/message_expectations/receive_counts.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
@@ -131,13 +124,15 @@ files:
 - features/method_stubs/stub_chain.feature
 - features/method_stubs/stub_implementation.feature
 - features/method_stubs/to_ary.feature
+- features/mutating_constants/README.md
+- features/mutating_constants/hiding_defined_constant.feature
+- features/mutating_constants/stub_defined_constant.feature
+- features/mutating_constants/stub_undefined_constant.feature
 - features/outside_rspec/configuration.feature
 - features/outside_rspec/standalone.feature
 - features/step_definitions/additional_cli_steps.rb
-- features/stubbing_constants/README.md
-- features/stubbing_constants/stub_defined_constant.feature
-- features/stubbing_constants/stub_undefined_constant.feature
 - features/support/env.rb
+- spec/rspec/mocks/and_call_original_spec.rb
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_instance/message_chains_spec.rb
 - spec/rspec/mocks/any_instance_spec.rb
@@ -155,14 +150,17 @@ 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/configuration_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/instance_method_stasher_spec.rb
 - spec/rspec/mocks/mock_ordering_spec.rb
 - spec/rspec/mocks/mock_space_spec.rb
 - spec/rspec/mocks/mock_spec.rb
 - spec/rspec/mocks/multiple_return_value_spec.rb
+- spec/rspec/mocks/mutate_const_spec.rb
 - spec/rspec/mocks/nil_expectation_warning_spec.rb
 - spec/rspec/mocks/null_object_mock_spec.rb
 - spec/rspec/mocks/once_counts_spec.rb
@@ -174,9 +172,7 @@ files:
 - spec/rspec/mocks/record_messages_spec.rb
 - spec/rspec/mocks/serialization_spec.rb
 - spec/rspec/mocks/stash_spec.rb
-- spec/rspec/mocks/stashed_instance_method_spec.rb
 - spec/rspec/mocks/stub_chain_spec.rb
-- spec/rspec/mocks/stub_const_spec.rb
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb
@@ -186,39 +182,38 @@ 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: 
+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: -450868354806899778
+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: -450868354806899778
 requirements: []
-
 rubyforge_project: rspec
-rubygems_version: 1.8.6
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
-summary: rspec-mocks-2.11.3
-test_files: 
+summary: rspec-mocks-2.12.0
+test_files:
 - features/README.md
 - features/Scope.md
 - features/Upgrade.md
@@ -229,6 +224,7 @@ test_files:
 - features/message_expectations/README.md
 - features/message_expectations/any_instance.feature
 - features/message_expectations/block_local_expectations.feature.pending
+- features/message_expectations/call_original.feature
 - features/message_expectations/expect_message.feature
 - features/message_expectations/receive_counts.feature
 - features/message_expectations/warn_when_expectation_is_set_on_nil.feature
@@ -239,13 +235,15 @@ test_files:
 - features/method_stubs/stub_chain.feature
 - features/method_stubs/stub_implementation.feature
 - features/method_stubs/to_ary.feature
+- features/mutating_constants/README.md
+- features/mutating_constants/hiding_defined_constant.feature
+- features/mutating_constants/stub_defined_constant.feature
+- features/mutating_constants/stub_undefined_constant.feature
 - features/outside_rspec/configuration.feature
 - features/outside_rspec/standalone.feature
 - features/step_definitions/additional_cli_steps.rb
-- features/stubbing_constants/README.md
-- features/stubbing_constants/stub_defined_constant.feature
-- features/stubbing_constants/stub_undefined_constant.feature
 - features/support/env.rb
+- spec/rspec/mocks/and_call_original_spec.rb
 - spec/rspec/mocks/and_yield_spec.rb
 - spec/rspec/mocks/any_instance/message_chains_spec.rb
 - spec/rspec/mocks/any_instance_spec.rb
@@ -263,14 +261,17 @@ 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/configuration_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/instance_method_stasher_spec.rb
 - spec/rspec/mocks/mock_ordering_spec.rb
 - spec/rspec/mocks/mock_space_spec.rb
 - spec/rspec/mocks/mock_spec.rb
 - spec/rspec/mocks/multiple_return_value_spec.rb
+- spec/rspec/mocks/mutate_const_spec.rb
 - spec/rspec/mocks/nil_expectation_warning_spec.rb
 - spec/rspec/mocks/null_object_mock_spec.rb
 - spec/rspec/mocks/once_counts_spec.rb
@@ -282,9 +283,7 @@ test_files:
 - spec/rspec/mocks/record_messages_spec.rb
 - spec/rspec/mocks/serialization_spec.rb
 - spec/rspec/mocks/stash_spec.rb
-- spec/rspec/mocks/stashed_instance_method_spec.rb
 - spec/rspec/mocks/stub_chain_spec.rb
-- spec/rspec/mocks/stub_const_spec.rb
 - spec/rspec/mocks/stub_implementation_spec.rb
 - spec/rspec/mocks/stub_spec.rb
 - spec/rspec/mocks/stubbed_message_expectations_spec.rb

data/lib/rspec/mocks/stashed_instance_method.rb

@@ -1,60 +0,0 @@
-# @private
-class StashedInstanceMethod
-  def initialize(klass, method)
-    @klass = klass
-    @method = method
-
-    @method_is_stashed = false
-  end
-
-  # @private
-  def stash
-    return if !method_defined_directly_on_klass? || @method_is_stashed
-
-    @klass.__send__(:alias_method, stashed_method_name, @method)
-    @method_is_stashed = true
-  end
-
-  private
-
-  # @private
-  def method_defined_directly_on_klass?
-    method_defined_on_klass? && method_owned_by_klass?
-  end
-
-  # @private
-  def method_defined_on_klass?
-    @klass.method_defined?(@method) || @klass.private_method_defined?(@method)
-  end
-
-  if ::UnboundMethod.method_defined?(:owner)
-    # @private
-    def method_owned_by_klass?
-      @klass.instance_method(@method).owner == @klass
-    end
-  else
-    # @private
-    def method_owned_by_klass?
-      # On 1.8.6, which does not support Method#owner, we have no choice but
-      # to assume it's defined on the klass even if it may be defined on
-      # a superclass.
-      true
-    end
-  end
-
-  # @private
-  def stashed_method_name
-    "obfuscated_by_rspec_mocks__#{@method}"
-  end
-
-  public
-
-  # @private
-  def restore
-    return unless @method_is_stashed
-
-    @klass.__send__(:alias_method, @method, stashed_method_name)
-    @klass.__send__(:remove_method, stashed_method_name)
-    @method_is_stashed = false
-  end
-end