flexmock 1.0.0.beta.3 → 1.0.0.beta.4

data/README.rdoc

@@ -3,7 +3,7 @@
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 1.0.0.beta.3
+Version :: 1.0.0.beta.4
 
 = Links
 

data/lib/flexmock/mock_container.rb

@@ -123,6 +123,7 @@ class FlexMock
       safe_mode = false
       model_class = nil
       base_class = nil
+      mock = nil
       while ! args.empty?
         case args.first
         when :base, :safe
@@ -139,6 +140,8 @@ class FlexMock
           name = args.shift.to_s
         when Hash
           quick_defs = args.shift
+        when FlexMock
+          mock = args.shift
         else
           domain_obj = args.shift
         end
@@ -150,9 +153,11 @@ class FlexMock
         result = domain_obj
       elsif model_class
         id = ContainerHelper.next_id
-        result = mock = FlexMock.new("#{model_class}_#{id}", self)
+        mock ||= FlexMock.new("#{model_class}_#{id}", self)
+        result = mock
       else
-        result = mock = FlexMock.new(name || "unknown", self)
+        mock ||= FlexMock.new(name || "unknown", self)
+        result = mock
       end
       mock.should_receive(quick_defs)
       yield(mock) if block_given?

data/lib/flexmock/spy_describers.rb

@@ -20,8 +20,8 @@ class FlexMock
         result << block_description(options[:with_block])
         result << ".\n"
         result << "The following messages have been received:\n"
-        spy.flexmock_calls.each do |sym, args|
-          result << "    " << call_description(sym, args) << "\n"
+        spy.flexmock_calls.each do |call_sym, call_args|
+          result << "    " << call_description(call_sym, call_args) << "\n"
         end
         result
       end

data/lib/flexmock/version.rb

@@ -5,7 +5,7 @@ class FlexMock
       MINOR = 0,
       BUILD = 0,
       BETA = 'beta',
-      BETAREV = 3,
+      BETAREV = 4,
     ]
   end
 

data/test/partial_mock_test.rb

@@ -35,6 +35,12 @@ class TestStubbing < Test::Unit::TestCase
     end
   end
 
+  def test_attempting_to_partially_mock_existing_mock_is_noop
+    m = flexmock("A")
+    flexmock(m)
+    assert ! m.instance_variables.include?(:@flexmock_proxy)
+  end
+
   def test_stub_command_add_behavior_to_arbitrary_objects
     obj = Object.new
     flexmock(obj).should_receive(:hi).once.and_return(:stub_hi)
@@ -269,7 +275,7 @@ class TestStubbing < Test::Unit::TestCase
       assert ! dog.respond_to?(sym), "should not have :#{sym} defined"
     end
   end
-  
+
   # This test ensures that singleton? does not use the old methods(false)
   # call that has fallen out of favor in Ruby 1.9. In multiple 1.9 releases
   # Delegator#methods will not even accept the optional argument, making flexmock
@@ -280,13 +286,13 @@ class TestStubbing < Test::Unit::TestCase
       raise "Should not be called in the test lifecycle"
     end
   end
-  
+
   def test_object_methods_method_is_not_used_in_singleton_checks
     obj = NoMethods.new
     def obj.mock() :original end
     assert_nothing_raised {  flexmock(obj) }
   end
-  
+
   def test_partial_mocks_with_mock_method_singleton_colision_have_original_defs_restored
     dog = Dog.new
     def dog.mock() :original end

metadata

@@ -2,7 +2,7 @@
 name: flexmock
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.beta.3
+  version: 1.0.0.beta.4
 platform: ruby
 authors: 
 - Jim Weirich