Revert "Fixed YAML serialization of a stubbed object."

This reverts commit 79401b2.
rspec · Oct 2, 2010 · 7499777 · 7499777
1 parent c94a566
commit 7499777
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 103 deletions.
diff --git a/lib/rspec/mocks/framework.rb b/lib/rspec/mocks/framework.rb
@@ -14,4 +14,3 @@
 require 'rspec/mocks/errors'
 require 'rspec/mocks/error_generator'
 require 'rspec/mocks/space'
-require 'rspec/mocks/serialization'
diff --git a/lib/rspec/mocks/methods.rb b/lib/rspec/mocks/methods.rb
@@ -73,15 +73,10 @@ def null_object?
     private
 
       def __mock_proxy
-        @mock_proxy ||= begin
+        if Mock === self
-          mp = if Mock === self
+          @mock_proxy ||= Proxy.new(self, @name, @options)
-            Proxy.new(self, @name, @options)
+        else
-          else
+          @mock_proxy ||= Proxy.new(self)
-            Proxy.new(self)
-          end
-
-          Serialization.fix_for(self)
-          mp
         end
       end
 

diff --git a/lib/rspec/mocks/serialization.rb b/lib/rspec/mocks/serialization.rb
diff --git a/spec/rspec/mocks/serialization_spec.rb b/spec/rspec/mocks/serialization_spec.rb