flexmock 1.3.2 → 1.3.3

data/lib/flexmock/rails.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 #
 # Permission is granted for use, copying, modification, distribution,

data/lib/flexmock/recorder.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -13,7 +13,6 @@ require 'flexmock/argument_types'
 
 class FlexMock
 
-  ####################################################################
   # Translate arbitrary method calls into expectations on the given
   # mock object.
   #
@@ -58,7 +57,9 @@ class FlexMock
     # given arguments.
     def method_missing(sym, *args, &block)
       location = caller.first
-      expectation = @mock.flexmock_define_expectation(location, sym).and_return(&block)
+      expectation = @mock.
+        flexmock_define_expectation(location, sym).
+        and_return(&block)
       if strict?
         args = args.collect { |arg| eq(arg) }
         expectation.with(*args).ordered.once

data/lib/flexmock/rspec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

data/lib/flexmock/rspec_spy_matcher.rb

@@ -29,6 +29,10 @@ class FlexMock
         describe_spy_negative_expectation(@spy, @method_name, @args, @options)
       end
 
+      def description
+        spy_description(@spy, @method_name, @args, @options)
+      end
+
       def with(*args)
         @args = args
         self

data/lib/flexmock/spy_describers.rb

@@ -1,6 +1,14 @@
 class FlexMock
 
     module SpyDescribers
+      def spy_description(spy, sym, args, options)
+        result = "have received "
+        result << call_description(sym, args)
+        result << times_description(options[:times])
+        result << block_description(options[:with_block])
+        result
+      end
+
       def describe_spy_expectation(spy, sym, args, options={})
         describe_spy(spy, sym, args, options)
       end
@@ -14,8 +22,7 @@ class FlexMock
       def describe_spy(spy, sym, args, options, not_clause="")
         result = "expected "
         result << call_description(sym, args)
-        result << " to#{not_clause} be received by "
-        result << spy.inspect
+        result << " to#{not_clause} be received by " << spy.inspect
         result << times_description(options[:times])
         result << block_description(options[:with_block])
         result << ".\n"
@@ -30,14 +37,24 @@ class FlexMock
         else
           result << "The following messages have been received:\n"
           spy.flexmock_calls.each do |call_record|
-            result << "    " << call_description(call_record.method_name, call_record.args)
-            result << " matched by " << call_record.expectation.description if call_record.expectation
-            result << "\n"
+            append_call_record(result, call_record)
           end
         end
         result
       end
 
+      def append_call_record(result, call_record)
+        result <<
+          "    " <<
+          call_description(call_record.method_name, call_record.args)
+        if call_record.expectation
+          result <<
+            " matched by " <<
+            call_record.expectation.description
+        end
+        result << "\n"
+      end
+
       def times_description(times)
         case times
         when 0

data/lib/flexmock/test_unit.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -10,42 +10,4 @@
 #+++
 
 require 'flexmock/test_unit_integration'
-
-class FlexMock
-  module GenericTestCase
-    def self.define_extensions_on(klass)
-      klass.class_eval do
-        include FlexMock::ArgumentTypes
-        include FlexMock::MockContainer
-
-        # Alias the original teardown behavior for later use.
-        alias :flexmock_original_teardown :teardown
-
-        # Teardown the test case, verifying any mocks that might have been
-        # defined in this test case.
-        def teardown
-          flexmock_teardown
-          flexmock_original_teardown
-        end
-      end
-    end
-  end
-end
-
-if defined?(MiniTest)
-  module MiniTest
-    class Unit
-      class TestCase
-        FlexMock::GenericTestCase.define_extensions_on(self)
-      end
-    end
-  end
-else
-  module Test
-    module Unit
-      class TestCase
-        FlexMock::GenericTestCase.define_extensions_on(self)
-      end
-    end
-  end
-end
+require 'flexmock/test_unit_testcase_extensions'

data/lib/flexmock/test_unit_integration.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -15,7 +15,6 @@ require 'flexmock/test_unit_assert_spy_called'
 
 class FlexMock
 
-  ####################################################################
   # Test::Unit::TestCase Integration.
   #
   # Include this module in any TestCase class in a Test::Unit test
@@ -41,7 +40,6 @@ class FlexMock
 
   end
 
-  ####################################################################
   # Adapter for adapting FlexMock to the Test::Unit framework.
   #
   class TestUnitFrameworkAdapter
@@ -58,7 +56,9 @@ class FlexMock
     end
 
     def assertion_failed_error
-      defined?(Test::Unit::AssertionFailedError) ? Test::Unit::AssertionFailedError : MiniTest::Assertion
+      defined?(Test::Unit::AssertionFailedError) ?
+        Test::Unit::AssertionFailedError :
+        MiniTest::Assertion
     end
   end
 

data/lib/flexmock/test_unit_testcase_extensions.rb

@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+
+#---
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#+++
+
+class FlexMock
+  module GenericTestCase
+    def self.define_extensions_on(klass)
+      klass.class_eval do
+        include FlexMock::ArgumentTypes
+        include FlexMock::MockContainer
+
+        # Alias the original teardown behavior for later use.
+        alias :flexmock_original_teardown :teardown
+
+        # Teardown the test case, verifying any mocks that might have been
+        # defined in this test case.
+        def teardown
+          flexmock_teardown
+          flexmock_original_teardown
+        end
+      end
+    end
+  end
+end
+
+if defined?(MiniTest)
+  module MiniTest
+    class Unit
+      class TestCase
+        FlexMock::GenericTestCase.define_extensions_on(self)
+      end
+    end
+  end
+else
+  module Test
+    module Unit
+      class TestCase
+        FlexMock::GenericTestCase.define_extensions_on(self)
+      end
+    end
+  end
+end

data/lib/flexmock/undefined.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

data/lib/flexmock/validators.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,
@@ -32,11 +32,6 @@ class FlexMock
       n < @limit
     end
 
-    # Pluralize "call"
-    def calls(n)
-      n == 1 ? "call" : "calls"
-    end
-
     # Human readable description of the validator
     def describe
       case @limit
@@ -58,14 +53,25 @@ class FlexMock
     def validate_count(n, &block)
       @exp.flexmock_location_filter do
         FlexMock.framework_adapter.make_assertion(
-          lambda {
-            "Method '#{@exp}' called incorrect number of times\n" +
-            "#{describe_limit} matching #{calls(@limit)} expected\n" +
-            "#{n} matching #{calls(n)} found\n" +
-            describe_calls(@exp.mock)
-          }, &block)
+          lambda { construct_validation_count_error_message(n) },
+          &block)
       end
     end
+
+    private
+
+    # Build the error message for an invalid count
+    def construct_validation_count_error_message(n)
+      "Method '#{@exp}' called incorrect number of times\n" +
+        "#{describe_limit} matching #{calls(@limit)} expected\n" +
+        "#{n} matching #{calls(n)} found\n" +
+        describe_calls(@exp.mock)
+    end
+
+    # Pluralize "call"
+    def calls(n)
+      n == 1 ? "call" : "calls"
+    end
   end
 
   ####################################################################

data/lib/flexmock/version.rb

@@ -3,7 +3,7 @@ class FlexMock
     NUMBERS = [
       MAJOR = 1,
       MINOR = 3,
-      BUILD = 2,
+      BUILD = 3,
     ]
   end
 

data/test/based_partials_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

data/test/container_methods_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

data/test/default_framework_adapter_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

data/test/demeter_mocking_test.rb

@@ -5,7 +5,7 @@ require 'test/test_setup'
 class TestDemeterMocking < Test::Unit::TestCase
   include FlexMock::TestCase
 
-  def test_demeter_mocking
+  def test_demeter_mocking_basics
     m = flexmock("A")
     m.should_receive("children.first").and_return(:first)
     assert_kind_of FlexMock, m
@@ -36,12 +36,24 @@ class TestDemeterMocking < Test::Unit::TestCase
     assert_equal :last, m.child.x.y.z.last
   end
 
-  def test_multi_level_deep_demeter_violation
+  def test_multi_level_deep_demeter_violation_with_mock
     a = flexmock("a")
     a.should_receive("b.c.d.e.f.g.h.i.j.k").and_return(:xyzzy)
     assert_equal :xyzzy, a.b.c.d.e.f.g.h.i.j.k
   end
 
+  def test_partial_with_demeter
+    a = flexmock(Object.new, "a partial")
+    a.should_receive("b.c").and_return(:xyzzy)
+    assert_equal :xyzzy, a.b.c
+  end
+
+  def test_multi_level_deep_demeter_violation_with_partial
+    a = flexmock(Object.new, "a")
+    a.should_receive("b.c.d.e.f.g.h.i.j.k").and_return(:xyzzy)
+    assert_equal :xyzzy, a.b.c.d.e.f.g.h.i.j.k
+  end
+
   def test_final_method_can_have_multiple_expecations
     a = flexmock("a")
     a.should_receive("b.c.d.last").with(1).and_return(:one).once
@@ -62,6 +74,44 @@ class TestDemeterMocking < Test::Unit::TestCase
     assert_match(/child/i, ex.message)
   end
 
+  def test_compatible_mock_declarations_are_ok_full_mock_version
+    m = flexmock("A")
+    b = flexmock("B")
+    c = flexmock("C")
+    m.should_receive(:b => b)
+    b.should_receive(:c => c)
+    c.should_receive(:foo => :bar)
+    m.should_receive("b.c.baz").and_return(:barg)
+    m.should_receive("b.zhar").and_return(:zzz)
+
+    assert_equal :bar, m.b.c.foo
+    assert_equal :barg, m.b.c.baz
+    assert_equal :zzz, m.b.zhar
+  end
+
+  def test_compatible_mock_declarations_are_ok_partial_mock_version
+    m = flexmock("A")
+    b = flexmock(Object.new, "B")
+    c = flexmock("C")
+    m.should_receive(:b => b)
+    b.should_receive(:c => c)
+    c.should_receive(:foo => :bar)
+    m.should_receive("b.c.baz").and_return(:barg)
+    m.should_receive("b.zhar").and_return(:zzz)
+
+    assert_equal :bar, m.b.c.foo
+    assert_equal :barg, m.b.c.baz
+    assert_equal :zzz, m.b.zhar
+  end
+
+  def test_paths
+    m = flexmock("A")
+    b = flexmock("B")
+    m.should_receive("a.b" => b)
+    m.should_receive("a.b.c.x" => 1)
+    m.should_receive("a.b.c.y" => 2)
+  end
+
   def test_conflicting_mock_declarations_in_reverse_order_does_not_raise_error
     # Not all conflicting definitions can be detected.
     m = flexmock("A")

data/test/deprecated_methods_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,

data/test/examples_from_readme_test.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 #---
-# Copyright 2003-2012 by Jim Weirich (jim.weirich@gmail.com).
+# Copyright 2003-2013 by Jim Weirich (jim.weirich@gmail.com).
 # All rights reserved.
 
 # Permission is granted for use, copying, modification, distribution,