flexmock 1.0.0.beta.2 → 1.0.0.beta.3

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.2
+Version :: 1.0.0.beta.3
 
 = Links
 
@@ -141,7 +141,7 @@ FlexMock::MockContainer#flexmock for more details.
   teh base class. This helps prevent tests from becoming stale with
   incorrectly mocked objects when the method names change.
 
-  Use the <code>explicit</code> modifier to
+  Use the <code>explicitly</code> modifier to
   <code>should_receive</code> to override base class restrictions.
 
 * <b>partial_mock = flexmock(real_object)</b>
@@ -271,13 +271,13 @@ a mock object. See theFlexMock::Expectation for more details.
   Define a number of expected messages that have the same constrants, but
   return different values.
 
-* <b>should_receive(...).explicit</b>
+* <b>should_receive(...).explicitly</b>
 
-  If a mock has a base class, use the <code>explicit</code> modifier
+  If a mock has a base class, use the <code>explicitly</code> modifier
   to override the restriction on method names imposed by the base
-  class. The explicit modifier must come immediately after the
-  <code>should_receive</code> call and before any other expectation
-  declarators.
+  class. The <code>explicitly</code> modifier must come immediately
+  after the <code>should_receive</code> call and before any other
+  expectation declarators.
 
   If a mock does not have a base class, this method has no effect.
 

data/lib/flexmock/core.rb

@@ -134,13 +134,15 @@ class FlexMock
     @expectations[method_name]
   end
 
-  def flexmock_spies_on(base_class)
+  def flexmock_based_on(base_class)
     @base_class = base_class
+    should_receive(class: base_class)
   end
 
-  def flexmock_was_called_with?(sym, args, options={})
+  # True if the mock received the given method and arguments.
+  def flexmock_received?(sym, args, options={})
     count = 0
-    @calls.each { |call_sym, call_args, call_block|
+    @calls.each { |call_sym, call_args|
       count += 1 if (call_sym == sym) && ArgumentMatching.all_match?(args, call_args)
     }
     if options[:times]
@@ -151,6 +153,14 @@ class FlexMock
     result
   end
 
+  # Return the list of calls made on this mock. Used in formatting
+  # error messages.
+  def flexmock_calls
+    @calls
+  end
+
+  # Invocke the original non-mocked functionality for the given
+  # symbol.
   def flexmock_invoke_original(sym, args)
     return FlexMock.undefined
   end

data/lib/flexmock/expectation.rb

@@ -383,7 +383,7 @@ class FlexMock
 
     # No-op for allowing explicit calls when explicit not explicitly
     # needed.
-    def explicit
+    def explicitly
       self
     end
 

data/lib/flexmock/explicit_needed.rb

@@ -16,7 +16,7 @@ class FlexMock
       @base_class = base_class
     end
 
-    def explicit
+    def explicitly
       @explicit = true
       self
     end
@@ -32,7 +32,7 @@ class FlexMock
         fail NoMethodError, "Cannot stub methods not defined by the base class\n" +
           "   Method:     #{@method_name}\n" +
           "   Base Class: #{@base_class}\n" +
-          "   (Use explicit to override)"
+          "   (Use 'explicitly' to override)"
       end
     end
   end

data/lib/flexmock/mock_container.rb

@@ -158,7 +158,7 @@ class FlexMock
       yield(mock) if block_given?
       flexmock_remember(mock)
       ContainerHelper.add_model_methods(mock, model_class, id) if model_class
-      mock.flexmock_spies_on(base_class) if base_class
+      mock.flexmock_based_on(base_class) if base_class
       result
     end
     alias flexstub flexmock

data/lib/flexmock/partial_mock.rb

@@ -34,7 +34,7 @@ class FlexMock
     MOCK_METHODS = [
       :should_receive, :new_instances,
       :flexmock_get,   :flexmock_teardown, :flexmock_verify,
-      :flexmock_was_called_with?,
+      :flexmock_received?, :flexmock_calls,
     ]
 
     # Initialize a PartialMockProxy object.
@@ -177,8 +177,13 @@ class FlexMock
     end
 
     # Forward to the mock
-    def flexmock_was_called_with?(*args)
-      @mock.flexmock_was_called_with?(*args)
+    def flexmock_received?(*args)
+      @mock.flexmock_received?(*args)
+    end
+
+    # Forward to the mock
+    def flexmock_calls
+      @mock.flexmock_calls
     end
 
     # Set the proxy's mock container.  This set value is ignored

data/lib/flexmock/rspec_spy_matcher.rb

@@ -19,7 +19,7 @@ class FlexMock
         @options = {}
         @options[:times] = @times if @times
         @options[:with_block] = @needs_block unless @needs_block.nil?
-        @spy.flexmock_was_called_with?(@method_name, @args, @options)
+        @spy.flexmock_received?(@method_name, @args, @options)
       end
 
       def failure_message_for_should

data/lib/flexmock/spy_describers.rb

@@ -18,7 +18,11 @@ class FlexMock
         result << spy.inspect
         result << times_description(options[:times])
         result << block_description(options[:with_block])
-        result << "."
+        result << ".\n"
+        result << "The following messages have been received:\n"
+        spy.flexmock_calls.each do |sym, args|
+          result << "    " << call_description(sym, args) << "\n"
+        end
         result
       end
 

data/lib/flexmock/test_unit_assert_spy_called.rb

@@ -21,7 +21,7 @@ class FlexMock
         method_name = args.shift
       end
       args = nil if args == [:_]
-      bool = spy.flexmock_was_called_with?(method_name, args, options)
+      bool = spy.flexmock_received?(method_name, args, options)
       if negative
         bool = !bool
         message = describe_spy_negative_expectation(spy, method_name, args, options)

data/lib/flexmock/version.rb

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

data/test/base_class_test.rb

@@ -0,0 +1,52 @@
+require 'test/test_setup'
+
+class BaseClassTest < Test::Unit::TestCase
+  include FlexMock::TestCase
+
+  class FooBar
+    def foo
+    end
+
+    def method_missing(sym, *args, &block)
+      return :poof if sym == :barq
+      super
+    end
+
+    def respond_to?(method)
+      method == :barq || super
+    end
+  end
+
+  def mock
+    @mock ||= flexmock(:on, FooBar)
+  end
+
+  def test_auto_mocks_class
+    assert_equal FooBar, mock.class
+  end
+
+  def test_can_stub_existing_methods
+    mock.should_receive(:foo => :bar)
+    assert_equal :bar, mock.foo
+  end
+
+  def test_can_not_stub_non_class_defined_methods
+    ex = assert_raises(NoMethodError) do
+      mock.should_receive(:baz => :bar)
+    end
+    assert_match(/can *not stub methods.*base.*class/i, ex.message)
+    assert_match(/class:.+FooBar/i, ex.message)
+    assert_match(/method:.+baz/i, ex.message)
+  end
+
+  def test_can_explicitly_stub_non_class_defined_methods
+    mock.should_receive(:baz).explicitly.and_return(:bar)
+    assert_equal :bar, mock.baz
+  end
+
+  def test_can_explicitly_stub_meta_programmed_methods
+    mock.should_receive(:barq).explicitly.and_return(:bar)
+    assert_equal :bar, mock.barq
+  end
+
+end

data/test/spys_test.rb

@@ -1,7 +1,6 @@
 #!/usr/bin/env ruby
 
 require 'test/test_setup'
-require 'flexmock/spy_describers'
 
 class TestSpys < Test::Unit::TestCase
   include FlexMock::TestCase
@@ -94,7 +93,7 @@ class TestSpys < Test::Unit::TestCase
     @spy.should_receive(:foo).and_return(:hi)
     result = @spy.foo
     assert_equal result, :hi
-    assert @spy.flexmock_was_called_with?(:foo, nil)
+    assert_spy_called @spy, :foo
   end
 
   def test_calling_non_spy_base_methods_is_an_error
@@ -113,13 +112,13 @@ class TestSpys < Test::Unit::TestCase
   end
 
   def test_cant_put_expectations_on_non_base_class_methods_unless_explicit
-    exp = @spy.should_receive(:baz).explicit.and_return(:bar)
+    exp = @spy.should_receive(:baz).explicitly.and_return(:bar)
     @spy.baz
     assert_spy_called @spy, :baz
   end
 
   def test_ok_to_use_explicit_even_when_its_not_needed
-    exp = @spy.should_receive(:foo).explicit.and_return(:bar)
+    exp = @spy.should_receive(:foo).explicitly.and_return(:bar)
     @spy.foo
     assert_spy_called @spy, :foo
   end
@@ -133,7 +132,7 @@ class TestSpys < Test::Unit::TestCase
     assert_spy_called @foo, :foo
   end
 
-  def test_can_spy_on_class_methods
+  def test_can_spy_on_class_defined_methods
     flexmock(FooBar).should_receive(:new).and_return(:dummy)
     FooBar.new
     assert_spy_called FooBar, :new,

data/test/test_setup.rb

@@ -25,6 +25,5 @@ class FlexMock
       end
       ex
     end
-
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: flexmock
 version: !ruby/object:Gem::Version 
   prerelease: 6
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
 platform: ruby
 authors: 
 - Jim Weirich
@@ -80,6 +80,7 @@ files:
 - lib/flexmock.rb
 - test/aliasing_test.rb
 - test/assert_spy_called_test.rb
+- test/base_class_test.rb
 - test/container_methods_test.rb
 - test/default_framework_adapter_test.rb
 - test/demeter_mocking_test.rb