reduce warnings generated by rspec-mocks

c42engineering · Jul 2, 2011 · f04b8bb · f04b8bb
1 parent aca59bc
commit f04b8bb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/lib/rspec/mocks/any_instance/chain.rb b/lib/rspec/mocks/any_instance/chain.rb
@@ -16,8 +16,8 @@ def #{method_name}(*args, &block)
         end
 
         def playback!(instance)
-          messages.inject(instance) do |instance, message|
-            instance.send(*message.first, &message.last)
+          messages.inject(instance) do |_instance, message|
+            _instance.send(*message.first, &message.last)
           end
         end
 
@@ -46,4 +46,4 @@ def record(rspec_method_name, *args, &block)
       end
     end
   end
-end
+end
diff --git a/lib/rspec/mocks/any_instance/recorder.rb b/lib/rspec/mocks/any_instance/recorder.rb
@@ -80,6 +80,7 @@ def build_alias_method_name(method_name)
         def restore_original_method!(method_name)
           alias_method_name = build_alias_method_name(method_name)
           @klass.class_eval do
+            remove_method method_name
             alias_method  method_name, alias_method_name
             remove_method alias_method_name
           end
@@ -135,4 +136,4 @@ def #{method_name}(*args, &blk)
       end
     end
   end
-end
+end