rr 0.1.11 → 0.1.12

data/CHANGES

@@ -1,3 +1,7 @@
+* 0.1.12
+- Fixed bug where Creators methods are not removed when methods are defined on Object
+- Fixed [#12289] Creators methods are not removed in Rails environment
+
 * 0.1.11
 - Fixed [#12287] AtLeastMatcher does not cause Scenario to be called
 

data/Rakefile

@@ -21,7 +21,7 @@ def run_suite
 end
 
 PKG_NAME = "rr"
-PKG_VERSION = "0.1.11"
+PKG_VERSION = "0.1.12"
 PKG_FILES = FileList[
   '[A-Z]*',
   '*.rb',

data/examples/rr/do_not_allow_creator_example.rb

@@ -21,6 +21,17 @@ describe DoNotAllowCreator, ".new" do
   before do
     @creator = DoNotAllowCreator.new(@space, @subject)
   end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(DoNotAllowCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator = creator_subclass.new(@space, @subject)
+    creator.i_should_be_a_scenario.should be_instance_of(Scenario)
+  end
 end
 
 describe DoNotAllowCreator, ".new with block" do
@@ -57,6 +68,17 @@ describe DoNotAllowCreator, ".new with block" do
   it "raises TimesCalledError when any_args is called with arguments" do
     proc {@subject.any_args(1, 2)}.should raise_error(Errors::TimesCalledError)
   end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(DoNotAllowCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator = creator_subclass.new(@space, @subject)
+    creator.i_should_be_a_scenario.should be_instance_of(Scenario)
+  end
 end
 
 describe DoNotAllowCreator, "#method_missing" do

data/examples/rr/mock_creator_example.rb

@@ -21,6 +21,17 @@ describe MockCreator, ".new without block" do
   before do
     @creator = MockCreator.new(@space, @subject)
   end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(MockCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator = creator_subclass.new(@space, @subject)
+    creator.i_should_be_a_scenario.should be_instance_of(Scenario)
+  end
 end
 
 describe MockCreator, ".new with block" do
@@ -41,6 +52,18 @@ describe MockCreator, ".new with block" do
     @subject.foobar(:something).should == :default
     @subject.baz.should == :baz_result
   end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(MockCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator_subclass.new(@space, @subject) do |m|
+      m.i_should_be_a_scenario.should be_instance_of(Scenario)
+    end
+  end
 end
 
 

data/examples/rr/probe_creator_example.rb

@@ -21,6 +21,17 @@ describe ProbeCreator, ".new without block" do
   before do
     @creator = ProbeCreator.new(@space, @subject)
   end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(ProbeCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator = creator_subclass.new(@space, @subject)
+    creator.i_should_be_a_scenario.should be_instance_of(Scenario)
+  end
 end
 
 describe ProbeCreator, ".new with block" do
@@ -43,6 +54,18 @@ describe ProbeCreator, ".new with block" do
     @subject.foobar(:something).should == :original_foobar
     proc {@subject.foobar(:nasty)}.should raise_error
   end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(ProbeCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator_subclass.new(@space, @subject) do |m|
+      m.i_should_be_a_scenario.should be_instance_of(Scenario)
+    end
+  end
 end
 
 describe ProbeCreator, ".new where method takes a block" do

data/examples/rr/stub_creator_example.rb

@@ -21,6 +21,17 @@ describe StubCreator, ".new without block" do
   before do
     @creator = StubCreator.new(@space, @subject)
   end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(StubCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator = creator_subclass.new(@space, @subject)
+    creator.i_should_be_a_scenario.should be_instance_of(Scenario)
+  end
 end
 
 describe StubCreator, ".new with block" do
@@ -45,6 +56,18 @@ describe StubCreator, ".new with block" do
     @subject.baz.should == :baz_result
     @subject.baz.should == :baz_result
   end
+
+  it "clears out all methods from creator" do
+    creator_subclass = Class.new(StubCreator) do
+      def i_should_be_a_scenario
+      end
+    end
+    creator_subclass.instance_methods.should include('i_should_be_a_scenario')
+
+    creator_subclass.new(@space, @subject) do |m|
+      m.i_should_be_a_scenario.should be_instance_of(Scenario)
+    end
+  end
 end
 
 describe StubCreator, "#method_missing" do

data/lib/rr/creator.rb

@@ -0,0 +1,16 @@
+module RR
+  # RR::Creator is the superclass for all creators.
+  class Creator
+    def initialize(space, subject)
+      @space = space
+      @subject = subject
+      class << self
+        instance_methods.each do |m|
+          undef_method m unless m =~ /^__/
+        end
+        include self::InstanceMethods
+      end
+      yield(self) if block_given?
+    end
+  end
+end

data/lib/rr/do_not_allow_creator.rb

@@ -14,26 +14,20 @@ module RR
   #      m.method2(arg1, arg2) # Do not allow method2 with arguments arg1 and arg2
   #      m.method3.with_no_args # Do not allow method3 with no arguments
   #    end
-  class DoNotAllowCreator
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
-    
-    def initialize(space, subject)
-      @space = space
-      @subject = subject
-      yield(self) if block_given?
-    end
-
-    protected
-    def method_missing(method_name, *args, &returns)
-      double = @space.create_double(@subject, method_name)
-      scenario = @space.create_scenario(double)
-      if args.empty?
-        scenario.with_any_args
-      else
-        scenario.with(*args)
+  class DoNotAllowCreator < Creator
+    module InstanceMethods
+      protected
+      def method_missing(method_name, *args, &returns)
+        double = @space.create_double(@subject, method_name)
+        scenario = @space.create_scenario(double)
+        if args.empty?
+          scenario.with_any_args
+        else
+          scenario.with(*args)
+        end
+        scenario.never.returns(&returns)
+        scenario
       end
-      scenario.never.returns(&returns)
-      scenario
     end
   end
 end

data/lib/rr/mock_creator.rb

@@ -12,21 +12,15 @@ module RR
   #    mock(subject) do |m|
   #      m.method_name(arg1, arg2) { return_value }
   #    end
-  class MockCreator
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
-    
-    def initialize(space, subject)
-      @space = space
-      @subject = subject
-      yield(self) if block_given?
-    end
-
-    protected
-    def method_missing(method_name, *args, &returns)
-      double = @space.create_double(@subject, method_name)
-      scenario = @space.create_scenario(double)
-      scenario.with(*args).once.returns(&returns)
-      scenario
+  class MockCreator < Creator
+    module InstanceMethods
+      protected
+      def method_missing(method_name, *args, &returns)
+        double = @space.create_double(@subject, method_name)
+        scenario = @space.create_scenario(double)
+        scenario.with(*args).once.returns(&returns)
+        scenario
+      end
     end
   end
 end

data/lib/rr/probe_creator.rb

@@ -21,22 +21,16 @@ module RR
   #
   #   user = User.find('4')
   #   user.valid? # false
-  class ProbeCreator
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
-    
-    def initialize(space, subject)
-      @space = space
-      @subject = subject
-      yield(self) if block_given?
-    end
-
-    protected
-    def method_missing(method_name, *args, &after_call)
-      double = @space.create_double(@subject, method_name)
-      scenario = @space.create_scenario(double)
-      scenario.with(*args).once.implemented_by(double.original_method)
-      scenario.after_call(&after_call) if after_call
-      scenario
+  class ProbeCreator < Creator
+    module InstanceMethods
+      protected
+      def method_missing(method_name, *args, &after_call)
+        double = @space.create_double(@subject, method_name)
+        scenario = @space.create_scenario(double)
+        scenario.with(*args).once.implemented_by(double.original_method)
+        scenario.after_call(&after_call) if after_call
+        scenario
+      end      
     end
   end
 end

data/lib/rr/stub_creator.rb

@@ -12,24 +12,18 @@ module RR
   #    stub(subject) do |m|
   #      m.method_name(arg1, arg2) { return_value }
   #    end
-  class StubCreator
-    instance_methods.each { |m| undef_method m unless m =~ /^__/ }
-    
-    def initialize(space, subject)
-      @space = space
-      @subject = subject
-      yield(self) if block_given?
-    end
-
-    protected
-    def method_missing(method_name, *args, &returns)
-      double = @space.create_double(@subject, method_name)
-      scenario = @space.create_scenario(double)
-      scenario.returns(&returns).any_number_of_times
-      if args.empty?
-        scenario.with_any_args
-      else
-        scenario.with(*args)
+  class StubCreator < Creator
+    module InstanceMethods
+      protected
+      def method_missing(method_name, *args, &returns)
+        double = @space.create_double(@subject, method_name)
+        scenario = @space.create_scenario(double)
+        scenario.returns(&returns).any_number_of_times
+        if args.empty?
+          scenario.with_any_args
+        else
+          scenario.with(*args)
+        end
       end
     end
   end

data/lib/rr.rb

@@ -2,6 +2,7 @@ dir = File.dirname(__FILE__)
 
 require "rr/double"
 
+require "rr/creator"
 require "rr/mock_creator"
 require "rr/stub_creator"
 require "rr/probe_creator"

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: rr
 version: !ruby/object:Gem::Version 
-  version: 0.1.11
+  version: 0.1.12
 date: 2007-07-14 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: 
@@ -34,6 +34,7 @@ files:
 - README
 - lib/rr.rb
 - lib/rr/scenario.rb
+- lib/rr/creator.rb
 - lib/rr/stub_creator.rb
 - lib/rr/space.rb
 - lib/rr/double.rb