flexmock 1.0.0 → 1.0.1

data/doc/releases/flexmock-1.0.0.rdoc

@@ -33,12 +33,12 @@ a few bug fixes.
 
 == What is FlexMock?
 
-FlexMock is a flexible framework for creating mock object for testing. When
-running unit tests, it is often desirable to use isolate the objects being
-tested from the "real world" by having them interact with simplified test
-objects. Sometimes these test objects simply return values when called, other
-times they verify that certain methods were called with particular arguments
-in a particular order.
+FlexMock is a flexible framework for creating mock object for testing.
+When running unit tests, it is often desirable to use isolate the
+objects being tested from the "real world" by having them interact
+with simplified test objects. Sometimes these test objects simply
+return values when called, other times they verify that certain
+methods were called with particular arguments in a particular order.
 
 FlexMock makes creating these test objects easy.
 

data/lib/flexmock/base.rb

@@ -9,6 +9,10 @@
 # above copyright notice is included.
 #+++
 
+require 'flexmock/symbol_extensions'
+require 'flexmock/object_extensions'
+require 'flexmock/class_extensions'
+
 require 'flexmock/core'
 
 require 'flexmock/default_framework_adapter'

data/lib/flexmock/class_extensions.rb

@@ -0,0 +1,17 @@
+# Detecting whether a class has a definition for a method or not
+# changes between Ruby 1.8 and Ruby 1.9. We introduce the
+# "flexmock_defined?" method on class objects to have a portable way
+# to determine that.
+#
+# NOTE: responds_to? isn't appropriate. We don't care if the object
+#       responds to the method or not. We want to know if the class
+#       has a definition for the method. A subtle difference.
+#
+class Class
+
+  # Does a class directly define a method named "method_name"?
+  def flexmock_defined?(method_name)
+    instance_methods.include?(method_name.flexmock_as_name)
+  end
+
+end

data/lib/flexmock/core.rb

@@ -14,6 +14,7 @@ require 'flexmock/composite'
 require 'flexmock/ordering'
 require 'flexmock/argument_matching'
 require 'flexmock/explicit_needed'
+require 'flexmock/class_extensions'
 
 ######################################################################
 # FlexMock is a flexible mock object framework for supporting testing.
@@ -105,7 +106,7 @@ class FlexMock
       if handler = @expectations[sym]
         args << block  if block_given?
         handler.call(*args)
-      elsif @base_class && @base_class.instance_methods.include?(sym)
+      elsif @base_class && @base_class.flexmock_defined?(sym)
         FlexMock.undefined
       elsif @ignore_missing
         FlexMock.undefined
@@ -136,7 +137,7 @@ class FlexMock
 
   def flexmock_based_on(base_class)
     @base_class = base_class
-    should_receive(class: base_class)
+    should_receive(:class => base_class)
   end
 
   # True if the mock received the given method and arguments.
@@ -202,7 +203,7 @@ class FlexMock
       @expectations[sym] << result
       override_existing_method(sym) if flexmock_respond_to?(sym)
       result = ExplicitNeeded.new(result, sym, @base_class) if
-        @base_class && ! @base_class.instance_methods.include?(sym)
+        @base_class && ! @base_class.flexmock_defined?(sym)
       result
     end
   end

data/lib/flexmock/object_extensions.rb

@@ -0,0 +1,5 @@
+class Object
+  def flexmock_singleton_defined?(method_name)
+    singleton_methods(false).include?(method_name.flexmock_as_name)
+  end
+end

data/lib/flexmock/partial_mock.rb

@@ -209,10 +209,8 @@ class FlexMock
       class << @obj; self; end
     end
 
-    # Is the given method name a singleton method in the object we are
-    # mocking?
     def singleton?(method_name)
-      @obj.singleton_methods.include?(method_name.to_s)
+      @obj.flexmock_singleton_defined?(method_name)
     end
 
     # Hide the existing method definition with a singleton defintion
@@ -264,7 +262,7 @@ class FlexMock
       sclass.class_eval do
         begin
           alias_method(new_alias, method_name)
-        rescue NameError => ex
+        rescue NameError
           nil
         end
       end

data/lib/flexmock/symbol_extensions.rb

@@ -0,0 +1,17 @@
+class Symbol
+
+  case instance_methods.first
+  when Symbol
+    def flexmock_as_name
+      self
+    end
+
+  when String
+    def flexmock_as_name
+      to_s
+    end
+
+  else
+    fail "Unexpected class for method list #{instance_methods.first.class}"
+  end
+end

data/lib/flexmock/version.rb

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

data/test/assert_spy_called_test.rb

@@ -34,7 +34,7 @@ class AssertSpyCalledTest < Test::Unit::TestCase
 
   def test_assert_rejects_incorrect_args
     spy.foo(1,2)
-    messages = assert_fails(/^expected foo\(1, 3\) to be received by <FlexMock:AssertSpyCalledTest::FooBar Mock>/i) do
+    assert_fails(/^expected foo\(1, 3\) to be received by <FlexMock:AssertSpyCalledTest::FooBar Mock>/i) do
       assert_spy_called spy, :foo, 1, 3
     end
   end
@@ -43,14 +43,14 @@ class AssertSpyCalledTest < Test::Unit::TestCase
     spy.foo
     spy.foo
     spy.foo
-    assert_spy_called spy, {times: 3}, :foo
+    assert_spy_called spy, {:times => 3}, :foo
   end
 
   def test_assert_rejects_incorrect_type
     spy.foo
     spy.foo
     assert_fails(/^expected foo\(\) to be received by <FlexMock:AssertSpyCalledTest::FooBar Mock> 3 times/i) do
-      assert_spy_called spy, {times: 3}, :foo
+      assert_spy_called spy, {:times => 3}, :foo
     end
   end
 
@@ -65,14 +65,14 @@ class AssertSpyCalledTest < Test::Unit::TestCase
     spy.foo
     spy.foo(1)
     spy.foo("HI")
-    spy.foo("Hello", "World", 10, options: true)
-    assert_spy_called spy, {times: 4}, :foo, :_
+    spy.foo("Hello", "World", 10, :options => true)
+    assert_spy_called spy, {:times => 4}, :foo, :_
   end
 
   def test_assert_rejects_bad_count_on_any_args
     spy.foo
     assert_fails(/^expected foo\(\.\.\.\) to be received by <FlexMock:AssertSpyCalledTest::FooBar Mock> twice/i) do
-      assert_spy_called spy, {times: 2}, :foo, :_
+      assert_spy_called spy, {:times => 2}, :foo, :_
     end
   end
 

data/test/object_extensions_test.rb

@@ -0,0 +1,25 @@
+#!/usr/bin/env ruby
+
+require 'test/test_setup'
+require 'flexmock/object_extensions'
+
+class ObjectExtensionsTest < Test::Unit::TestCase
+  def setup
+    @obj = Object.new
+    def @obj.smethod
+      :ok
+    end
+  end
+
+  def test_undefined_methods_are_not_singletons
+    assert ! @obj.flexmock_singleton_defined?(:xyzzy)
+  end
+
+  def test_normal_methods_are_not_singletons
+    assert ! @obj.flexmock_singleton_defined?(:to_s)
+  end
+
+  def test_singleton_methods_are_singletons
+    assert @obj.flexmock_singleton_defined?(:smethod)
+  end
+end

data/test/partial_mock_test.rb

@@ -38,7 +38,7 @@ class TestStubbing < Test::Unit::TestCase
   def test_attempting_to_partially_mock_existing_mock_is_noop
     m = flexmock("A")
     flexmock(m)
-    assert ! m.instance_variables.include?(:@flexmock_proxy)
+    assert ! m.instance_variables.include?(:@flexmock_proxy.flexmock_as_name)
   end
 
   def test_stub_command_add_behavior_to_arbitrary_objects
@@ -287,7 +287,7 @@ class TestStubbing < Test::Unit::TestCase
     end
   end
 
-  def test_object_methods_method_is_not_used_in_singleton_checks
+  def xtest_object_methods_method_is_not_used_in_singleton_checks
     obj = NoMethods.new
     def obj.mock() :original end
     assert_nothing_raised {  flexmock(obj) }

data/test/should_receive_test.rb

@@ -149,6 +149,19 @@ class TestFlexMockShoulds < Test::Unit::TestCase
     end
   end
 
+  def test_multiple_yields_and_multiple_returns_are_synced
+    FlexMock.use do |m|
+      m.should_receive(:msg).and_yield(:one).and_return(1).and_yield(:two).and_return(2)
+      yielded_values = []
+      returned_values = []
+      returned_values << m.msg { |a| yielded_values << a }
+      returned_values << m.msg { |a| yielded_values << a }
+      returned_values << m.msg { |a| yielded_values << a }
+      assert_equal [:one, :two, :two], yielded_values
+      assert_equal [1, 2, 2], returned_values
+    end
+  end
+
   def test_failure_if_no_block_given
     FlexMock.use do |m|
       m.should_receive(:hi).and_yield(:one, :two).once

data/test/spys_test.rb

@@ -56,7 +56,7 @@ class TestSpys < Test::Unit::TestCase
   def test_spy_detects_multiple_calls_with_different_arguments
     @spy.foo(1)
     @spy.foo(1)
-    assert_spy_called @spy, {times: 2}, :foo, 1
+    assert_spy_called @spy, {:times => 2}, :foo, 1
   end
 
   def test_spy_rejects_if_times_options_not_matching
@@ -72,12 +72,12 @@ class TestSpys < Test::Unit::TestCase
 
   def test_spy_rejects_a_block
     @spy.foo { }
-    assert_spy_not_called @spy, {with_block: false}, :foo
+    assert_spy_not_called @spy, {:with_block => false}, :foo
   end
 
   def test_spy_detects_a_missing_block
     @spy.foo
-    assert_spy_called @spy, {with_block: false}, :foo
+    assert_spy_called @spy, {:with_block => false}, :foo
   end
 
   def test_spy_rejects_a_missing_block
@@ -119,7 +119,7 @@ class TestSpys < Test::Unit::TestCase
 
   def test_cant_put_expectations_on_non_base_class_methodsx
     ex = assert_raise(NoMethodError) do
-      exp = @spy.should_receive(:baz).and_return(:bar)
+      @spy.should_receive(:baz).and_return(:bar)
     end
     assert_match(/cannot stub.*defined.*base.*class/i, ex.message)
     assert_match(/method: +baz/i, ex.message)
@@ -127,13 +127,13 @@ class TestSpys < Test::Unit::TestCase
   end
 
   def test_cant_put_expectations_on_non_base_class_methods_unless_explicit
-    exp = @spy.should_receive(:baz).explicitly.and_return(:bar)
+    @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).explicitly.and_return(:bar)
+    @spy.should_receive(:foo).explicitly.and_return(:bar)
     @spy.foo
     assert_spy_called @spy, :foo
   end
@@ -150,7 +150,7 @@ class TestSpys < Test::Unit::TestCase
   def test_can_spy_on_class_defined_methods
     flexmock(FooBar).should_receive(:new).and_return(:dummy)
     FooBar.new
-    assert_spy_called FooBar, :new,
+    assert_spy_called FooBar, :new
   end
 
   def test_can_spy_on_regular_mocks

data/test/symbol_extensions_test.rb

@@ -0,0 +1,8 @@
+require 'test/test_setup'
+
+class SymbolEtentensionsTest < Test::Unit::TestCase
+  def test_as_name_converts_appropriatly
+    method_name_class = self.class.instance_methods.first.class
+    assert_equal method_name_class, :some_name.flexmock_as_name.class
+  end
+end

data/test/test_class_extensions.rb

@@ -0,0 +1,34 @@
+require 'test/test_setup'
+
+class ClassExtensionsTest < Test::Unit::TestCase
+
+  class Dog
+    def wag
+    end
+
+    def method_missing(sym, *args, &block)
+      if sym == :bark
+        :woof
+      else
+        super
+      end
+    end
+
+    def responds_to?(sym)
+      sym == :bark || super
+    end
+  end
+
+  def test_class_directly_defines_method
+    assert Dog.flexmock_defined?(:wag)
+  end
+
+  def test_class_indirectly_defines_method
+    assert ! Dog.flexmock_defined?(:bark)
+  end
+
+  def test_class_does_not_define_method
+    assert ! Dog.flexmock_defined?(:jump)
+  end
+
+end

metadata

@@ -1,29 +1,25 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: flexmock
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.0.1
   prerelease: 
-  version: 1.0.0
 platform: ruby
-authors: 
+authors:
 - Jim Weirich
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-08-23 00:00:00 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies: []
-
-description: "\n      FlexMock is a extremely simple mock object class compatible\n      with the Test::Unit framework.  Although the FlexMock's\n      interface is simple, it is very flexible.\n    "
+description: ! "\n      FlexMock is a extremely simple mock object class compatible\n
+  \     with the Test::Unit framework.  Although the FlexMock's\n      interface is
+  simple, it is very flexible.\n    "
 email: jim.weirich@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - CHANGES
-- doc/examples/rspec_examples_spec.rdoc
-- doc/examples/test_unit_examples_test.rdoc
 - doc/GoogleExample.rdoc
 - doc/releases/flexmock-0.4.0.rdoc
 - doc/releases/flexmock-0.4.1.rdoc
@@ -45,8 +41,12 @@ extra_rdoc_files:
 - doc/releases/flexmock-0.8.5.rdoc
 - doc/releases/flexmock-0.9.0.rdoc
 - doc/releases/flexmock-1.0.0.rdoc
-files: 
+- doc/examples/rspec_examples_spec.rdoc
+- doc/examples/test_unit_examples_test.rdoc
+files:
 - CHANGES
+- Gemfile
+- Gemfile.lock
 - Rakefile
 - README.rdoc
 - TAGS
@@ -54,6 +54,7 @@ files:
 - lib/flexmock/argument_matching.rb
 - lib/flexmock/argument_types.rb
 - lib/flexmock/base.rb
+- lib/flexmock/class_extensions.rb
 - lib/flexmock/composite.rb
 - lib/flexmock/core.rb
 - lib/flexmock/core_class_methods.rb
@@ -65,6 +66,7 @@ files:
 - lib/flexmock/explicit_needed.rb
 - lib/flexmock/mock_container.rb
 - lib/flexmock/noop.rb
+- lib/flexmock/object_extensions.rb
 - lib/flexmock/ordering.rb
 - lib/flexmock/partial_mock.rb
 - lib/flexmock/rails/view_mocking.rb
@@ -73,6 +75,7 @@ files:
 - lib/flexmock/rspec.rb
 - lib/flexmock/rspec_spy_matcher.rb
 - lib/flexmock/spy_describers.rb
+- lib/flexmock/symbol_extensions.rb
 - lib/flexmock/test_unit.rb
 - lib/flexmock/test_unit_assert_spy_called.rb
 - lib/flexmock/test_unit_integration.rb
@@ -92,6 +95,7 @@ files:
 - test/flexmodel_test.rb
 - test/naming_test.rb
 - test/new_instances_test.rb
+- test/object_extensions_test.rb
 - test/partial_mock_test.rb
 - test/rails_view_stub_test.rb
 - test/record_mode_test.rb
@@ -102,14 +106,14 @@ files:
 - test/should_ignore_missing_test.rb
 - test/should_receive_test.rb
 - test/spys_test.rb
+- test/symbol_extensions_test.rb
+- test/test_class_extensions.rb
 - test/test_setup.rb
 - test/test_unit_integration/auto_test_unit_test.rb
 - test/tu_integration_test.rb
 - test/undefined_test.rb
 - flexmock.blurb
 - install.rb
-- doc/examples/rspec_examples_spec.rdoc
-- doc/examples/test_unit_examples_test.rdoc
 - doc/GoogleExample.rdoc
 - doc/releases/flexmock-0.4.0.rdoc
 - doc/releases/flexmock-0.4.1.rdoc
@@ -131,36 +135,35 @@ files:
 - doc/releases/flexmock-0.8.5.rdoc
 - doc/releases/flexmock-0.9.0.rdoc
 - doc/releases/flexmock-1.0.0.rdoc
+- doc/examples/rspec_examples_spec.rdoc
+- doc/examples/test_unit_examples_test.rdoc
 homepage: https://github.com/jimweirich/flexmock
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - FlexMock
 - --main
 - README.rdoc
 - --line-numbers
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Simple and Flexible Mock Objects for Testing
 test_files: []
-