rr 0.3.10 → 0.3.11

data/CHANGES

@@ -1,3 +1,6 @@
+* 0.3.11
+- Fixed [#13724] Mock Proxy on Active Record Association proxies causes error
+
 * 0.3.10
 - Fixed [#13139] Blocks added to proxy sets the return_value and not the after_call callback
 

data/Rakefile

@@ -26,7 +26,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.3.10"
+PKG_VERSION = "0.3.11"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/examples/rr/double/double_example.rb

@@ -43,8 +43,8 @@ describe Double, "#initialize where method does not exist on object" do
     @double = Double.new(@space, @object, @method_name)
   end
 
-  it "has a nil original_method" do
-    @double.original_method.should be_nil
+  it "object does not have original method" do
+    @double.object_has_original_method?.should be_false
   end
 end
 
@@ -59,8 +59,8 @@ describe Double, "#initialize where method exists on object" do
     @double = Double.new(@space, @object, @method_name)
   end
 
-  it "has a nil original_method" do
-    @double.original_method.should == @object.method(@method_name)
+  it "has a original_method" do
+    @double.object_has_original_method?.should be_true
   end
 end
 end

data/examples/rr/double/double_has_original_method_example.rb

@@ -0,0 +1,56 @@
+require "examples/example_helper"
+
+module RR
+describe Double, "#object_has_original_method?" do
+  before do
+    @space = Space.new
+    @object = Object.new
+    @method_name = :to_s
+    @double = Double.new(@space, @object, @method_name)
+    class << @double
+      public :original_method_name
+    end
+  end
+
+  it "returns true when method is still in object" do
+    @double.bind
+    @double.object_has_original_method?.should be_true
+  end
+
+  it "returns true when respond_to is true and methods include method" do
+    @double.bind
+    def @object.methods
+      [:__rr_original_to_s]
+    end
+    def @object.respond_to?(value)
+      true
+    end
+
+    @double.object_has_original_method?.should be_true
+  end
+  
+  it "returns true when respond_to is true and methods do not include method" do
+    @double.bind
+    def @object.methods
+      []
+    end
+    def @object.respond_to?(value)
+      true
+    end
+
+    @double.object_has_original_method?.should be_true
+  end
+
+  it "returns false when respond_to is false and methods do not include method" do
+    @double.bind
+    def @object.methods
+      []
+    end
+    def @object.respond_to?(value)
+      false
+    end
+
+    @double.object_has_original_method?.should be_false
+  end
+end
+end

data/examples/rr/scenario_example.rb

@@ -382,7 +382,32 @@ describe Scenario, "#implemented_by_original_method" do
     @scenario.call(@double, 1, 2).should == [2, 1]
   end
 
-  it "calls method_missing when original_method does not exist" do
+  it "calls methods when respond_to? is true and methods does not contain original method" do
+    method_name = nil
+    class << @object
+      def methods
+        []
+      end
+      def method(name)
+        raise "We should not be here"
+      end
+      def respond_to?(name)
+        true
+      end
+      def method_missing(method_name, *args, &block)
+        raise "We should not be here"
+      end
+    end
+
+    double = @space.double(@object, :foobar)
+    scenario = @space.scenario(double)
+    scenario.with_any_args
+    scenario.implemented_by_original_method
+
+    @object.foobar(1, 2).should == [2, 1]
+  end
+
+  it "calls method when original_method does not exist" do
     class << @object
       def method_missing(method_name, *args, &block)
         "method_missing for #{method_name}(#{args.inspect})"

data/examples/rr/space/space_create_example.rb

@@ -267,7 +267,7 @@ describe Space, "#double when double exists" do
     original_foobar_method = @object.method(:foobar)
     double = @space.double(@object, 'foobar')
 
-    double.original_method.should == original_foobar_method
+    double.object_has_original_method?.should be_true
 
     @space.double(@object, 'foobar').should === double
 

data/lib/rr/double.rb

@@ -49,7 +49,7 @@ module RR
     # if one exists.
     def reset
       meta.send(:remove_method, placeholder_name)
-      if original_method
+      if object_has_original_method?
         meta.send(:alias_method, @method_name, original_method_name)
         meta.send(:remove_method, original_method_name)
       else
@@ -57,11 +57,12 @@ module RR
       end
     end
 
-    # The original method of the object. It returns nil if the object
-    # does not have an original method.
-    def original_method
-      return nil unless object_has_method?(original_method_name)
-      return @object.method(original_method_name)
+    def call_original_method(*args, &block)
+      @object.__send__(original_method_name, *args, &block)
+    end
+
+    def object_has_original_method?
+      object_has_method?(original_method_name)
     end
 
     protected
@@ -121,7 +122,7 @@ module RR
     end
 
     def object_has_method?(method_name)
-      @object.methods.include?(method_name.to_s)
+      @object.methods.include?(method_name.to_s) || @object.respond_to?(method_name)
     end
 
     def meta

data/lib/rr/scenario.rb

@@ -239,8 +239,8 @@ module RR
       return nil unless implementation
 
       if implementation === ScenarioDefinition::ORIGINAL_METHOD
-        if double.original_method
-          return double.original_method.call(*args, &block)
+        if double.object_has_original_method?
+          return double.call_original_method(*args, &block)
         else
           return double.object.__send__(
             :method_missing,

data/lib/rr.rb

@@ -1,46 +1,47 @@
-require "rr/errors/rr_error"
-require "rr/errors/scenario_definition_error"
-require "rr/errors/scenario_not_found_error"
-require "rr/errors/scenario_order_error"
-require "rr/errors/argument_equality_error"
-require "rr/errors/times_called_error"
-
-require "rr/space"
-require "rr/double"
-require "rr/hash_with_object_id_key"
-
-require "rr/scenario_method_proxy"
-
-require "rr/scenario_creator"
-
-require "rr/scenario"
-require "rr/scenario_definition"
-require "rr/scenario_definition_builder"
-require "rr/scenario_matches"
-
-require "rr/expectations/argument_equality_expectation"
-require "rr/expectations/any_argument_expectation"
-require "rr/expectations/times_called_expectation"
-
-require "rr/wildcard_matchers/anything"
-require "rr/wildcard_matchers/is_a"
-require "rr/wildcard_matchers/numeric"
-require "rr/wildcard_matchers/boolean"
-require "rr/wildcard_matchers/duck_type"
-require "rr/wildcard_matchers/regexp"
-require "rr/wildcard_matchers/range"
-
-require "rr/times_called_matchers/terminal"
-require "rr/times_called_matchers/non_terminal"
-require "rr/times_called_matchers/times_called_matcher"
-require "rr/times_called_matchers/any_times_matcher"
-require "rr/times_called_matchers/integer_matcher"
-require "rr/times_called_matchers/range_matcher"
-require "rr/times_called_matchers/proc_matcher"
-require "rr/times_called_matchers/at_least_matcher"
-require "rr/times_called_matchers/at_most_matcher"
-
-require "rr/extensions/instance_methods"
-
-require "rr/adapters/rspec"
-require "rr/adapters/test_unit"
+dir = File.dirname(__FILE__)
+require "#{dir}/rr/errors/rr_error"
+require "#{dir}/rr/errors/scenario_definition_error"
+require "#{dir}/rr/errors/scenario_not_found_error"
+require "#{dir}/rr/errors/scenario_order_error"
+require "#{dir}/rr/errors/argument_equality_error"
+require "#{dir}/rr/errors/times_called_error"
+
+require "#{dir}/rr/space"
+require "#{dir}/rr/double"
+require "#{dir}/rr/hash_with_object_id_key"
+
+require "#{dir}/rr/scenario_method_proxy"
+
+require "#{dir}/rr/scenario_creator"
+
+require "#{dir}/rr/scenario"
+require "#{dir}/rr/scenario_definition"
+require "#{dir}/rr/scenario_definition_builder"
+require "#{dir}/rr/scenario_matches"
+
+require "#{dir}/rr/expectations/argument_equality_expectation"
+require "#{dir}/rr/expectations/any_argument_expectation"
+require "#{dir}/rr/expectations/times_called_expectation"
+
+require "#{dir}/rr/wildcard_matchers/anything"
+require "#{dir}/rr/wildcard_matchers/is_a"
+require "#{dir}/rr/wildcard_matchers/numeric"
+require "#{dir}/rr/wildcard_matchers/boolean"
+require "#{dir}/rr/wildcard_matchers/duck_type"
+require "#{dir}/rr/wildcard_matchers/regexp"
+require "#{dir}/rr/wildcard_matchers/range"
+
+require "#{dir}/rr/times_called_matchers/terminal"
+require "#{dir}/rr/times_called_matchers/non_terminal"
+require "#{dir}/rr/times_called_matchers/times_called_matcher"
+require "#{dir}/rr/times_called_matchers/any_times_matcher"
+require "#{dir}/rr/times_called_matchers/integer_matcher"
+require "#{dir}/rr/times_called_matchers/range_matcher"
+require "#{dir}/rr/times_called_matchers/proc_matcher"
+require "#{dir}/rr/times_called_matchers/at_least_matcher"
+require "#{dir}/rr/times_called_matchers/at_most_matcher"
+
+require "#{dir}/rr/extensions/instance_methods"
+
+require "#{dir}/rr/adapters/rspec"
+require "#{dir}/rr/adapters/test_unit"

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.3
+rubygems_version: 0.9.2
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.3.10
-date: 2007-08-18 00:00:00 -07:00
+  version: 0.3.11
+date: 2007-09-06 00:00:00 -07:00
 summary: RR (Double Ruby) is a double framework that features a rich selection of double techniques and a terse syntax. http://xunitpatterns.com/Test%20Double.html
 require_paths: 
 - lib
@@ -29,108 +29,108 @@ post_install_message:
 authors: 
 - Brian Takita
 files: 
+- README
 - Rakefile
 - CHANGES
-- README
-- lib/rr.rb
-- lib/rr/scenario_method_proxy.rb
-- lib/rr/scenario.rb
-- lib/rr/scenario_definition.rb
-- lib/rr/hash_with_object_id_key.rb
-- lib/rr/scenario_definition_builder.rb
-- lib/rr/scenario_matches.rb
-- lib/rr/space.rb
-- lib/rr/double.rb
-- lib/rr/scenario_creator.rb
-- lib/rr/times_called_matchers/any_times_matcher.rb
-- lib/rr/times_called_matchers/at_most_matcher.rb
-- lib/rr/times_called_matchers/times_called_matcher.rb
-- lib/rr/times_called_matchers/at_least_matcher.rb
-- lib/rr/times_called_matchers/proc_matcher.rb
-- lib/rr/times_called_matchers/integer_matcher.rb
-- lib/rr/times_called_matchers/non_terminal.rb
-- lib/rr/times_called_matchers/terminal.rb
-- lib/rr/times_called_matchers/range_matcher.rb
+- lib/rr/extensions/instance_methods.rb
+- lib/rr/adapters/test_unit.rb
+- lib/rr/adapters/rspec.rb
 - lib/rr/expectations/argument_equality_expectation.rb
 - lib/rr/expectations/times_called_expectation.rb
 - lib/rr/expectations/any_argument_expectation.rb
+- lib/rr/scenario.rb
+- lib/rr/double.rb
+- lib/rr/errors/times_called_error.rb
 - lib/rr/errors/scenario_not_found_error.rb
-- lib/rr/errors/argument_equality_error.rb
 - lib/rr/errors/scenario_order_error.rb
+- lib/rr/errors/argument_equality_error.rb
 - lib/rr/errors/rr_error.rb
-- lib/rr/errors/times_called_error.rb
 - lib/rr/errors/scenario_definition_error.rb
-- lib/rr/adapters/test_unit.rb
-- lib/rr/adapters/rspec.rb
+- lib/rr/scenario_creator.rb
+- lib/rr/space.rb
+- lib/rr/scenario_definition_builder.rb
+- lib/rr/scenario_definition.rb
 - lib/rr/wildcard_matchers/boolean.rb
+- lib/rr/wildcard_matchers/anything.rb
+- lib/rr/wildcard_matchers/numeric.rb
 - lib/rr/wildcard_matchers/duck_type.rb
-- lib/rr/wildcard_matchers/range.rb
 - lib/rr/wildcard_matchers/regexp.rb
-- lib/rr/wildcard_matchers/numeric.rb
 - lib/rr/wildcard_matchers/is_a.rb
-- lib/rr/wildcard_matchers/anything.rb
-- lib/rr/extensions/instance_methods.rb
-- examples/environment_fixture_setup.rb
-- examples/rspec_example_suite.rb
-- examples/core_example_suite.rb
-- examples/example_suite.rb
-- examples/example_helper.rb
-- examples/test_unit_example_suite.rb
-- examples/high_level_example.rb
-- examples/rr/scenario_definition_example.rb
-- examples/rr/scenario_method_proxy_example.rb
-- examples/rr/scenario_example.rb
-- examples/rr/scenario_creator_example.rb
-- examples/rr/rspec/rspec_backtrace_tweaking_example.rb
-- examples/rr/rspec/rspec_adapter_example.rb
-- examples/rr/rspec/rspec_usage_example.rb
-- examples/rr/times_called_matchers/at_most_matcher_example.rb
-- examples/rr/times_called_matchers/at_least_matcher_example.rb
-- examples/rr/times_called_matchers/times_called_matcher_example.rb
-- examples/rr/times_called_matchers/range_matcher_example.rb
-- examples/rr/times_called_matchers/proc_matcher_example.rb
-- examples/rr/times_called_matchers/any_times_matcher_example.rb
-- examples/rr/times_called_matchers/integer_matcher_example.rb
-- examples/rr/space/space_verify_example.rb
-- examples/rr/space/space_reset_example.rb
-- examples/rr/space/space_create_example.rb
-- examples/rr/space/space_helper.rb
-- examples/rr/space/space_example.rb
-- examples/rr/space/hash_with_object_id_key_example.rb
-- examples/rr/space/space_register_example.rb
-- examples/rr/expectations/is_a_argument_equality_expectation_example.rb
-- examples/rr/expectations/any_argument_expectation_example.rb
-- examples/rr/expectations/regexp_argument_equality_expectation_example.rb
-- examples/rr/expectations/boolean_argument_equality_expectation_example.rb
-- examples/rr/expectations/duck_type_argument_equality_expectation_example.rb
-- examples/rr/expectations/numeric_argument_equality_expectation_example.rb
-- examples/rr/expectations/range_argument_equality_expectation_example.rb
+- lib/rr/wildcard_matchers/range.rb
+- lib/rr/times_called_matchers/at_least_matcher.rb
+- lib/rr/times_called_matchers/range_matcher.rb
+- lib/rr/times_called_matchers/integer_matcher.rb
+- lib/rr/times_called_matchers/non_terminal.rb
+- lib/rr/times_called_matchers/proc_matcher.rb
+- lib/rr/times_called_matchers/times_called_matcher.rb
+- lib/rr/times_called_matchers/at_most_matcher.rb
+- lib/rr/times_called_matchers/any_times_matcher.rb
+- lib/rr/times_called_matchers/terminal.rb
+- lib/rr/scenario_method_proxy.rb
+- lib/rr/scenario_matches.rb
+- lib/rr/hash_with_object_id_key.rb
+- lib/rr.rb
+- examples/rr/extensions/instance_methods_creator_example.rb
+- examples/rr/extensions/instance_methods_example_helper.rb
+- examples/rr/extensions/instance_methods_times_matcher_example.rb
+- examples/rr/extensions/instance_methods_argument_matcher_example.rb
+- examples/rr/extensions/instance_methods_space_example.rb
 - examples/rr/expectations/argument_equality_expectation_example.rb
 - examples/rr/expectations/anything_argument_equality_expectation_example.rb
+- examples/rr/expectations/times_called_expectation/times_called_expectation_at_least_example.rb
+- examples/rr/expectations/times_called_expectation/times_called_expectation_range_example.rb
 - examples/rr/expectations/times_called_expectation/times_called_expectation_integer_example.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_any_times_example.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_helper.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_proc_example.rb
 - examples/rr/expectations/times_called_expectation/times_called_expectation_example.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_at_least_example.rb
+- examples/rr/expectations/times_called_expectation/times_called_expectation_proc_example.rb
+- examples/rr/expectations/times_called_expectation/times_called_expectation_helper.rb
 - examples/rr/expectations/times_called_expectation/times_called_expectation_at_most_example.rb
-- examples/rr/expectations/times_called_expectation/times_called_expectation_range_example.rb
-- examples/rr/errors/rr_error_example.rb
-- examples/rr/double/double_original_method_example.rb
-- examples/rr/double/double_reset_example.rb
+- examples/rr/expectations/times_called_expectation/times_called_expectation_any_times_example.rb
+- examples/rr/expectations/any_argument_expectation_example.rb
+- examples/rr/expectations/is_a_argument_equality_expectation_example.rb
+- examples/rr/expectations/numeric_argument_equality_expectation_example.rb
+- examples/rr/expectations/boolean_argument_equality_expectation_example.rb
+- examples/rr/expectations/duck_type_argument_equality_expectation_example.rb
+- examples/rr/expectations/regexp_argument_equality_expectation_example.rb
+- examples/rr/expectations/range_argument_equality_expectation_example.rb
+- examples/rr/rspec/rspec_adapter_example.rb
+- examples/rr/rspec/rspec_usage_example.rb
+- examples/rr/rspec/rspec_backtrace_tweaking_example.rb
+- examples/rr/test_unit/test_helper.rb
+- examples/rr/test_unit/test_unit_integration_test.rb
+- examples/rr/test_unit/test_unit_backtrace_test.rb
+- examples/rr/scenario_example.rb
 - examples/rr/double/double_bind_example.rb
-- examples/rr/double/double_register_scenario_example.rb
-- examples/rr/double/double_example.rb
 - examples/rr/double/double_dispatching_example.rb
+- examples/rr/double/double_example.rb
+- examples/rr/double/double_reset_example.rb
 - examples/rr/double/double_verify_example.rb
-- examples/rr/test_unit/test_unit_backtrace_test.rb
-- examples/rr/test_unit/test_helper.rb
-- examples/rr/test_unit/test_unit_integration_test.rb
-- examples/rr/extensions/instance_methods_argument_matcher_example.rb
-- examples/rr/extensions/instance_methods_times_matcher_example.rb
-- examples/rr/extensions/instance_methods_creator_example.rb
-- examples/rr/extensions/instance_methods_space_example.rb
-- examples/rr/extensions/instance_methods_example_helper.rb
+- examples/rr/double/double_register_scenario_example.rb
+- examples/rr/double/double_has_original_method_example.rb
+- examples/rr/space/space_example.rb
+- examples/rr/space/space_reset_example.rb
+- examples/rr/space/space_create_example.rb
+- examples/rr/space/space_helper.rb
+- examples/rr/space/space_register_example.rb
+- examples/rr/space/space_verify_example.rb
+- examples/rr/space/hash_with_object_id_key_example.rb
+- examples/rr/times_called_matchers/proc_matcher_example.rb
+- examples/rr/times_called_matchers/times_called_matcher_example.rb
+- examples/rr/times_called_matchers/at_most_matcher_example.rb
+- examples/rr/times_called_matchers/any_times_matcher_example.rb
+- examples/rr/times_called_matchers/at_least_matcher_example.rb
+- examples/rr/times_called_matchers/range_matcher_example.rb
+- examples/rr/times_called_matchers/integer_matcher_example.rb
+- examples/rr/scenario_creator_example.rb
+- examples/rr/scenario_method_proxy_example.rb
+- examples/rr/scenario_definition_example.rb
+- examples/rr/errors/rr_error_example.rb
+- examples/rspec_example_suite.rb
+- examples/high_level_example.rb
+- examples/test_unit_example_suite.rb
+- examples/example_suite.rb
+- examples/environment_fixture_setup.rb
+- examples/example_helper.rb
+- examples/core_example_suite.rb
 test_files: []
 
 rdoc_options: 

data/examples/rr/double/double_original_method_example.rb

@@ -1,33 +0,0 @@
-require "examples/example_helper"
-
-module RR
-describe Double, "#original_method" do
-  before do
-    @space = Space.new
-    @object = Object.new
-    @method_name = :to_s
-    @double = Double.new(@space, @object, @method_name)
-    class << @double
-      public :original_method_name
-    end
-  end
-
-  it "returns true when method is still in object" do
-    @double.bind
-    @double.original_method.should == @object.method(@double.original_method_name)
-  end
-  
-  it "returns false when respond_to is true and methods do not include method" do
-    @double.bind
-    @object.methods.should include(@double.original_method_name.to_s)
-    class << @object
-      undef_method :__rr__original_to_s
-    end
-    def @object.respond_to?(value)
-      true
-    end
-
-    @double.original_method.should be_nil
-  end
-end
-end