Merge pull request rspec#74 from alextk/master

Use __send__ method instead of send
schneems · Aug 19, 2011 · 66c9c20 · 66c9c20
2 parents 82e4ff9 + f33a832
commit 66c9c20
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/lib/rspec/mocks/any_instance/chain.rb b/lib/rspec/mocks/any_instance/chain.rb
@@ -17,7 +17,7 @@ def #{method_name}(*args, &block)
 
         def playback!(instance)
           messages.inject(instance) do |_instance, message|
-            _instance.send(*message.first, &message.last)
+            _instance.__send__(*message.first, &message.last)
           end
         end
 

diff --git a/lib/rspec/mocks/any_instance/recorder.rb b/lib/rspec/mocks/any_instance/recorder.rb
@@ -140,7 +140,7 @@ def observe!(method_name)
           @klass.class_eval(<<-EOM, __FILE__, __LINE__)
             def #{method_name}(*args, &blk)
               self.class.__recorder.playback!(self, :#{method_name})
-              self.send(:#{method_name}, *args, &blk)
+              self.__send__(:#{method_name}, *args, &blk)
             end
           EOM
         end

diff --git a/lib/rspec/mocks/extensions/marshal.rb b/lib/rspec/mocks/extensions/marshal.rb
@@ -7,7 +7,7 @@ def dump_with_mocks(*args)
       mp = object.instance_variable_get(:@mock_proxy)
       return dump_without_mocks(*args.unshift(object)) unless mp.is_a?(::RSpec::Mocks::Proxy)
 
-      object.send(:remove_instance_variable, :@mock_proxy)
+      object.__send__(:remove_instance_variable, :@mock_proxy)
 
       begin
         dump_without_mocks(*args.unshift(object.dup))

diff --git a/lib/rspec/mocks/extensions/psych.rb b/lib/rspec/mocks/extensions/psych.rb
@@ -7,7 +7,7 @@ def dump_with_mocks(object, *args)
         mp = object.instance_variable_get(:@mock_proxy)
         return dump_without_mocks(object, *args) unless mp.is_a?(::RSpec::Mocks::Proxy)
 
-        object.send(:remove_instance_variable, :@mock_proxy)
+        object.__send__(:remove_instance_variable, :@mock_proxy)
 
         begin
           dump_without_mocks(object, *args)

diff --git a/lib/rspec/mocks/proxy.rb b/lib/rspec/mocks/proxy.rb
@@ -110,7 +110,7 @@ def message_received(method_name, *args, &block)
           stub.advise(*args)
           raise_unexpected_message_args_error(stub, *args)
         elsif @object.is_a?(Class)
-          @object.superclass.send(method_name, *args, &block)
+          @object.superclass.__send__(method_name, *args, &block)
         else
           @object.__send__(:method_missing, method_name, *args, &block)
         end