flexmock 0.6.2 → 0.6.3

data/{CHANGELOG → CHANGES}

@@ -1,5 +1,26 @@
 = Changes for FlexMock
 
+== Version 0.6.3
+
+* Added flexmodel() for better support of mocking ActiveRecord models.
+
+* Fixed comment for singleton?
+
+* Fixed coverage report for the partial mocking class.
+
+* Fixed bug when partial mock objects reported they respond to a
+  method but they actually didn't.
+
+* The flexmock() method now _always_ returns a combination domain/mock
+  object.  For partial mocks, this implies that the domain object now
+  has mock support methods on it (e.g. should_receive).
+
+* Safe mode for partials was introduced for the small number of cases
+  where mock support methods in the domain object would cause
+  problems.
+
+* Internally renamed PartialMock to PartialMockProxy.  
+	
 == Version 0.6.2
 
 * flexmock() with a block now always returns the domain object.

data/README

@@ -3,7 +3,7 @@
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 0.6.2
+Version :: 0.6.2.1
 
 = Links
 
@@ -53,7 +53,8 @@ Here's the complete example:
     end
   end
 
-You can find an extended example of FlexMock in {Google Example}[http://flexmock.rubyforge.org/files/doc/GoogleExample_rdoc.html].
+You can find an extended example of FlexMock in {Google
+Example}[http://flexmock.rubyforge.org/files/doc/GoogleExample_rdoc.html].
 
 == Test::Unit Integration
 
@@ -94,53 +95,100 @@ FlexMock also supports integration with the RSpec behavior specification framewo
     end
   end
 
-If you wish to try this prior to the release of RSpec 0.9.0, check out the trunk of the RSpec subversion repository.
+If you wish to try this prior to the release of RSpec 0.9.0, check out
+the trunk of the RSpec subversion repository.
 
 == Quick Reference
 
 === Creating Mock Objects 
 
-The +flexmock+ method is used to create mocks in various configurations.  Here's a quick rundown of the most common options.  See FlexMock::MockContainer#flexmock for more details.
+The +flexmock+ method is used to create mocks in various
+configurations.  Here's a quick rundown of the most common options.
+See FlexMock::MockContainer#flexmock for more details.
 
-* <b>m = flexmock("joe")</b>
+* <b>mock = flexmock("joe")</b>
 
   Create a mock object named "joe" (the name is used in reporting errors).  
 
-* <b>m = flexmock(:foo => :bar, :baz => :froz)</b>
+* <b>mock = flexmock(:foo => :bar, :baz => :froz)</b>
 
   Create a mock object and define two mocked methods (:foo and :baz) that
   return the values :bar and :froz respectively. This is useful when creating
   mock objects with just a few methods and simple return values.
 
-* <b>m = flexmock("joe", :foo => :bar, :bar => :froz)</b>
+* <b>mock = flexmock("joe", :foo => :bar, :bar => :froz)</b>
 
   You can combine the mock name and an expectation hash in the same call to
   flexmock.
 
-* <b>m = flexmock(real_object)</b>
+* <b>partial_mock = flexmock(real_object)</b>
 
   If you you give +flexmock+ a real object in the argument list, it will treat
   that real object as a base for a partial mock object. The return value +m+
   may be used to set expectations. The real_object should be used in the
   reference portion of the test.
   
-* <b>m = flexmock(real_object, "name", :foo => :baz)</b>
+* <b>partial_mock = flexmock(real_object, "name", :foo => :baz)</b>
 
   Names and expectation hashes may be used with partial mocks as well.
 
-* <b>m = flexmock(:base, real_string_object)</b>
+* <b>partial_mock = flexmock(:base, real_string_object)</b>
 
   Since Strings (and Symbols for that matter) are used for mock names,
   FlexMock will not recognize them as the base for a partial mock. To force a
   string to be used as a partial mock base, proceed the string object in the
   calling sequence with :base.
 
-* <b>m = flexmock(...) { |mock| mock.should_receive(...) }</b>
+* <b>partial_mock = flexmock(:safe, real_object) { |mock| mock.should_receive(...) }</b>
+
+  When mocking real objects (i.e. "partial mocks"), FlexMock will add
+  a handful of mock related methods to the actual object (see below
+  for list of method names).  If one or more of these added methods
+  collide with an existing method on the partial mock, then there are problems.
+
+  FlexMock offers a "safe" mode for partial mocks that does not add
+  these methods.  Indicate safe mode by passing the symbol :safe as
+  the first argument of flexmock.  A block <em>is required</em> when
+  using safe mode (the partial_mock returned in safe mode does not
+  have a +should_receive+ method).
+
+  The methods added to partial mocks in non-safe mode are:
+
+  * should_receive
+  * new_instances
+  * any_instance  (note: deprecated)
+  * mock
+  * mock_teardown
+  * mock_setup    
+
+* <b>mock = flexmock(...) { |mock| mock.should_receive(...) }</b>
 
   If a block is given to any of the +flexmock+ forms, the mock object will be
   passed to the block as an argument. Code in the block can set the desired
   expectations for the mock object.
 
+* <b>mock_model = flexmodel(YourModel, ...) { |mock| mock.should_receive(...) }</b>
+
+  The flexmodel() method will return a pure mock (not a partial mock)
+  that will have some ActiveRecord specific methods defined.
+  YourModel should be the class of an ActiveRecord model.  These
+  predefined methods make it a bit easier to mock out ActiveRecord
+  model objects in a Rails application.  Other that the predefined
+  mocked methods, the mock returned is a standard FlexMock mock
+  object.
+
+  The predefined mocked methods are:
+
+  * id -- returns a unique ID for each mocked model.
+  * to_params -- returns a stringified version of the id.
+  * new_record? -- returns false.
+  * errors -- returns an empty (mocked) errors object.
+  * is_a?(other) -- returns true if other == YourModel.
+  * class -- returns YourModel.
+
+  The flexmodel() method is optional.  You must require
+  'flexmock/activerecord' to enable it.
+
 <b>NOTE:</b>  Versions of FlexMock prior to 0.6.0 used +flexstub+ to create partial mocks.  The +flexmock+ method now assumes all the functionality that was spread out between two different methods.  +flexstub+ is still available for backward compatibility.
 
 === Expectation Declarators

data/Rakefile

@@ -8,7 +8,7 @@
 # and distribution of modified versions of this work as long as the
 # above copyright notice is included.
 #+++
-
+task :noop
 require 'rubygems'
 require 'rake/gempackagetask'
 require 'rake/clean'
@@ -19,7 +19,7 @@ require 'rake/contrib/rubyforgepublisher'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.6.2'
+PKG_VERSION = '0.6.3'
 
 PKG_FILES = FileList[
   '[A-Z]*',
@@ -31,7 +31,7 @@ PKG_FILES = FileList[
 
 RDOC_FILES = FileList[
   'README',
-  'CHANGELOG',
+  'CHANGES',
   'lib/**/*.rb',
   'doc/**/*.rdoc',
 ]
@@ -189,7 +189,7 @@ task :specs do
 end
 
 task :tag do
-  sh %{svn copy #{SVNHOME}/trunk #{SVNHOME}/tags/rel-#{PKG_VERSION} -m 'Release #{PKG_VERSION}'}
+  sh "svn copy #{SVNHOME}/trunk #{SVNHOME}/tags/rel-#{PKG_VERSION} -m 'Release #{PKG_VERSION}'"
 end
 
 RUBY_FILES = FileList['**/*.rb']
@@ -197,3 +197,18 @@ RUBY_FILES.exclude(/^pkg/)
 task :dbg do
   RUBY_FILES.egrep(/DBG/)
 end
+
+# Tagging ------------------------------------------------------------
+
+module Tags
+  RUBY_FILES = FileList['**/*.rb'].exclude("pkg")
+end
+
+namespace "tags" do
+  task :emacs => Tags::RUBY_FILES do
+    puts "Making Emacs TAGS file"
+    sh "xctags -e #{Tags::RUBY_FILES}", :verbose => false
+  end
+end
+
+task :tags => ["tags:emacs"]

data/TAGS

@@ -0,0 +1,461 @@
+
+install.rb,29
+def indir(newdir)indir
7,68
+
+doc/jamis.rb,43
+module RDocRDoc
1,0
+module PagePage
2,12
+
+lib/flexmock.rb,0
+
+lib/flexmock/argument_matchers.rb,424
+class FlexMockFlexMock
14,338
+  class AnyMatcherAnyMatcher
17,445
+    def ===(target)===
18,464
+    def inspectinspect
21,503
+  class EqualMatcherEqualMatcher
28,655
+    def initialize(obj)initialize
29,676
+    def ===(target)===
32,725
+    def inspectinspect
35,774
+  class ProcMatcherProcMatcher
44,985
+    def initialize(&block)initialize
45,1005
+    def ===(target)===
48,1061
+    def inspectinspect
51,1115
+
+lib/flexmock/argument_types.rb,154
+class FlexMockFlexMock
14,350
+  module ArgumentTypesArgumentTypes
21,643
+    def anyany
23,726
+    def eq(obj)eq
29,853
+    def on(&block)on
36,1053
+
+lib/flexmock/base.rb,0
+
+lib/flexmock/composite.rb,30
+class FlexMockFlexMock
8,133
+
+lib/flexmock/core.rb,736
+class FlexMockFlexMock
44,1236
+  def initialize(name="unknown")initialize
50,1435
+  def mock_handle(sym, expected_count=nil, &block) # :nodoc:mock_handle
66,1959
+  def mock_verifymock_verify
72,2199
+  def mock_teardownmock_teardown
83,2428
+  def mock_allocate_ordermock_allocate_order
87,2504
+  def should_ignore_missingshould_ignore_missing
92,2612
+  def method_missing(sym, *args, &block)method_missing
98,2787
+  def respond_to?(sym)respond_to?
113,3220
+  def method(sym)method
118,3375
+  def should_receive(*args)should_receive
147,4395
+  def should_expectshould_expect
169,5078
+  def mock_wrap(&block)mock_wrap
177,5268
+  def override_existing_method(sym)override_existing_method
191,5819
+  def sclasssclass
200,6039
+
+lib/flexmock/core_class_methods.rb,239
+class FlexMockFlexMock
14,337
+    def should_receive(args)  # :nodoc:should_receive
26,798
+    def use(*names)use
61,2024
+    def format_args(sym, args)  # :nodoc:format_args
77,2444
+    def check(msg, &block)  # :nodoc:check
87,2745
+
+lib/flexmock/default_framework_adapter.rb,345
+class FlexMockFlexMock
14,337
+  class DefaultFrameworkAdapterDefaultFrameworkAdapter
15,352
+    def assert_block(msg, &block)assert_block
16,384
+    def assert_equal(a, b, msg=nil)assert_equal
22,497
+    class AssertionFailedError < StandardError; endAssertionFailedError
26,597
+    def assertion_failed_errorassertion_failed_error
27,649
+
+lib/flexmock/expectation.rb,1501
+class FlexMockFlexMock
14,337
+  class ExpectationExpectation
28,872
+    def initialize(mock, sym)initialize
34,1018
+    def to_sto_s
46,1323
+    def verify_call(*args)verify_call
52,1505
+    def eligible?eligible?
60,1759
+    def validate_ordervalidate_order
65,1880
+    def mock_verifymock_verify
77,2317
+    def match_args(args)match_args
85,2510
+    def match_arg(expected, actual)match_arg
94,2856
+    def with(*args)with
101,3085
+    def with_no_argswith_no_args
107,3219
+    def with_any_argswith_any_args
113,3352
+    def and_return(*args, &block)and_return
144,4361
+    def and_raise(exception, *args)and_raise
174,5267
+    def zero_or_more_timeszero_or_more_times
180,5450
+    def times(limit)times
187,5673
+    def nevernever
196,6020
+    def onceonce
203,6235
+    def twicetwice
210,6450
+    def at_leastat_least
222,6776
+    def at_mostat_most
235,7155
+    def ordered(group_name=nil)ordered
264,8424
+  class CompositeExpectationCompositeExpectation
281,9010
+    def initializeinitialize
284,9084
+    def add(expectation)add
289,9180
+    def method_missing(sym, *args, &block)method_missing
294,9321
+    def order_numberorder_number
305,9700
+    def mockmock
310,9810
+    def should_receive(*args, &block)should_receive
316,9978
+    def to_sto_s
321,10124
+  class ExpectationRecorderExpectationRecorder
335,10582
+    def initializeinitialize
338,10642
+    def method_missing(sym, *args, &block)method_missing
343,10753
+    def apply(mock)apply
351,11029
+
+lib/flexmock/expectation_director.rb,236
+class FlexMockFlexMock
14,337
+  class ExpectationDirectorExpectationDirector
20,549
+    def initialize(sym)initialize
23,633
+    def call(*args)call
37,1161
+    def <<(expectation)<<
46,1504
+    def mock_verifymock_verify
52,1663
+
+lib/flexmock/mock_container.rb,488
+class FlexMockFlexMock
14,337
+  module MockContainerMockContainer
24,743
+    def flexmock_teardownflexmock_teardown
27,905
+    def flexmock_verifyflexmock_verify
34,1063
+    def flexmock_closeflexmock_close
43,1354
+    def flexmock(*args)flexmock
112,4620
+    def flexmock_make_partial_proxy(obj, name)flexmock_make_partial_proxy
146,5494
+    def flexmock_quick_define(mock, defs)flexmock_quick_define
155,5799
+    def flexmock_remember(mocking_object)flexmock_remember
163,6025
+
+lib/flexmock/noop.rb,0
+
+lib/flexmock/partial_mock.rb,1057
+class FlexMockFlexMock
14,337
+  class PartialMockPartialMock
25,954
+    def initialize(obj, mock)initialize
30,1105
+    def should_receive(*args)should_receive
60,2218
+    def new_instances(*allocators, &block)new_instances
88,3171
+    def any_instance(&block)any_instance
106,3804
+    def invoke_original(method, args)invoke_original
113,4036
+    def mock_verifymock_verify
121,4330
+    def mock_teardownmock_teardown
126,4458
+    def mock_allocate_ordermock_allocate_order
138,4804
+    def sclasssclass
145,4923
+    def singleton?(method_name)singleton?
151,5064
+    def hide_existing_method(method_name)hide_existing_method
161,5526
+    def create_alias_for_existing_method(method_name)create_alias_for_existing_method
181,6240
+    def define_proxy_method(method_name)define_proxy_method
199,6759
+    def restore_original_definition(method_name)restore_original_definition
220,7459
+    def remove_current_method(method_name)remove_current_method
232,7823
+    def detached?detached?
237,7984
+    def new_name(old_name)new_name
242,8092
+
+lib/flexmock/recorder.rb,271
+class FlexMockFlexMock
14,347
+  class RecorderRecorder
20,523
+    def initialize(mock)initialize
24,629
+    def should_be_strict(is_strict=true)should_be_strict
48,1561
+    def strict?strict?
53,1675
+    def method_missing(sym, *args, &block)method_missing
59,1805
+
+lib/flexmock/rspec.rb,341
+class FlexMockFlexMock
14,337
+  class RSpecFrameworkAdapterRSpecFrameworkAdapter
16,355
+    def assert_block(msg, &block)assert_block
17,385
+    def assert_equal(a, b, msg=nil)assert_equal
21,481
+    class AssertionFailedError < StandardError; endAssertionFailedError
26,644
+    def assertion_failed_errorassertion_failed_error
27,696
+
+lib/flexmock/test_unit.rb,120
+module TestTest
14,354
+  module UnitUnit
15,366
+    class TestCaseTestCase
16,380
+      def teardownteardown
25,695
+
+lib/flexmock/test_unit_integration.rb,227
+class FlexMockFlexMock
15,357
+  module TestCaseTestCase
29,917
+    def teardownteardown
35,1092
+  class TestUnitFrameworkAdapterTestUnitFrameworkAdapter
45,1301
+    def assertion_failed_errorassertion_failed_error
47,1369
+
+lib/flexmock/validators.rb,545
+class FlexMockFlexMock
14,337
+  class CountValidatorCountValidator
19,473
+    def initialize(expectation, limit)initialize
20,496
+    def eligible?(n)eligible?
28,752
+  class ExactCountValidator < CountValidatorExactCountValidator
36,917
+    def validate(n)validate
39,1041
+  class AtLeastCountValidator < CountValidatorAtLeastCountValidator
48,1332
+    def validate(n)validate
51,1458
+    def eligible?(n)eligible?
61,1875
+  class AtMostCountValidator < CountValidatorAtMostCountValidator
69,2058
+    def validate(n)validate
71,2173
+
+test/test_container_methods.rb,1097
+class TestFlexmockContainerMethods < Test::Unit::TestCaseTestFlexmockContainerMethods
16,410
+  def test_simple_mock_creationtest_simple_mock_creation
19,498
+  def test_mock_with_nametest_mock_with_name
25,639
+  def test_mock_with_symbol_nametest_mock_with_symbol_name
32,848
+  def test_mock_with_hashtest_mock_with_hash
39,1063
+  def test_mock_with_name_and_hashtest_mock_with_name_and_hash
45,1208
+  def test_mock_with_name_hash_and_blocktest_mock_with_name_hash_and_block
54,1516
+  def test_basic_stubtest_basic_stub
62,1739
+  def test_basic_stub_with_nametest_basic_stub_with_name
69,1901
+  def test_stub_with_quick_definitionstest_stub_with_quick_definitions
77,2161
+  def test_stub_with_name_quick_definitionstest_stub_with_name_quick_definitions
83,2305
+  def test_stubs_are_auto_verifiedtest_stubs_are_auto_verified
92,2629
+  def test_stubbing_a_stringtest_stubbing_a_string
99,2831
+  def test_multiple_stubs_work_with_same_PartialMocktest_multiple_stubs_work_with_same_PartialMock
105,2958
+  def test_multiple_stubs_layer_behaviortest_multiple_stubs_layer_behavior
112,3123
+
+test/test_default_framework_adapter.rb,475
+class TestFlexmockDefaultFrameworkAdapter < Test::Unit::TestCaseTestFlexmockDefaultFrameworkAdapter
15,352
+  def setupsetup
16,417
+  def test_assert_block_raises_exception  test_assert_block_raises_exception
20,489
+  def test_assert_block_doesnt_raise_exceptiontest_assert_block_doesnt_raise_exception
26,684
+  def test_assert_equal_doesnt_raise_exceptiontest_assert_equal_doesnt_raise_exception
30,794
+  def test_assert_equal_can_failtest_assert_equal_can_fail
34,900
+
+test/test_example.rb,278
+class TemperatureSamplerTemperatureSampler
15,352
+  def initialize(sensor)initialize
16,377
+  def average_tempaverage_temp
20,430
+class TestTemperatureSampler < Test::Unit::TestCaseTestTemperatureSampler
27,562
+  def test_tempurature_samplertest_tempurature_sampler
28,614
+
+test/test_extended_should_receive.rb,797
+module ExtendedShouldReceiveTestsExtendedShouldReceiveTests
15,352
+  def test_accepts_expectation_hashtest_accepts_expectation_hash
16,386
+  def test_accepts_list_of_methodstest_accepts_list_of_methods
22,552
+  def test_contraints_apply_to_all_expectationstest_contraints_apply_to_all_expectations
29,712
+  def test_count_contraints_apply_to_all_expectationstest_count_contraints_apply_to_all_expectations
36,1001
+  def test_multiple_should_receives_are_allowedtest_multiple_should_receives_are_allowed
42,1200
+class TestExtendedShouldReceiveOnFullMocks < Test::Unit::TestCaseTestExtendedShouldReceiveOnFullMocks
50,1417
+  def setupsetup
54,1552
+class TestExtendedShouldReceiveOnPartialMocks < Test::Unit::TestCaseTestExtendedShouldReceiveOnPartialMocks
61,1622
+  def setupsetup
65,1760
+
+test/test_mock.rb,1777
+class TestFlexMock < Test::Unit::TestCaseTestFlexMock
15,352
+  def setupsetup
16,394
+  def test_handletest_handle
20,438
+  def test_handle_no_blocktest_handle_no_block
27,576
+  def test_called_with_blocktest_called_with_block
33,700
+  def test_return_valuetest_return_value
40,892
+  def test_handle_missing_methodtest_handle_missing_method
45,991
+  def test_ignore_missing_methodtest_ignore_missing_method
53,1216
+  def test_good_countstest_good_counts
59,1347
+  def test_bad_countstest_bad_counts
67,1476
+  def test_undetermined_countstest_undetermined_counts
78,1683
+  def test_zero_countstest_zero_counts
87,1822
+  def test_file_io_with_usetest_file_io_with_use
96,1995
+  def count_lines(stream)count_lines
104,2193
+  def test_usetest_use
112,2311
+  def test_failures_during_usetest_failures_during_use
121,2462
+  def test_sequential_valuestest_sequential_values
131,2675
+  def test_respond_to_returns_false_for_non_handled_methodstest_respond_to_returns_false_for_non_handled_methods
140,2903
+  def test_respond_to_returns_true_for_explicit_methodstest_respond_to_returns_true_for_explicit_methods
144,3038
+  def test_respond_to_returns_true_for_missing_methods_when_ignoring_missingtest_respond_to_returns_true_for_missing_methods_when_ignoring_missing
149,3191
+  def test_respond_to_returns_true_for_missing_methods_when_ignoring_missing_using_shouldtest_respond_to_returns_true_for_missing_methods_when_ignoring_missing_using_should
154,3372
+  def test_method_proc_raises_error_on_unknowntest_method_proc_raises_error_on_unknown
159,3568
+  def test_method_returns_callable_proctest_method_returns_callable_proc
165,3686
+  def test_method_returns_do_nothing_proc_for_missing_methodstest_method_returns_do_nothing_proc_for_missing_methods
174,3936
+
+test/test_naming.rb,404
+class TestNaming < Test::Unit::TestCaseTestNaming
15,352
+  def test_nametest_name
16,392
+  def test_name_in_no_handler_found_errortest_name_in_no_handler_found_error
21,475
+  def test_name_in_received_count_errortest_name_in_received_count_error
30,705
+  def test_naming_with_usetest_naming_with_use
39,935
+  def test_naming_with_multiple_mocks_in_usetest_naming_with_multiple_mocks_in_use
45,1048
+
+test/test_new_instances.rb,2475
+class TestNewInstances < Test::Unit::TestCaseTestNewInstances
15,352
+  class DogDog
18,430
+    def barkbark
19,442
+    def wagwag
22,475
+    def self.makemake
25,507
+  class CatCat
30,550
+    def initialize(name, &block)initialize
32,584
+  class ConnectionConnection
38,692
+    def initialize(*args)initialize
39,711
+    def send(args)send
42,779
+    def post(args)post
45,823
+  def test_new_instances_allows_stubbing_of_existing_methodstest_new_instances_allows_stubbing_of_existing_methods
50,874
+  def test_any_instance_still_works_for_backwards_compatibilitytest_any_instance_still_works_for_backwards_compatibility
58,1097
+  def test_new_instances_stubs_still_have_existing_methodstest_new_instances_stubs_still_have_existing_methods
69,1413
+  def test_new_instances_will_pass_args_to_newtest_new_instances_will_pass_args_to_new
77,1628
+  def test_new_gets_block_after_restubbingtest_new_gets_block_after_restubbing
90,2034
+  def test_new_instances_stub_verification_happens_on_teardowntest_new_instances_stub_verification_happens_on_teardown
103,2359
+  def test_new_instances_reports_error_on_non_classestest_new_instances_reports_error_on_non_classes
113,2722
+  def test_can_stub_objects_created_with_allocate_instead_of_newtest_can_stub_objects_created_with_allocate_instead_of_new
123,3004
+  def test_can_stub_objects_created_with_arbitrary_class_methodstest_can_stub_objects_created_with_arbitrary_class_methods
131,3236
+  def test_stubbing_arbitrary_class_methods_leaves_new_alonetest_stubbing_arbitrary_class_methods_leaves_new_alone
138,3461
+  def test_stubbing_new_and_allocate_doesnt_double_stub_objects_on_newtest_stubbing_new_and_allocate_doesnt_double_stub_objects_on_new
145,3676
+  def test_stubbing_new_and_allocate_doesnt_double_stub_objects_on_allocatetest_stubbing_new_and_allocate_doesnt_double_stub_objects_on_allocate
154,3878
+  def test_blocks_on_new_do_not_have_stubs_installedtest_blocks_on_new_do_not_have_stubs_installed
167,4345
+  def test_new_instances_accept_chained_expectationstest_new_instances_accept_chained_expectations
181,4685
+  def test_fancy_use_of_chained_should_receivedtest_fancy_use_of_chained_should_received
189,4957
+  def test_writable_accessorstest_writable_accessors
194,5114
+  def test_ordering_can_be_specifiedtest_ordering_can_be_specified
200,5261
+  def test_ordering_can_be_specified_in_groupstest_ordering_can_be_specified_in_groups
208,5457
+  def redirect_errorredirect_error
218,5752
+
+test/test_partial_mock.rb,3046
+class TestStubbing < Test::Unit::TestCaseTestStubbing
16,372
+  class DogDog
19,446
+    def barkbark
20,458
+    def Dog.createcreate
23,491
+  def test_stub_command_add_behavior_to_arbitrary_objectstest_stub_command_add_behavior_to_arbitrary_objects
28,540
+  def test_stub_command_can_configure_via_blocktest_stub_command_can_configure_via_block
34,726
+  def test_stubbed_methods_can_take_blockstest_stubbed_methods_can_take_blocks
42,925
+  def test_multiple_stubs_on_the_same_object_reuse_the_same_partial_mocktest_multiple_stubs_on_the_same_object_reuse_the_same_partial_mock
49,1152
+  def test_multiple_methods_can_be_stubbedtest_multiple_methods_can_be_stubbed
54,1301
+  def test_original_behavior_can_be_restoredtest_original_behavior_can_be_restored
62,1555
+  def test_original_missing_behavior_can_be_restoredtest_original_missing_behavior_can_be_restored
72,1888
+  def test_multiple_stubs_on_single_method_can_be_restored_missing_methodtest_multiple_stubs_on_single_method_can_be_restored_missing_method
81,2163
+  def test_original_behavior_is_restored_when_multiple_methods_are_mockedtest_original_behavior_is_restored_when_multiple_methods_are_mocked
92,2570
+  def test_original_behavior_is_restored_on_class_objectstest_original_behavior_is_restored_on_class_objects
101,2895
+  def test_original_behavior_is_restored_on_singleton_methodstest_original_behavior_is_restored_on_singleton_methods
108,3142
+    def obj.hi() :hello endhi
110,3225
+  def test_original_behavior_is_restored_on_singleton_methods_with_multiple_stubstest_original_behavior_is_restored_on_singleton_methods_with_multiple_stubs
118,3417
+    def obj.hi(n) "hello#{n}" endhi
120,3520
+  def test_original_behavior_is_restored_on_nonsingleton_methods_with_multiple_stubstest_original_behavior_is_restored_on_nonsingleton_methods_with_multiple_stubs
130,3837
+  def test_stubbing_file_shouldnt_break_writingtest_stubbing_file_shouldnt_break_writing
146,4327
+  def test_original_behavior_is_restored_even_when_errorstest_original_behavior_is_restored_even_when_errors
162,4762
+    def m.mock_verify() endmock_verify
170,5073
+  def test_not_calling_stubbed_method_is_an_errortest_not_calling_stubbed_method_is_an_error
173,5108
+  def test_mock_is_verified_when_the_stub_is_verifiedtest_mock_is_verified_when_the_stub_is_verified
182,5333
+  def test_stub_can_have_explicit_nametest_stub_can_have_explicit_name
191,5599
+  def test_unamed_stub_will_use_default_naming_conventiontest_unamed_stub_will_use_default_naming_convention
197,5766
+  def test_partials_can_be_defined_in_a_blocktest_partials_can_be_defined_in_a_block
203,5950
+  def test_partials_defining_block_return_real_obj_not_proxytest_partials_defining_block_return_real_obj_not_proxy
211,6137
+  class LiarLiar
218,6331
+    def respond_to?(method_name)respond_to?
219,6344
+  def test_liar_actually_liestest_liar_actually_lies
229,6513
+  def test_partial_mock_where_respond_to_is_true_yet_method_is_not_theretest_partial_mock_where_respond_to_is_true_yet_method_is_not_there
234,6612
+
+test/test_record_mode.rb,1428
+module FailureAssertionFailureAssertion
15,366
+  def assert_failsassert_fails
17,402
+class TestRecordMode < Test::Unit::TestCaseTestRecordMode
24,513
+  def test_recording_mode_workstest_recording_mode_works
28,623
+  def test_arguments_are_passed_to_recording_mode_blocktest_arguments_are_passed_to_recording_mode_block
37,815
+  def test_recording_mode_handles_multiple_returnstest_recording_mode_handles_multiple_returns
49,1109
+  def test_recording_mode_does_not_specify_ordertest_recording_mode_does_not_specify_order
60,1376
+  def test_recording_mode_gets_block_args_tootest_recording_mode_gets_block_args_too
71,1622
+  def test_recording_mode_should_validate_args_with_equalstest_recording_mode_should_validate_args_with_equals
84,1934
+  def test_recording_mode_should_allow_arg_contraint_validationtest_recording_mode_should_allow_arg_contraint_validation
95,2167
+  def test_recording_mode_should_handle_multiplicity_contraintstest_recording_mode_should_handle_multiplicity_contraints
106,2405
+  def test_strict_record_mode_requires_exact_argument_matchestest_strict_record_mode_requires_exact_argument_matches
118,2670
+  def test_strict_record_mode_requires_exact_orderingtest_strict_record_mode_requires_exact_ordering
130,2948
+  def test_strict_record_mode_requires_oncetest_strict_record_mode_requires_once
144,3251
+  def test_strict_record_mode_can_not_failtest_strict_record_mode_can_not_fail
157,3524
+
+test/test_samples.rb,142
+class TestSamples < Test::Unit::TestCaseTestSamples
17,378
+  def test_file_iotest_file_io
25,748
+  def count_lines(file)count_lines
33,999
+
+test/test_should_receive.rb,6840
+def mock_top_level_functionmock_top_level_function
15,352
+module KernelKernel
20,394
+  def mock_kernel_functionmock_kernel_function
21,408
+class TestFlexMockShoulds < Test::Unit::TestCaseTestFlexMockShoulds
26,455
+  def test_defaultstest_defaults
35,871
+  def test_returns_with_valuetest_returns_with_value
44,1039
+  def test_returns_with_multiple_valuestest_returns_with_multiple_values
52,1208
+  def test_returns_with_blocktest_returns_with_block
63,1468
+  def test_and_returns_aliastest_and_returns_alias
72,1671
+  class MyError < RuntimeErrorMyError
79,1808
+  def test_and_raises_with_exception_class_throws_exceptiontest_and_raises_with_exception_class_throws_exception
82,1846
+  def test_and_raises_with_arguments_throws_exception_made_with_argstest_and_raises_with_arguments_throws_exception_made_with_args
91,2055
+  def test_and_raises_with_a_specific_exception_throws_the_exceptiontest_and_raises_with_a_specific_exception_throws_the_exception
101,2336
+  def test_raises_is_an_alias_for_and_raisetest_raises_is_an_alias_for_and_raise
112,2606
+  def test_multiple_expectationstest_multiple_expectations
121,2811
+  def test_with_no_args_with_no_argstest_with_no_args_with_no_args
131,3048
+  def test__with_no_args_but_with_argstest__with_no_args_but_with_args
138,3176
+  def test_with_any_argstest_with_any_args
147,3376
+  def test_with_any_single_arg_matchingtest_with_any_single_arg_matching
157,3554
+  def test_with_any_single_arg_nonmatchingtest_with_any_single_arg_nonmatching
165,3747
+  def test_with_equal_arg_matchingtest_with_equal_arg_matching
175,3982
+  def test_with_equal_arg_nonmatchingtest_with_equal_arg_nonmatching
182,4145
+  def test_with_arbitrary_arg_matchingtest_with_arbitrary_arg_matching
191,4382
+  def test_args_matching_with_regextest_args_matching_with_regex
206,4802
+  def test_arg_matching_with_regex_matching_non_stringtest_arg_matching_with_regex_matching_non_string
218,5129
+  def test_arg_matching_with_classtest_arg_matching_with_class
225,5306
+  def test_arg_matching_with_no_matchtest_arg_matching_with_no_match
236,5596
+  def test_arg_matching_with_string_doesnt_over_matchtest_arg_matching_with_string_doesnt_over_match
245,5809
+  def test_block_arg_given_to_no_argstest_block_arg_given_to_no_args
254,6028
+  def test_block_arg_given_to_matching_proctest_block_arg_given_to_matching_proc
263,6232
+  def test_arg_matching_precedence_when_best_firsttest_arg_matching_precedence_when_best_first
274,6517
+  def test_arg_matching_precedence_when_best_last_but_still_matches_firsttest_arg_matching_precedence_when_best_last_but_still_matches_first
282,6726
+  def test_never_and_never_calledtest_never_and_never_called
290,6958
+  def test_never_and_called_oncetest_never_and_called_once
296,7073
+  def test_once_called_oncetest_once_called_once
305,7269
+  def test_once_but_never_calledtest_once_but_never_called
312,7403
+  def test_once_but_called_twicetest_once_but_called_twice
320,7590
+  def test_twice_and_called_twicetest_twice_and_called_twice
330,7809
+  def test_zero_or_more_called_zerotest_zero_or_more_called_zero
338,7964
+  def test_zero_or_more_called_oncetest_zero_or_more_called_once
344,8086
+  def test_zero_or_more_called_100test_zero_or_more_called_100
351,8219
+  def test_timestest_times
358,8365
+  def test_at_least_called_oncetest_at_least_called_once
365,8506
+  def test_at_least_but_never_calledtest_at_least_but_never_called
372,8653
+  def test_at_least_once_but_called_twicetest_at_least_once_but_called_twice
380,8856
+  def test_at_least_and_exacttest_at_least_and_exact
388,9027
+  def test_at_most_but_never_calledtest_at_most_but_never_called
398,9257
+  def test_at_most_called_oncetest_at_most_called_once
404,9393
+  def test_at_most_called_twicetest_at_most_called_twice
411,9538
+  def test_at_most_and_at_least_called_nevertest_at_most_and_at_least_called_never
421,9766
+  def test_at_most_and_at_least_called_oncetest_at_most_and_at_least_called_once
429,9991
+  def test_at_most_and_at_least_called_twicetest_at_most_and_at_least_called_twice
436,10164
+  def test_at_most_and_at_least_called_three_timestest_at_most_and_at_least_called_three_times
444,10352
+  def test_call_counts_only_apply_to_matching_argstest_call_counts_only_apply_to_matching_args
455,10630
+  def test_call_counts_only_apply_to_matching_args_with_mismatchtest_call_counts_only_apply_to_matching_args_with_mismatch
467,10908
+  def test_ordered_calls_in_ordertest_ordered_calls_in_order
483,11341
+  def test_ordered_calls_out_of_ordertest_ordered_calls_out_of_order
493,11513
+  def test_order_calls_with_different_arg_lists_and_in_ordertest_order_calls_with_different_arg_lists_and_in_order
505,11764
+  def test_order_calls_with_different_arg_lists_and_out_of_ordertest_order_calls_with_different_arg_lists_and_out_of_order
515,12007
+  def test_unordered_calls_do_not_effect_ordered_testingtest_unordered_calls_do_not_effect_ordered_testing
527,12323
+  def test_ordered_with_multiple_calls_is_oktest_ordered_with_multiple_calls_is_ok
541,12593
+  def test_grouped_ordering_with_numberstest_grouped_ordering_with_numbers
553,12804
+  def test_grouped_ordering_with_symbolstest_grouped_ordering_with_symbols
568,13125
+  def test_explicit_ordering_mixed_with_implicit_ordering_should_not_overlaptest_explicit_ordering_mixed_with_implicit_ordering_should_not_overlap
583,13487
+  def test_explicit_ordering_with_explicit_misorderstest_explicit_ordering_with_explicit_misorders
593,13860
+  def test_ordering_with_explicit_no_args_matches_correctlytest_ordering_with_explicit_no_args_matches_correctly
609,14391
+  def test_ordering_with_any_arg_matching_correctly_matchestest_ordering_with_any_arg_matching_correctly_matches
621,14768
+  def test_expectation_formatingtest_expectation_formating
632,15082
+  def test_multi_expectation_formattingtest_multi_expectation_formatting
637,15266
+  def test_explicit_ordering_with_limits_allow_multiple_return_valuestest_explicit_ordering_with_limits_allow_multiple_return_values
642,15409
+  def test_global_methods_can_be_mockedtest_global_methods_can_be_mocked
661,16120
+  def test_kernel_methods_can_be_mockedtest_kernel_methods_can_be_mocked
667,16308
+  def test_undefing_kernel_methods_dont_effect_other_mockstest_undefing_kernel_methods_dont_effect_other_mocks
673,16490
+  def assert_failure(message=nil)assert_failure
684,16920
+class TestFlexMockShouldsWithInclude < Test::Unit::TestCaseTestFlexMockShouldsWithInclude
698,17270
+  def test_include_enables_unqualified_arg_type_referencestest_include_enables_unqualified_arg_type_references
700,17364
+class TestFlexMockArgTypesDontLeak < Test::Unit::TestCaseTestFlexMockArgTypesDontLeak
708,17528
+  def test_unqualified_arg_type_references_are_undefined_by_defaulttest_unqualified_arg_type_references_are_undefined_by_default
709,17586
+
+test/test_tu_integration.rb,1570
+class TestTuIntegrationFlexMockMethod < Test::Unit::TestCaseTestTuIntegrationFlexMockMethod
15,352
+  def test_can_construct_flexmocktest_can_construct_flexmock
18,445
+  def test_can_construct_flexmock_with_blocktest_can_construct_flexmock_with_block
24,594
+class TestTuIntegrationMockVerificationInTeardown < Test::Unit::TestCaseTestTuIntegrationMockVerificationInTeardown
32,770
+  def teardownteardown
35,873
+  def test_mock_verification_occurs_during_teardowntest_mock_verification_occurs_during_teardown
41,969
+class TestTuIntegrationMockVerificationWithoutSetup < Test::Unit::TestCaseTestTuIntegrationMockVerificationWithoutSetup
46,1087
+  def teardownteardown
49,1192
+  def test_mock_verification_occurs_during_teardowntest_mock_verification_occurs_during_teardown
55,1288
+class TestTuIntegrationMockVerificationForgetfulSetup < Test::Unit::TestCaseTestTuIntegrationMockVerificationForgetfulSetup
60,1406
+  def teardownteardown
63,1513
+  def test_mock_verification_occurs_during_teardowntest_mock_verification_occurs_during_teardown
69,1609
+class TestTuIntegrationSetupOverridenAndNoMocksOk < Test::Unit::TestCaseTestTuIntegrationSetupOverridenAndNoMocksOk
74,1727
+  def test_mock_verification_occurs_during_teardowntest_mock_verification_occurs_during_teardown
77,1830
+class TestTuIntegrationFailurePreventsVerification < Test::Unit::TestCaseTestTuIntegrationFailurePreventsVerification
81,1893
+  def test_mock_verification_occurs_during_teardowntest_mock_verification_occurs_during_teardown
84,1997
+  def simulate_failuresimulate_failure
91,2131
+
+test/rspec_integration/integration_spec.rb,0
+
+test/test_unit_integration/test_auto_test_unit.rb,263
+class TestFlexmockTestUnit < Test::Unit::TestCaseTestFlexmockTestUnit
17,387
+  def teardownteardown
18,437
+  def test_can_create_mockstest_can_create_mocks
23,496
+  def test_should_fail__mocks_are_auto_verifiedtest_should_fail__mocks_are_auto_verified
30,641

data/doc/releases/flexmock-0.6.3.rdoc

@@ -0,0 +1,111 @@
+= FlexMock 0.6.2 Released
+
+FlexMock is a flexible mocking library for use in unit testing and behavior
+specification in Ruby. Version 0.6.2 introduces a two minor enhancements.
+
+== New in 0.6.3
+
+* Added the flexmodel() method for better support when mocking
+  ActiveRecord objects.  flexmodel(YourModelClass) will return a pure
+  mock object that responds to some basic ActiveRecord methods with
+  reasonable defaults.  The flexmodel() method is optional and you
+  need to require 'flexmock/activerecord' to active it.
+
+* The flexmock() method now _always_ returns a combination domain
+  object / mock object.  This means the object return can handle
+  domain methods and mock-specific methods (such as should_receive and
+  mock_teardown).
+
+* A side effect of always returning a domain/mock object is that
+  partial mocks are now enhanced with about 5 or 6 extra methods.
+  Since partial mocks are real objects with just a few methods mocked,
+  there is a (small) potential for a method name conflict.  FlexMock
+  now supports a safe-mode for partial mocks if this is an issue in
+  particular case (see the RDoc README file for more details).
+
+* Fixed a small bug where attempting to mock a method that the partial
+  mock claims to respond to, but doesn't actually have defined would
+  cause an error.  This tended to happen on active record objects
+  where attributes are dynamically handled.
+
+== 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 makes creating these test objects easy.
+
+=== Features
+
+* Easy integration with both Test::Unit and RSpec. Mocks created with the
+  flexmock method are automatically verified at the end of the test or
+  example.
+
+* A fluent interface that allows mock behavior to be specified very
+  easily.
+
+* A "record mode" where an existing implementation can record its
+  interaction with a mock for later validation against a new
+  implementation.
+
+* Easy mocking of individual methods in existing, non-mock objects.
+
+* The ability to cause classes to instantiate test instances (instead of real
+  instances) for the duration of a test.
+
+=== Example
+
+Suppose you had a Dog object that wagged a tail when it was happy.
+Something like this:
+
+  class Dog
+    def initialize(a_tail)
+      @tail = a_tail
+    end
+    def happy
+      @tail.wag
+    end
+  end
+
+To test the +Dog+ class without a real +Tail+ object (perhaps because
+real +Tail+ objects activate servos in some robotic equipment), you
+can do something like this:
+
+require 'test/unit'
+require 'flexmock/test_unit'
+
+  class TestDog < Test::Unit::TestCase
+    def test_dog_wags_tail_when_happy
+      tail = flexmock("tail")
+      tail.should_receive(:wag).once
+      dog = Dog.new(tail)
+      dog.happy
+    end
+  end
+
+FlexMock will automatically verify that the mocked tail object received the
+message +wag+ exactly one time. If it doesn't, the test will not pass.
+
+See the FlexMock documentation at http://flexmock.rubyforge.org for details on
+specifying arguments and return values on mocked methods, as well as a simple
+technique for mocking tail objects when the Dog class creates the tail objects
+directly.
+
+== Availability
+
+You can make sure you have the latest version with a quick RubyGems command:
+
+  gem install flexmock    (you may need root/admin privileges)
+
+Otherwise, you can get it from the more traditional places:
+
+Download::  http://rubyforge.org/project/showfiles.php?group_id=170
+
+You will find documentation at: http://flexmock.rubyforge.org.
+
+-- Jim Weirich
+

data/lib/flexmock/activerecord.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+
+require 'flexmock'
+
+class FlexMock
+  module MockContainer
+    def MockContainer.next_id
+      @id_counter ||= 0
+      @id_counter += 1
+    end
+
+    def flexmodel(model_class, *args, &block)
+      id = MockContainer.next_id
+      mock = flexmock("#{model_class}_#{id}", *args, &block)
+      mock.should_receive(
+        :id => id,
+        :to_params => id.to_s,
+        :new_record? => false,
+        :errors => flexmock("errors", :count => 0), 
+        :class => model_class)
+      mock.should_receive(:is_a?).with(any).and_return { |other|
+        other == model_class
+      }
+      mock
+    end
+  end
+end

data/lib/flexmock/core.rb

@@ -42,6 +42,11 @@ require 'flexmock/composite'
 # call +super+.
 #
 class FlexMock
+
+  # Error raised when flexmock is used incorrectly.
+  class UsageError < RuntimeError
+  end
+
   attr_reader :mock_name, :mock_groups
   attr_accessor :mock_current_order, :mock_container
 
@@ -202,4 +207,4 @@ class FlexMock
   end
 end
 
-require 'flexmock/core_class_methods'
+require 'flexmock/core_class_methods'

data/lib/flexmock/mock_container.rb

@@ -113,10 +113,11 @@ class FlexMock
       name = nil
       quick_defs = {}
       domain_obj = nil
+      safe_mode = false
       while ! args.empty?
         case args.first
-        when :base
-          args.shift
+        when :base, :safe
+          safe_mode = (args.shift == :safe)
           domain_obj = args.shift
         when String, Symbol
           name = args.shift.to_s
@@ -126,8 +127,10 @@ class FlexMock
           domain_obj = args.shift
         end
       end
+      raise UsageError, "a block is required in safe mode" if safe_mode && ! block_given?
+
       if domain_obj
-        mock = flexmock_make_partial_proxy(domain_obj, name)
+        mock = flexmock_make_partial_proxy(domain_obj, name, safe_mode)
       else
         mock = FlexMock.new(name || "unknown")
         domain_obj = mock
@@ -136,17 +139,18 @@ class FlexMock
       yield(mock) if block_given?
       flexmock_remember(mock)
       block_given? ? domain_obj : mock
+      domain_obj
     end
     alias flexstub flexmock
     
     private
     
-    # Create a PartialMock for the given object.  Use +name+ as the name 
-    # of the mock object.
-    def flexmock_make_partial_proxy(obj, name)
+    # Create a PartialMockProxy for the given object.  Use +name+ as
+    # the name of the mock object.
+    def flexmock_make_partial_proxy(obj, name, safe_mode)
       name ||= "flexmock(#{obj.class.to_s})"
       obj.instance_eval {
-        @flexmock_proxy ||= PartialMock.new(obj, FlexMock.new(name))
+        @flexmock_proxy ||= PartialMockProxy.new(obj, FlexMock.new(name), safe_mode)
       }
       obj.instance_variable_get("@flexmock_proxy")
     end

data/lib/flexmock/partial_mock.rb

@@ -14,20 +14,29 @@ require 'flexmock/noop'
 class FlexMock
   
   # #########################################################################
-  # PartialMock is used to mate the mock framework to an existing object.  The
-  # object is "enhanced" with a reference to a mock object (stored in
-  # <tt>@flexmock_mock</tt>).  When the +should_receive+ method is sent to the
-  # proxy, it overrides the existing object's method by creating  singleton
-  # method that forwards to the mock.  When testing is complete, PartialMock
-  # will erase the mocking infrastructure from the object being mocked (e.g.
-  # remove instance variables and mock singleton methods).
+  # PartialMockProxy is used to mate the mock framework to an existing
+  # object.  The object is "enhanced" with a reference to a mock
+  # object (stored in <tt>@flexmock_mock</tt>).  When the
+  # +should_receive+ method is sent to the proxy, it overrides the
+  # existing object's method by creating singleton method that
+  # forwards to the mock.  When testing is complete, PartialMockProxy
+  # will erase the mocking infrastructure from the object being mocked
+  # (e.g.  remove instance variables and mock singleton methods).
   #
-  class PartialMock
+  class PartialMockProxy
     attr_reader :mock, :mock_groups
     attr_accessor :mock_current_order, :mock_container
 
-    # Initialize a PartialMock object.
-    def initialize(obj, mock)
+    # The following methods are added to partial mocks so that they
+    # can act like a mock.
+    
+    MOCK_METHODS = [
+      :should_receive, :new_instances, :any_instance,
+      :mock,           :mock_teardown, :mock_verify
+    ]
+
+    # Initialize a PartialMockProxy object.
+    def initialize(obj, mock, safe_mode)
       @obj = obj
       @mock = mock
       @method_definitions = {}
@@ -35,6 +44,11 @@ class FlexMock
       @allocated_order = 0
       @mock_current_order = 0
       @mock_groups = {}
+      unless safe_mode
+        MOCK_METHODS.each do |sym|
+          add_mock_method(@obj, sym)
+        end
+      end
     end
 
     # :call-seq:
@@ -61,7 +75,6 @@ class FlexMock
       FlexMock.should_receive(args) do |sym|
         unless @methods_proxied.include?(sym)
           hide_existing_method(sym)
-          @methods_proxied << sym
         end
         ex = @mock.should_receive(sym)
         ex.mock = self
@@ -69,6 +82,15 @@ class FlexMock
       end
     end
 
+    def add_mock_method(obj, method_name)
+      stow_existing_definition(method_name)
+      eval %{
+        def obj.#{method_name}(*args, &block)
+          @flexmock_proxy.#{method_name}(*args, &block)
+        end
+      }
+    end
+
     # :call-seq:
     #   new_instances.should_receive(...)
     #   new_instances { |instance|  instance.should_receive(...) }
@@ -146,7 +168,7 @@ class FlexMock
       class << @obj; self; end
     end
 
-    # Is the current method a singleton method in the object we are
+    # Is the given method name a singleton method in the object we are
     # mocking?
     def singleton?(method_name)
       @obj.methods(false).include?(method_name.to_s)
@@ -159,13 +181,16 @@ class FlexMock
     # not a singleton, all we need to do is override it with our own
     # singleton.
     def hide_existing_method(method_name)
-      if @obj.respond_to?(method_name)
-        new_alias = new_name(method_name)
-        unless @obj.respond_to?(new_alias)
-          sclass.class_eval do
-            alias_method(new_alias, method_name)
-          end
-        end
+      stow_existing_definition(method_name)
+      define_proxy_method(method_name)
+    end
+
+    # Stow the existing method definition so that it can be recovered
+    # later.
+    def stow_existing_definition(method_name)
+      @methods_proxied << method_name
+      new_alias = create_alias_for_existing_method(method_name)
+      if new_alias
         my_object = @obj
         @method_definitions[method_name] = Proc.new { |*args|
           block = nil
@@ -177,7 +202,24 @@ class FlexMock
         }
       end
       remove_current_method(method_name) if singleton?(method_name)
-      define_proxy_method(method_name)
+    end
+
+    # Create an alias for the existing +method_name+.  Returns the new
+    # alias name.  If the aliasing process fails (because the method
+    # doesn't really exist, then return nil.
+    def create_alias_for_existing_method(method_name)
+      begin
+        new_alias = new_name(method_name)
+        unless @obj.respond_to?(new_alias)
+          sclass.class_eval do
+            alias_method(new_alias, method_name)
+          end
+        end
+        new_alias
+      rescue NameError => ex
+        # Alias attempt failed
+        nil
+      end
     end
 
     # Define a proxy method that forwards to our mock object.  The
@@ -185,17 +227,20 @@ class FlexMock
     # being mocked.
     def define_proxy_method(method_name)
       if method_name.to_s =~ /=$/
+        eval_line = __LINE__ + 1
         sclass.class_eval %{
           def #{method_name}(*args, &block)
             @flexmock_proxy.mock.__send__(:#{method_name}, *args, &block) 
           end
-        }
+        }, __FILE__, eval_line
       else
+        eval_line = __LINE__ + 1
         sclass.class_eval %{
           def #{method_name}(*args, &block)
             @flexmock_proxy.mock.#{method_name}(*args, &block) 
           end
-        }
+        }, __FILE__, eval_line
+        make_rcov_recognize_the_above_eval_is_covered = true
       end
     end
 

data/test/rspec_integration/integration_spec.rb

@@ -33,4 +33,4 @@ context "FlexMock in a RSpec example" do
   specify "Should show an example failure" do
     1.should == 2
   end
-end
+end

data/test/test_container_methods.rb

@@ -102,7 +102,7 @@ class TestFlexmockContainerMethods < Test::Unit::TestCase
     assert_equal 2, s.length
   end
   
-  def test_multiple_stubs_work_with_same_PartialMock
+  def test_multiple_stubs_work_with_same_partial_mock_proxy
     obj = Object.new
     mock1 = flexmock(obj)
     mock2 = flexmock(obj)
@@ -116,4 +116,4 @@ class TestFlexmockContainerMethods < Test::Unit::TestCase
     assert_equal :lo, obj.hi
     assert_equal :low, obj.high
   end
-end
+end

data/test/test_extended_should_receive.rb

@@ -58,7 +58,7 @@ class TestExtendedShouldReceiveOnFullMocks < Test::Unit::TestCase
 
 end
 
-class TestExtendedShouldReceiveOnPartialMocks < Test::Unit::TestCase
+class TestExtendedShouldReceiveOnPartialMockProxies < Test::Unit::TestCase
   include FlexMock::TestCase
   include ExtendedShouldReceiveTests
   

data/test/test_flexmodel.rb

@@ -0,0 +1,40 @@
+#!/usr/bin/env ruby
+
+require 'test/unit'
+require 'flexmock/activerecord'
+
+class DummyModel
+end
+
+######################################################################
+class TestFlexModel < Test::Unit::TestCase
+  include FlexMock::TestCase
+
+  def test_initial_conditions
+    model = flexmodel(DummyModel)
+    assert_match(/^DummyModel_\d+/, model.mock_name)
+    assert_equal model.id.to_s, model.to_params
+    assert ! model.new_record?
+    assert model.is_a?(DummyModel)
+    assert_equal DummyModel, model.class
+  end
+
+  def test_mock_models_have_different_ids
+    m1 = flexmodel(DummyModel)
+    m2 = flexmodel(DummyModel)
+    assert m2.id != m1.id
+  end
+
+  def test_mock_models_can_have_quick_defs
+    model = flexmodel(DummyModel, :xyzzy => :ok)
+    assert_equal :ok, model.xyzzy
+  end
+
+  def test_mock_models_can_have_blocks
+    model = flexmodel(DummyModel) do |m|
+      m.should_receive(:xyzzy => :okdokay)
+    end
+    assert_equal :okdokay, model.xyzzy
+  end
+end
+

data/test/test_partial_mock.rb

@@ -214,5 +214,101 @@ class TestStubbing < Test::Unit::TestCase
     end
     assert_equal :growl, dog.bark
   end
+
+  def test_partial_mocks_always_return_domain_object
+    dog = Dog.new
+    assert_equal dog, flexmock(dog)
+    assert_equal dog, flexmock(dog) { }
+  end
+
+  MOCK_METHOD_SUBSET = [
+    :should_receive, :new_instances,
+    :mock, :mock_teardown, :mock_verify,
+  ]
+
+  def test_domain_objects_do_not_have_mock_methods
+    dog = Dog.new
+    MOCK_METHOD_SUBSET.each do |sym|
+      assert ! dog.respond_to?(sym), "should not have :#{sym} defined"
+    end
+  end
+
+  def test_partial_mocks_have_mock_methods
+    dog = Dog.new
+    flexmock(dog)
+    MOCK_METHOD_SUBSET.each do |sym|
+      assert dog.respond_to?(sym), "should have :#{sym} defined"
+    end
+  end
+
+  def test_partial_mocks_do_not_have_mock_methods_after_teardown
+    dog = Dog.new
+    flexmock(dog)
+    dog.mock_teardown
+    MOCK_METHOD_SUBSET.each do |sym|
+      assert ! dog.respond_to?(sym), "should not have :#{sym} defined"
+    end
+  end
+
+  def test_partial_mocks_with_mock_method_singleton_colision_have_original_defs_restored
+    dog = Dog.new
+    def dog.mock() :original end
+    flexmock(dog)
+    dog.mock_teardown
+    assert_equal :original, dog.mock
+  end
+
+  class MockColision
+    def mock
+      :original
+    end
+  end
+
+  def test_partial_mocks_with_mock_method_non_singleton_colision_have_original_defs_restored
+    mc = MockColision.new
+    flexmock(mc)
+    mc.mock_teardown
+    assert_equal :original, mc.mock
+  end
+
+  def test_safe_partial_mocks_do_not_support_mock_methods
+    dog = Dog.new
+    flexmock(:safe, dog) { }
+    MOCK_METHOD_SUBSET.each do |sym|
+      assert ! dog.respond_to?(sym), "should not have :#{sym} defined"
+    end
+  end
+
+  def test_safe_partial_mocks_require_block
+    dog = Dog.new
+    ex = assert_raise(FlexMock::UsageError) { flexmock(:safe, dog) }
+  end
+
+  def test_safe_partial_mocks_are_actually_mocked
+    dog = flexmock(:safe, Dog.new) { |m| m.should_receive(:bark => :mocked) }
+    assert_equal :mocked, dog.bark
+  end
+
+  class Liar
+    def respond_to?(method_name)
+      sym = method_name.to_sym
+      if sym == :not_defined
+        true
+      else
+        super(method_name)
+      end
+    end
+  end
+
+  def test_liar_actually_lies
+    liar = Liar.new
+    assert liar.respond_to?(:not_defined)
+  end
+
+  def test_partial_mock_where_respond_to_is_true_yet_method_is_not_there
+    liar = Liar.new
+    flexmock(liar, :not_defined => :xyzzy)
+    assert_equal :xyzzy, liar.not_defined
+  end
   
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.1
 specification_version: 1
 name: flexmock
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
-date: 2007-06-27 00:00:00 -04:00
+  version: 0.6.3
+date: 2007-08-16 00:00:00 -04:00
 summary: Simple and Flexible Mock Objects for Testing
 require_paths: 
 - lib
@@ -29,10 +29,12 @@ post_install_message:
 authors: 
 - Jim Weirich
 files: 
-- CHANGELOG
+- CHANGES
 - Rakefile
 - README
+- TAGS
 - lib/flexmock.rb
+- lib/flexmock/activerecord.rb
 - lib/flexmock/argument_matchers.rb
 - lib/flexmock/argument_types.rb
 - lib/flexmock/base.rb
@@ -54,6 +56,7 @@ files:
 - test/test_default_framework_adapter.rb
 - test/test_example.rb
 - test/test_extended_should_receive.rb
+- test/test_flexmodel.rb
 - test/test_mock.rb
 - test/test_naming.rb
 - test/test_new_instances.rb
@@ -76,6 +79,7 @@ files:
 - doc/releases/flexmock-0.6.0.rdoc
 - doc/releases/flexmock-0.6.1.rdoc
 - doc/releases/flexmock-0.6.2.rdoc
+- doc/releases/flexmock-0.6.3.rdoc
 test_files: []
 
 rdoc_options: 
@@ -86,7 +90,7 @@ rdoc_options:
 - --line-numbers
 extra_rdoc_files: 
 - README
-- CHANGELOG
+- CHANGES
 - doc/GoogleExample.rdoc
 - doc/releases/flexmock-0.4.0.rdoc
 - doc/releases/flexmock-0.4.1.rdoc
@@ -97,6 +101,7 @@ extra_rdoc_files:
 - doc/releases/flexmock-0.6.0.rdoc
 - doc/releases/flexmock-0.6.1.rdoc
 - doc/releases/flexmock-0.6.2.rdoc
+- doc/releases/flexmock-0.6.3.rdoc
 executables: []
 
 extensions: []