flexmock 0.8.0 → 0.8.1

data/CHANGES

@@ -1,5 +1,11 @@
 = Changes for FlexMock
 
+== Pre-Version 0.8.1
+
+* Added Joe O'Brien's patch to allow view stubbing in Rails 2.0
+* Added Evan Phoenix's patch to remove allocate from default
+  allocators in new_instances (for Rubinius compatibility).
+
 == Version 0.8.0
 
 * Added by_default

data/README

@@ -3,7 +3,7 @@ examples= Flex Mock -- Making Mock Easy
 FlexMock is a simple, but flexible, mock object library for Ruby unit
 testing.
 
-Version :: 0.8.0
+Version :: 0.8.1
 
 = Links
 

data/Rakefile

@@ -19,7 +19,7 @@ require 'rake/contrib/rubyforgepublisher'
 CLEAN.include('*.tmp')
 CLOBBER.include("html", 'pkg')
 
-PKG_VERSION = '0.8.0'
+PKG_VERSION = '0.8.1'
 
 PKG_FILES = FileList[
   '[A-Z]*',

data/TAGS

@@ -1,12 +1,10 @@
 
-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
+install.rb,29
+def indir(newdir)indir
7,68
 
 lib/flexmock/argument_matchers.rb,424
 class FlexMockFlexMock
14,338
@@ -34,23 +32,24 @@ lib/flexmock/base.rb,0
 lib/flexmock/composite.rb,30
 class FlexMockFlexMock
8,133
 
-lib/flexmock/core.rb,857
+lib/flexmock/core.rb,900
 class FlexMockFlexMock
46,1290
   def initialize(name="unknown", container=nil)initialize
55,1560
   def inspectinspect
65,1854
   def flexmock_verifyflexmock_verify
71,2014
   def flexmock_teardownflexmock_teardown
82,2255
   def should_ignore_missingshould_ignore_missing
86,2335
-  def method_missing(sym, *args, &block)method_missing
92,2510
-  def respond_to?(sym)respond_to?
109,2982
-  def flexmock_find_expectation(method_name, *args) # :nodoc:flexmock_find_expectation
114,3131
-  def flexmock_expectations_for(method_name) # :nodoc:flexmock_expectations_for
120,3336
-  def method(sym)method
125,3495
-  def should_receive(*args)should_receive
154,4534
-  def should_expectshould_expect
176,5237
-  def flexmock_wrap(&block)flexmock_wrap
184,5427
-  def override_existing_method(sym)override_existing_method
198,5986
-  def sclasssclass
207,6206
+  def by_defaultby_default
91,2447
+  def method_missing(sym, *args, &block)method_missing
97,2576
+  def respond_to?(sym, *args)respond_to?
114,3048
+  def flexmock_find_expectation(method_name, *args) # :nodoc:flexmock_find_expectation
119,3204
+  def flexmock_expectations_for(method_name) # :nodoc:flexmock_expectations_for
125,3409
+  def method(sym)method
130,3568
+  def should_receive(*args)should_receive
159,4607
+  def should_expectshould_expect
182,5352
+  def flexmock_wrap(&block)flexmock_wrap
190,5542
+  def override_existing_method(sym)override_existing_method
204,6101
+  def sclasssclass
213,6321
 
 lib/flexmock/core_class_methods.rb,289
 class FlexMockFlexMock
15,371
@@ -91,44 +90,44 @@ class FlexMockFlexMock
14,337
     def verify_call(*args)verify_call
55,1562
     def _return_value(args) # :nodoc:_return_value
64,1782
     def return_value(args)return_value
69,1922
-    def perform_yielding(args)perform_yielding
83,2245
-    def eligible?eligible?
99,2822
-    def call_count_constrained?call_count_constrained?
104,2971
-    def validate_ordervalidate_order
109,3081
-    def flexmock_verifyflexmock_verify
121,3456
-    def match_args(args)match_args
129,3653
-    def match_arg(expected, actual)match_arg
138,3999
-    def with(*args)with
145,4228
-    def with_no_argswith_no_args
151,4362
-    def with_any_argswith_any_args
157,4495
-    def and_return(*args, &block)and_return
188,5504
-    def and_return_undefinedand_return_undefined
212,6217
-    def and_yield(*yield_values)and_yield
228,6786
-    def and_raise(exception, *args)and_raise
252,7549
-    def and_throw(sym, value=nil)and_throw
266,7914
-    def zero_or_more_timeszero_or_more_times
272,8089
-    def times(limit)times
279,8312
-    def nevernever
288,8659
-    def onceonce
295,8874
-    def twicetwice
302,9089
-    def at_leastat_least
314,9415
-    def at_mostat_most
327,9794
-    def ordered(group_name=nil)ordered
356,11063
-    def globallyglobally
368,11443
-    def define_ordered(group_name, ordering)define_ordered
374,11558
-    def by_defaultby_default
388,12056
-  class CompositeExpectationCompositeExpectation
399,12463
-    def initializeinitialize
402,12537
-    def add(expectation)add
407,12633
-    def method_missing(sym, *args, &block)method_missing
412,12774
-    def order_numberorder_number
423,13153
-    def mockmock
428,13263
-    def should_receive(*args, &block)should_receive
434,13431
-    def to_sto_s
439,13577
-  class ExpectationRecorderExpectationRecorder
453,14035
-    def initializeinitialize
456,14095
-    def method_missing(sym, *args, &block)method_missing
461,14206
-    def apply(mock)apply
469,14482
+    def perform_yielding(args)perform_yielding
83,2253
+    def eligible?eligible?
99,2839
+    def call_count_constrained?call_count_constrained?
104,2988
+    def validate_ordervalidate_order
109,3098
+    def flexmock_verifyflexmock_verify
121,3473
+    def match_args(args)match_args
129,3670
+    def match_arg(expected, actual)match_arg
138,4016
+    def with(*args)with
145,4245
+    def with_no_argswith_no_args
151,4379
+    def with_any_argswith_any_args
157,4512
+    def and_return(*args, &block)and_return
188,5521
+    def and_return_undefinedand_return_undefined
212,6239
+    def and_yield(*yield_values)and_yield
228,6808
+    def and_raise(exception, *args)and_raise
252,7571
+    def and_throw(sym, value=nil)and_throw
266,7936
+    def zero_or_more_timeszero_or_more_times
272,8111
+    def times(limit)times
279,8334
+    def nevernever
288,8681
+    def onceonce
295,8896
+    def twicetwice
302,9111
+    def at_leastat_least
314,9437
+    def at_mostat_most
327,9816
+    def ordered(group_name=nil)ordered
356,11085
+    def globallyglobally
368,11465
+    def define_ordered(group_name, ordering)define_ordered
374,11580
+    def by_defaultby_default
388,12078
+  class CompositeExpectationCompositeExpectation
399,12485
+    def initializeinitialize
402,12559
+    def add(expectation)add
407,12655
+    def method_missing(sym, *args, &block)method_missing
412,12796
+    def order_numberorder_number
423,13175
+    def mockmock
428,13285
+    def should_receive(*args, &block)should_receive
434,13453
+    def to_sto_s
439,13599
+  class ExpectationRecorderExpectationRecorder
453,14057
+    def initializeinitialize
456,14117
+    def method_missing(sym, *args, &block)method_missing
461,14228
+    def apply(mock)apply
469,14504
 
 lib/flexmock/expectation_director.rb,483
 class FlexMockFlexMock
15,363
@@ -139,7 +138,7 @@ class FlexMockFlexMock
15,363
     def find_expectation(*args) # :nodoc:find_expectation
51,1584
     def flexmock_verify         # :nodoc:flexmock_verify
59,1909
     def defaultify_expectation(exp) # :nodoc:defaultify_expectation
66,2120
-    def find_expectation_in(expectations, *args)find_expectation_in
78,2431
+    def find_expectation_in(expectations, *args)find_expectation_in
78,2401
 
 lib/flexmock/mock_container.rb,882
 class FlexMockFlexMock
15,371
@@ -153,10 +152,10 @@ class FlexMockFlexMock
15,371
     def next_idnext_id
177,6719
     def parse_should_args(mock, args, &block)  # :nodoc:parse_should_args
190,7192
     def add_model_methods(mock, model_class, id)add_model_methods
208,7705
-    def make_partial_proxy(container, obj, name, safe_mode)make_partial_proxy
229,8443
-    def build_demeter_chain(mock, arg, &block)build_demeter_chain
274,10296
-    def check_proper_mock(mock, method_name)check_proper_mock
299,11147
-    def check_method_names(names)check_method_names
309,11554
+    def make_partial_proxy(container, obj, name, safe_mode)make_partial_proxy
232,8564
+    def build_demeter_chain(mock, arg, &block)build_demeter_chain
277,10417
+    def check_proper_mock(mock, method_name)check_proper_mock
302,11268
+    def check_method_names(names)check_method_names
312,11675
 
 lib/flexmock/noop.rb,0
 
@@ -173,26 +172,36 @@ lib/flexmock/partial_mock.rb,1380
 class FlexMockFlexMock
14,337
   class PartialMockProxyPartialMockProxy
26,968
     def initialize(obj, mock, safe_mode)initialize
40,1310
-    def flexmock_getflexmock_get
53,1620
-    def should_receive(*args)should_receive
77,2560
-    def add_mock_method(obj, method_name)add_mock_method
88,2838
-    def new_instances(*allocators, &block)new_instances
114,3788
-    def invoke_original(method, args)invoke_original
132,4419
-    def flexmock_verifyflexmock_verify
140,4713
-    def flexmock_teardownflexmock_teardown
145,4849
-    def flexmock_containerflexmock_container
157,5187
-    def flexmock_container=(container)flexmock_container=
163,5382
-    def flexmock_expectations_for(method_name)flexmock_expectations_for
167,5498
-    def sclasssclass
174,5659
-    def singleton?(method_name)singleton?
180,5800
-    def hide_existing_method(method_name)hide_existing_method
190,6262
-    def stow_existing_definition(method_name)stow_existing_definition
197,6479
-    def create_alias_for_existing_method(method_name)create_alias_for_existing_method
217,7196
-    def define_proxy_method(method_name)define_proxy_method
235,7715
-    def restore_original_definition(method_name)restore_original_definition
256,8415
-    def remove_current_method(method_name)remove_current_method
268,8779
-    def detached?detached?
273,8940
-    def new_name(old_name)new_name
278,9048
+    def flexmock_getflexmock_get
55,1675
+    def should_receive(*args)should_receive
79,2615
+    def add_mock_method(obj, method_name)add_mock_method
90,2893
+    def new_instances(*allocators, &block)new_instances
118,3947
+    def invoke_original(method, args)invoke_original
139,4749
+    def flexmock_verifyflexmock_verify
147,5043
+    def flexmock_teardownflexmock_teardown
152,5179
+    def flexmock_containerflexmock_container
164,5517
+    def flexmock_container=(container)flexmock_container=
170,5712
+    def flexmock_expectations_for(method_name)flexmock_expectations_for
174,5828
+    def sclasssclass
181,5989
+    def singleton?(method_name)singleton?
187,6130
+    def hide_existing_method(method_name)hide_existing_method
197,6592
+    def stow_existing_definition(method_name)stow_existing_definition
204,6809
+    def create_alias_for_existing_method(method_name)create_alias_for_existing_method
224,7526
+    def define_proxy_method(method_name)define_proxy_method
242,8045
+    def restore_original_definition(method_name)restore_original_definition
263,8745
+    def remove_current_method(method_name)remove_current_method
275,9109
+    def detached?detached?
280,9270
+    def new_name(old_name)new_name
285,9378
+
+lib/flexmock/rails/view_mocking.rb,404
+class FlexMockFlexMock
3,20
+  module MockContainerMockContainer
4,35
+    def rails_versionrails_version
6,59
+    def should_render_view(template_name=nil)should_render_view
25,684
+    def should_render_view_prior_version_124(template_name) # :nodoc:should_render_view_prior_version_124
37,1045
+    def should_render_view_after_version_124(template_name)should_render_view_after_version_124
57,1795
+
+lib/flexmock/rails.rb,0
 
 lib/flexmock/recorder.rb,271
 class FlexMockFlexMock
14,347
@@ -246,6 +255,8 @@ class FlexMockFlexMock
14,337
   class AtMostCountValidator < CountValidatorAtMostCountValidator
69,2058
     def validate(n)validate
71,2173
 
+lib/flexmock.rb,0
+
 test/asserts.rb,139
 class FlexMockFlexMock
12,312
   module FailureAssertionFailureAssertion
15,368
@@ -256,6 +267,8 @@ class FlexMockFlexMock
3,20
   module RedirectErrorRedirectError
4,35
     def redirect_errorredirect_error
5,58
 
+test/rspec_integration/integration_spec.rb,0
+
 test/test_aliasing.rb,522
 class FlexMockFlexMock
6,61
   module StubsAndExpectsStubsAndExpects
7,76
@@ -323,36 +336,52 @@ class TestFlexMock < Test::Unit::TestCaseTestFlexMock
17,420
   def test_called_with_blocktest_called_with_block
42,898
   def test_return_valuetest_return_value
49,1096
   def test_handle_missing_methodtest_handle_missing_method
54,1201
-  def test_ignore_missing_methodtest_ignore_missing_method
62,1426
-  def test_good_countstest_good_counts
68,1557
-  def test_bad_countstest_bad_counts
76,1696
-  def test_undetermined_countstest_undetermined_counts
87,1913
-  def test_zero_countstest_zero_counts
96,2058
-  def test_file_io_with_usetest_file_io_with_use
105,2237
-  def count_lines(stream)count_lines
113,2441
-  def test_usetest_use
121,2559
-  def test_failures_during_usetest_failures_during_use
130,2716
-  def test_sequential_valuestest_sequential_values
140,2935
-  def test_respond_to_returns_false_for_non_handled_methodstest_respond_to_returns_false_for_non_handled_methods
149,3169
-  def test_respond_to_returns_true_for_explicit_methodstest_respond_to_returns_true_for_explicit_methods
153,3304
-  def test_respond_to_returns_true_for_missing_methods_when_ignoring_missingtest_respond_to_returns_true_for_missing_methods_when_ignoring_missing
158,3463
-  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
163,3644
-  def test_method_proc_raises_error_on_unknowntest_method_proc_raises_error_on_unknown
168,3840
-  def test_method_returns_callable_proctest_method_returns_callable_proc
174,3958
-  def test_method_returns_do_nothing_proc_for_missing_methodstest_method_returns_do_nothing_proc_for_missing_methods
183,4214
-class TestDeprecatedOrderingMethods < Test::Unit::TestCaseTestDeprecatedOrderingMethods
191,4441
-  def test_deprecated_ordering_methodstest_deprecated_ordering_methods
195,4564
-class TestAnyInstance < Test::Unit::TestCaseTestAnyInstance
207,4960
-  class DogDog
211,5069
-    def barkbark
212,5081
-  def test_any_instance_still_works_for_backwards_compatibilitytest_any_instance_still_works_for_backwards_compatibility
217,5121
-
-test/test_example.rb,278
+  def test_ignore_missing_methodtest_ignore_missing_method
62,1431
+  def test_good_countstest_good_counts
68,1562
+  def test_bad_countstest_bad_counts
76,1701
+  def test_undetermined_countstest_undetermined_counts
87,1918
+  def test_zero_countstest_zero_counts
96,2063
+  def test_file_io_with_usetest_file_io_with_use
105,2242
+  def count_lines(stream)count_lines
113,2446
+  def test_usetest_use
121,2564
+  def test_failures_during_usetest_failures_during_use
130,2721
+  def test_sequential_valuestest_sequential_values
140,2940
+  def test_respond_to_returns_false_for_non_handled_methodstest_respond_to_returns_false_for_non_handled_methods
149,3174
+  def test_respond_to_returns_true_for_explicit_methodstest_respond_to_returns_true_for_explicit_methods
153,3309
+  def test_respond_to_returns_true_for_missing_methods_when_ignoring_missingtest_respond_to_returns_true_for_missing_methods_when_ignoring_missing
158,3468
+  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
163,3649
+  def test_method_proc_raises_error_on_unknowntest_method_proc_raises_error_on_unknown
168,3845
+  def test_method_returns_callable_proctest_method_returns_callable_proc
174,3963
+  def test_method_returns_do_nothing_proc_for_missing_methodstest_method_returns_do_nothing_proc_for_missing_methods
183,4219
+class TestDeprecatedOrderingMethods < Test::Unit::TestCaseTestDeprecatedOrderingMethods
191,4446
+  def test_deprecated_ordering_methodstest_deprecated_ordering_methods
195,4569
+class TestAnyInstance < Test::Unit::TestCaseTestAnyInstance
207,4965
+  class DogDog
211,5074
+    def barkbark
212,5086
+  def test_any_instance_still_works_for_backwards_compatibilitytest_any_instance_still_works_for_backwards_compatibility
217,5126
+
+test/test_examples_from_readme.rb,1207
 class TemperatureSamplerTemperatureSampler
15,352
   def initialize(sensor)initialize
16,377
   def average_tempaverage_temp
20,430
 class TestTemperatureSampler < Test::Unit::TestCaseTestTemperatureSampler
26,557
   def test_tempurature_samplertest_tempurature_sampler
29,639
+class TestExamplesFromReadme < Test::Unit::TestCaseTestExamplesFromReadme
38,918
+  def test_simple_return_valuestest_simple_return_values
41,1000
+  def test_returning_an_undefined_valuetest_returning_an_undefined_value
47,1140
+  def test_dbtest_db
53,1280
+  def test_query_and_updatetest_query_and_update
62,1510
+  def test_ordered_queriestest_ordered_queries
71,1763
+  def test_ordered_queries_in_record_modetest_ordered_queries_in_record_mode
89,2362
+  def test_build_xmltest_build_xml
106,2894
+  def known_good_way_to_build_xml(rec)known_good_way_to_build_xml
115,3149
+  def new_way_to_build_xml(rec)new_way_to_build_xml
120,3219
+  def test_multiple_getstest_multiple_gets
124,3307
+  def test_an_important_messagetest_an_important_message
133,3552
+  class QuoteServiceQuoteService
142,3782
+  class PortfolioPortfolio
144,3809
+    def valuevalue
145,3827
+  def test_portfolio_valuetest_portfolio_value
150,3887
 
 test/test_extended_should_receive.rb,809
 module ExtendedShouldReceiveTestsExtendedShouldReceiveTests
15,352
@@ -367,14 +396,14 @@ class TestExtendedShouldReceiveOnPartialMockProxies < Test::Unit::TestCaseTestE
   def setupsetup
65,1770
 
 test/test_flexmodel.rb,528
-class DummyModelDummyModel
5,42
-class ChildModel < DummyModelChildModel
8,64
-class TestFlexModel < Test::Unit::TestCaseTestFlexModel
12,170
-  def test_initial_conditionstest_initial_conditions
15,243
-  def test_classifying_mock_modelstest_classifying_mock_models
27,644
-  def test_mock_models_have_different_idstest_mock_models_have_different_ids
37,891
-  def test_mock_models_can_have_quick_defstest_mock_models_can_have_quick_defs
43,1042
-  def test_mock_models_can_have_blockstest_mock_models_can_have_blocks
48,1182
+class DummyModelDummyModel
6,61
+class ChildModel < DummyModelChildModel
9,83
+class TestFlexModel < Test::Unit::TestCaseTestFlexModel
13,189
+  def test_initial_conditionstest_initial_conditions
16,262
+  def test_classifying_mock_modelstest_classifying_mock_models
28,663
+  def test_mock_models_have_different_idstest_mock_models_have_different_ids
38,910
+  def test_mock_models_can_have_quick_defstest_mock_models_can_have_quick_defs
44,1061
+  def test_mock_models_can_have_blockstest_mock_models_can_have_blocks
49,1201
 
 test/test_naming.rb,816
 class TestNaming < Test::Unit::TestCaseTestNaming
15,352
@@ -390,7 +419,7 @@ class TestNaming < Test::Unit::TestCaseTestNaming
15,352
   def test_partial_mocks_use_original_inspecttest_partial_mocks_use_original_inspect
74,1722
   def test_partial_mocks_can_override_inspecttest_partial_mocks_can_override_inspect
80,1886
 
-test/test_new_instances.rb,2299
+test/test_new_instances.rb,2271
 class TestNewInstances < Test::Unit::TestCaseTestNewInstances
16,382
   class DogDog
20,494
     def barkbark
21,506
@@ -408,87 +437,147 @@ class TestNewInstances < Test::Unit::TestCaseTestNewInstances
16,382
   def test_new_gets_block_after_restubbingtest_new_gets_block_after_restubbing
81,1782
   def test_new_instances_stub_verification_happens_on_teardowntest_new_instances_stub_verification_happens_on_teardown
94,2107
   def test_new_instances_reports_error_on_non_classestest_new_instances_reports_error_on_non_classes
104,2470
-  def test_can_stub_objects_created_with_allocate_instead_of_newtest_can_stub_objects_created_with_allocate_instead_of_new
114,2752
-  def test_can_stub_objects_created_with_arbitrary_class_methodstest_can_stub_objects_created_with_arbitrary_class_methods
122,2984
-  def test_stubbing_arbitrary_class_methods_leaves_new_alonetest_stubbing_arbitrary_class_methods_leaves_new_alone
129,3209
-  def test_stubbing_new_and_allocate_doesnt_double_stub_objects_on_newtest_stubbing_new_and_allocate_doesnt_double_stub_objects_on_new
136,3424
-  def test_stubbing_new_and_allocate_doesnt_double_stub_objects_on_allocatetest_stubbing_new_and_allocate_doesnt_double_stub_objects_on_allocate
145,3626
-  def test_blocks_on_new_do_not_have_stubs_installedtest_blocks_on_new_do_not_have_stubs_installed
158,4093
-  def test_new_instances_accept_chained_expectationstest_new_instances_accept_chained_expectations
172,4433
-  def test_fancy_use_of_chained_should_receivedtest_fancy_use_of_chained_should_received
180,4705
-  def test_writable_accessorstest_writable_accessors
185,4862
-  def test_ordering_can_be_specifiedtest_ordering_can_be_specified
191,5009
-  def test_ordering_can_be_specified_in_groupstest_ordering_can_be_specified_in_groups
199,5205
-
-test/test_partial_mock.rb,4530
+  def test_does_not_by_default_stub_objects_created_with_allocatetest_does_not_by_default_stub_objects_created_with_allocate
114,2752
+  def test_can_explicitly_stub_objects_created_with_allocatetest_can_explicitly_stub_objects_created_with_allocate
122,2982
+  def test_can_stub_objects_created_with_arbitrary_class_methodstest_can_stub_objects_created_with_arbitrary_class_methods
130,3221
+  def test_stubbing_arbitrary_class_methods_leaves_new_alonetest_stubbing_arbitrary_class_methods_leaves_new_alone
137,3446
+  def test_stubbing_new_and_allocate_doesnt_double_stub_objects_on_newtest_stubbing_new_and_allocate_doesnt_double_stub_objects_on_new
144,3661
+  def test_blocks_on_new_do_not_have_stubs_installedtest_blocks_on_new_do_not_have_stubs_installed
157,4116
+  def test_new_instances_accept_chained_expectationstest_new_instances_accept_chained_expectations
171,4456
+  def test_fancy_use_of_chained_should_receivedtest_fancy_use_of_chained_should_received
179,4728
+  def test_writable_accessorstest_writable_accessors
184,4885
+  def test_ordering_can_be_specifiedtest_ordering_can_be_specified
190,5032
+  def test_ordering_can_be_specified_in_groupstest_ordering_can_be_specified_in_groups
198,5228
+
+test/test_partial_mock.rb,4817
 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,1892
-  def test_multiple_stubs_on_single_method_can_be_restored_missing_methodtest_multiple_stubs_on_single_method_can_be_restored_missing_method
81,2171
-  def test_original_behavior_is_restored_when_multiple_methods_are_mockedtest_original_behavior_is_restored_when_multiple_methods_are_mocked
92,2582
-  def test_original_behavior_is_restored_on_class_objectstest_original_behavior_is_restored_on_class_objects
101,2911
-  def test_original_behavior_is_restored_on_singleton_methodstest_original_behavior_is_restored_on_singleton_methods
108,3162
-    def obj.hi() :hello endhi
110,3245
-  def test_original_behavior_is_restored_on_singleton_methods_with_multiple_stubstest_original_behavior_is_restored_on_singleton_methods_with_multiple_stubs
118,3441
-    def obj.hi(n) "hello#{n}" endhi
120,3544
-  def test_original_behavior_is_restored_on_nonsingleton_methods_with_multiple_stubstest_original_behavior_is_restored_on_nonsingleton_methods_with_multiple_stubs
130,3865
-  def test_stubbing_file_shouldnt_break_writingtest_stubbing_file_shouldnt_break_writing
146,4359
-  def test_original_behavior_is_restored_even_when_errorstest_original_behavior_is_restored_even_when_errors
162,4798
-    def m.flexmock_verify() endflexmock_verify
170,5117
-  def test_not_calling_stubbed_method_is_an_errortest_not_calling_stubbed_method_is_an_error
173,5156
-  def test_mock_is_verified_when_the_stub_is_verifiedtest_mock_is_verified_when_the_stub_is_verified
182,5385
-  def test_stub_can_have_explicit_nametest_stub_can_have_explicit_name
191,5655
-  def test_unamed_stub_will_use_default_naming_conventiontest_unamed_stub_will_use_default_naming_convention
197,5834
-  def test_partials_can_be_defined_in_a_blocktest_partials_can_be_defined_in_a_block
203,6030
-  def test_partials_defining_block_return_real_obj_not_proxytest_partials_defining_block_return_real_obj_not_proxy
211,6217
-  def test_partial_mocks_always_return_domain_objecttest_partial_mocks_always_return_domain_object
218,6411
-  def test_domain_objects_do_not_have_mock_methodstest_domain_objects_do_not_have_mock_methods
229,6691
-  def test_partial_mocks_have_mock_methodstest_partial_mocks_have_mock_methods
236,6883
-  def test_partial_mocks_do_not_have_mock_methods_after_teardowntest_partial_mocks_do_not_have_mock_methods_after_teardown
244,7079
-  def test_partial_mocks_with_mock_method_singleton_colision_have_original_defs_restoredtest_partial_mocks_with_mock_method_singleton_colision_have_original_defs_restored
253,7329
-    def dog.mock() :original endmock
255,7436
-  class MockColisionMockColision
261,7557
-    def mockmock
262,7578
-  def test_partial_mocks_with_mock_method_non_singleton_colision_have_original_defs_restoredtest_partial_mocks_with_mock_method_non_singleton_colision_have_original_defs_restored
267,7622
-  def test_safe_partial_mocks_do_not_support_mock_methodstest_safe_partial_mocks_do_not_support_mock_methods
274,7826
-  def test_safe_partial_mocks_require_blocktest_safe_partial_mocks_require_block
282,8054
-  def test_safe_partial_mocks_are_actually_mockedtest_safe_partial_mocks_are_actually_mocked
287,8192
-  class LiarLiar
292,8362
-    def respond_to?(method_name)respond_to?
293,8375
-  def test_liar_actually_liestest_liar_actually_lies
303,8544
-  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
309,8696
-  class ValueObjectValueObject
320,9125
-    def initialize(val)initialize
323,9167
-    def ==(other)==
327,9217
-  def test_partial_mocks_in_the_presense_of_equal_definitiontest_partial_mocks_in_the_presense_of_equal_definition
332,9274
+  class DogPlus < DogDogPlus
28,540
+    def should_receiveshould_receive
29,562
+    def new_instancesnew_instances
32,611
+    def by_defaultby_default
35,656
+  def test_stub_command_add_behavior_to_arbitrary_objectstest_stub_command_add_behavior_to_arbitrary_objects
40,712
+  def test_stub_command_can_configure_via_blocktest_stub_command_can_configure_via_block
46,898
+  def test_stubbed_methods_can_take_blockstest_stubbed_methods_can_take_blocks
54,1097
+  def test_multiple_stubs_on_the_same_object_reuse_the_same_partial_mocktest_multiple_stubs_on_the_same_object_reuse_the_same_partial_mock
61,1324
+  def test_multiple_methods_can_be_stubbedtest_multiple_methods_can_be_stubbed
66,1473
+  def test_original_behavior_can_be_restoredtest_original_behavior_can_be_restored
74,1727
+  def test_original_missing_behavior_can_be_restoredtest_original_missing_behavior_can_be_restored
84,2064
+  def test_multiple_stubs_on_single_method_can_be_restored_missing_methodtest_multiple_stubs_on_single_method_can_be_restored_missing_method
93,2343
+  def test_original_behavior_is_restored_when_multiple_methods_are_mockedtest_original_behavior_is_restored_when_multiple_methods_are_mocked
104,2754
+  def test_original_behavior_is_restored_on_class_objectstest_original_behavior_is_restored_on_class_objects
113,3083
+  def test_original_behavior_is_restored_on_singleton_methodstest_original_behavior_is_restored_on_singleton_methods
120,3334
+    def obj.hi() :hello endhi
122,3417
+  def test_original_behavior_is_restored_on_singleton_methods_with_multiple_stubstest_original_behavior_is_restored_on_singleton_methods_with_multiple_stubs
130,3613
+    def obj.hi(n) "hello#{n}" endhi
132,3716
+  def test_original_behavior_is_restored_on_nonsingleton_methods_with_multiple_stubstest_original_behavior_is_restored_on_nonsingleton_methods_with_multiple_stubs
142,4037
+  def test_stubbing_file_shouldnt_break_writingtest_stubbing_file_shouldnt_break_writing
158,4531
+  def test_original_behavior_is_restored_even_when_errorstest_original_behavior_is_restored_even_when_errors
174,4970
+    def m.flexmock_verify() endflexmock_verify
182,5289
+  def test_not_calling_stubbed_method_is_an_errortest_not_calling_stubbed_method_is_an_error
185,5328
+  def test_mock_is_verified_when_the_stub_is_verifiedtest_mock_is_verified_when_the_stub_is_verified
194,5557
+  def test_stub_can_have_explicit_nametest_stub_can_have_explicit_name
203,5827
+  def test_unamed_stub_will_use_default_naming_conventiontest_unamed_stub_will_use_default_naming_convention
209,6006
+  def test_partials_can_be_defined_in_a_blocktest_partials_can_be_defined_in_a_block
215,6202
+  def test_partials_defining_block_return_real_obj_not_proxytest_partials_defining_block_return_real_obj_not_proxy
223,6389
+  def test_partial_mocks_always_return_domain_objecttest_partial_mocks_always_return_domain_object
230,6583
+  def test_domain_objects_do_not_have_mock_methodstest_domain_objects_do_not_have_mock_methods
241,6863
+  def test_partial_mocks_have_mock_methodstest_partial_mocks_have_mock_methods
248,7055
+  def test_partial_mocks_do_not_have_mock_methods_after_teardowntest_partial_mocks_do_not_have_mock_methods_after_teardown
256,7251
+  def test_partial_mocks_with_mock_method_singleton_colision_have_original_defs_restoredtest_partial_mocks_with_mock_method_singleton_colision_have_original_defs_restored
265,7501
+    def dog.mock() :original endmock
267,7608
+  class MockColisionMockColision
273,7729
+    def mockmock
274,7750
+  def test_partial_mocks_with_mock_method_non_singleton_colision_have_original_defs_restoredtest_partial_mocks_with_mock_method_non_singleton_colision_have_original_defs_restored
279,7794
+  def test_safe_partial_mocks_do_not_support_mock_methodstest_safe_partial_mocks_do_not_support_mock_methods
286,7998
+  def test_safe_partial_mocks_require_blocktest_safe_partial_mocks_require_block
294,8226
+  def test_safe_partial_mocks_are_actually_mockedtest_safe_partial_mocks_are_actually_mocked
299,8364
+  def test_should_receive_does_not_override_preexisting_deftest_should_receive_does_not_override_preexisting_def
304,8534
+  class LiarLiar
311,8787
+    def respond_to?(method_name)respond_to?
312,8800
+  def test_liar_actually_liestest_liar_actually_lies
322,8969
+  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
328,9121
+  class ValueObjectValueObject
339,9550
+    def initialize(val)initialize
342,9592
+    def ==(other)==
346,9642
+  def test_partial_mocks_in_the_presense_of_equal_definitiontest_partial_mocks_in_the_presense_of_equal_definition
351,9699
+
+test/test_rails_view_stub.rb,931
+module ViewTestsViewTests
6,80
+  def test_view_mocks_as_stubtest_view_mocks_as_stub
7,97
+  def test_fails_if_no_rendertest_fails_if_no_render
12,191
+  def test_view_mocks_with_expectationtest_view_mocks_with_expectation
19,335
+  def test_view_mocks_with_expectation_fails_with_different_templatetest_view_mocks_with_expectation_fails_with_different_template
24,439
+  def test_view_mocks_with_expectation_wand_multiple_templatestest_view_mocks_with_expectation_wand_multiple_templates
32,658
+  def pretend_to_be_rails_version(version)pretend_to_be_rails_version
39,835
+class TestRailsViewStubForVersionsUpTo_1_2_4 < Test::Unit::TestCaseTestRailsViewStubForVersionsUpTo_1_2_4
45,1030
+  def setupsetup
49,1148
+  def render(*names)render
56,1377
+class TestRailsViewStubForVersionsAfter_1_2_4 < Test::Unit::TestCaseTestRailsViewStubForVersionsAfter_1_2_4
70,1655
+  def setupsetup
74,1774
+  def render(*names)render
82,2047
 
 test/test_record_mode.rb,1339
 class TestRecordMode < Test::Unit::TestCaseTestRecordMode
16,390
   def test_recording_mode_workstest_recording_mode_works
20,505
   def test_arguments_are_passed_to_recording_mode_blocktest_arguments_are_passed_to_recording_mode_block
28,687
   def test_recording_mode_handles_multiple_returnstest_recording_mode_handles_multiple_returns
39,962
-  def test_recording_mode_does_not_specify_ordertest_recording_mode_does_not_specify_order
50,1229
-  def test_recording_mode_gets_block_args_tootest_recording_mode_gets_block_args_too
61,1475
-  def test_recording_mode_should_validate_args_with_equalstest_recording_mode_should_validate_args_with_equals
73,1757
-  def test_recording_mode_should_allow_arg_contraint_validationtest_recording_mode_should_allow_arg_contraint_validation
84,1992
-  def test_recording_mode_should_handle_multiplicity_contraintstest_recording_mode_should_handle_multiplicity_contraints
95,2233
-  def test_strict_record_mode_requires_exact_argument_matchestest_strict_record_mode_requires_exact_argument_matches
107,2500
-  def test_strict_record_mode_requires_exact_orderingtest_strict_record_mode_requires_exact_ordering
119,2780
-  def test_strict_record_mode_requires_oncetest_strict_record_mode_requires_once
133,3085
-  def test_strict_record_mode_can_not_failtest_strict_record_mode_can_not_fail
146,3360
-
-test/test_samples.rb,142
+  def test_recording_mode_does_not_specify_ordertest_recording_mode_does_not_specify_order
53,1386
+  def test_recording_mode_gets_block_args_tootest_recording_mode_gets_block_args_too
64,1632
+  def test_recording_mode_should_validate_args_with_equalstest_recording_mode_should_validate_args_with_equals
76,1914
+  def test_recording_mode_should_allow_arg_contraint_validationtest_recording_mode_should_allow_arg_contraint_validation
87,2149
+  def test_recording_mode_should_handle_multiplicity_contraintstest_recording_mode_should_handle_multiplicity_contraints
98,2390
+  def test_strict_record_mode_requires_exact_argument_matchestest_strict_record_mode_requires_exact_argument_matches
110,2657
+  def test_strict_record_mode_requires_exact_orderingtest_strict_record_mode_requires_exact_ordering
122,2937
+  def test_strict_record_mode_requires_oncetest_strict_record_mode_requires_once
136,3242
+  def test_strict_record_mode_can_not_failtest_strict_record_mode_can_not_fail
149,3517
+
+test/test_samples.rb,2164
 class TestSamples < Test::Unit::TestCaseTestSamples
17,378
   def test_file_iotest_file_io
25,748
   def count_lines(file)count_lines
33,999
+class TestUndefined < Test::Unit::TestCaseTestUndefined
43,1092
+  def test_undefined_valuestest_undefined_values
46,1165
+class TestSimple < Test::Unit::TestCaseTestSimple
55,1351
+  def test_simple_mocktest_simple_mock
58,1421
+class TestDog < Test::Unit::TestCaseTestDog
65,1556
+  def test_dog_wagstest_dog_wags
68,1625
+class WooferWoofer
74,1736
+class DogDog
77,1754
+  def initializeinitialize
78,1764
+  def barkbark
81,1812
+  def wagwag
84,1846
+class TestDogBarking < Test::Unit::TestCaseTestDogBarking
89,1878
+  def setupsetup
94,2043
+  def test_dogtest_dog
99,2118
+class TestDogBarkingWithNewInstances < Test::Unit::TestCaseTestDogBarkingWithNewInstances
105,2249
+  def setupsetup
110,2415
+  def test_dogtest_dog
114,2502
+class TestDefaults < Test::Unit::TestCaseTestDefaults
120,2636
+  def setupsetup
123,2708
+  def test_something_where_bark_must_be_called_oncetest_something_where_bark_must_be_called_once
128,2837
+class TestDemeter < Test::Unit::TestCaseTestDemeter
136,3040
+  def test_manual_mockingtest_manual_mocking
138,3110
+  def test_demetertest_demeter
151,3544
+class TestDb < Test::Unit::TestCaseTestDb
161,3759
+  def test_dbtest_db
164,3825
+class TestDb < Test::Unit::TestCaseTestDb
175,4030
+  def test_query_and_updatetest_query_and_update
178,4096
+  def test_ordered_queriestest_ordered_queries
189,4383
+  def test_ordered_queries_in_record_modetest_ordered_queries_in_record_mode
207,4923
+  def known_good_way_to_build_xml(builder)known_good_way_to_build_xml
224,5400
+  def new_way_to_build_xml(builder)new_way_to_build_xml
228,5467
+  def test_build_xmltest_build_xml
232,5551
+class TestMoreSamples < Test::Unit::TestCaseTestMoreSamples
243,5813
+  def test_multiple_getstest_multiple_gets
246,5888
+  def test_an_important_messagetest_an_important_message
255,6133
+  class QuoteServiceQuoteService
264,6394
+  class PortfolioPortfolio
267,6422
+    def initializeinitialize
268,6440
+    def valuevalue
271,6507
+  def test_portfolio_valuetest_portfolio_value
276,6563
 
 test/test_should_ignore_missing.rb,1173
 class TestShouldIgnoreMissing < Test::Unit::TestCaseTestShouldIgnoreMissing
16,375
@@ -504,7 +593,7 @@ class TestShouldIgnoreMissing < Test::Unit::TestCaseTestShouldIgnoreMissing
16,
   def test_not_calling_method_proc_will_fail_count_constraintstest_not_calling_method_proc_will_fail_count_constraints
66,1693
   def test_method_returns_do_nothing_proc_for_missing_methodstest_method_returns_do_nothing_proc_for_missing_methods
75,1965
 
-test/test_should_receive.rb,10143
+test/test_should_receive.rb,10493
 def mock_top_level_functionmock_top_level_function
16,375
 module KernelKernel
20,416
   def mock_kernel_functionmock_kernel_function
21,430
@@ -604,15 +693,18 @@ class TestFlexMockShoulds < Test::Unit::TestCaseTestFlexMockShoulds
26,477
   def test_default_expectations_are_overridden_by_later_expectationstest_default_expectations_are_overridden_by_later_expectations
910,23315
   def test_ordered_default_expectations_can_be_specifiedtest_ordered_default_expectations_can_be_specified
918,23543
   def test_ordered_default_expectations_can_be_overriddentest_ordered_default_expectations_can_be_overridden
926,23794
-  def test_partial_mocks_can_have_default_expectationstest_partial_mocks_can_have_default_expectations
938,24065
-  def test_partial_mocks_can_have_default_expectations_overriddentest_partial_mocks_can_have_default_expectations_overridden
944,24246
-  def test_wicked_and_evil_tricks_with_by_default_are_thwartedtest_wicked_and_evil_tricks_with_by_default_are_thwarted
951,24494
-  def test_can_mock_operatorstest_can_mock_operators
962,24842
-  def assert_operator(op, &block)assert_operator
991,25857
-class TestFlexMockShouldsWithInclude < Test::Unit::TestCaseTestFlexMockShouldsWithInclude
999,26011
-  def test_include_enables_unqualified_arg_type_referencestest_include_enables_unqualified_arg_type_references
1001,26105
-class TestFlexMockArgTypesDontLeak < Test::Unit::TestCaseTestFlexMockArgTypesDontLeak
1009,26269
-  def test_unqualified_arg_type_references_are_undefined_by_defaulttest_unqualified_arg_type_references_are_undefined_by_default
1010,26327
+  def test_by_default_works_at_mock_leveltest_by_default_works_at_mock_level
938,24065
+  def test_by_default_at_mock_level_does_nothing_with_no_expectationstest_by_default_at_mock_level_does_nothing_with_no_expectations
949,24340
+  def test_partial_mocks_can_have_default_expectationstest_partial_mocks_can_have_default_expectations
955,24485
+  def test_partial_mocks_can_have_default_expectations_overriddentest_partial_mocks_can_have_default_expectations_overridden
961,24666
+  def test_wicked_and_evil_tricks_with_by_default_are_thwartedtest_wicked_and_evil_tricks_with_by_default_are_thwarted
968,24914
+  def test_mocks_can_handle_multi_parameter_respond_tostest_mocks_can_handle_multi_parameter_respond_tos
980,25319
+  def test_can_mock_operatorstest_can_mock_operators
991,25666
+  def assert_operator(op, &block)assert_operator
1020,26681
+class TestFlexMockShouldsWithInclude < Test::Unit::TestCaseTestFlexMockShouldsWithInclude
1028,26835
+  def test_include_enables_unqualified_arg_type_referencestest_include_enables_unqualified_arg_type_references
1030,26929
+class TestFlexMockArgTypesDontLeak < Test::Unit::TestCaseTestFlexMockArgTypesDontLeak
1038,27093
+  def test_unqualified_arg_type_references_are_undefined_by_defaulttest_unqualified_arg_type_references_are_undefined_by_default
1039,27151
 
 test/test_tu_integration.rb,1570
 class TestTuIntegrationFlexMockMethod < Test::Unit::TestCaseTestTuIntegrationFlexMockMethod
15,352
@@ -649,8 +741,6 @@ class UndefinedTest < Test::Unit::TestCaseUndefinedTest
15,352
   def assert_undefined(obj)assert_undefined
81,2012
   def undefinedundefined
85,2075
 
-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

data/doc/releases/flexmock-0.8.0.rdoc

@@ -1,10 +1,10 @@
-= FlexMock 0.7.1 Released
+= FlexMock 0.8.0 Released
 
 FlexMock is a flexible mocking library for use in unit testing and
 behavior specification in Ruby.  It is a minor release that contains
 some new funtionality.
 
-== New Features n 0.8.0
+== New Features in 0.8.0
 
 * When should_ignore_missing is specified, the mock will return an
   undefined object for any method calls that are ignored.

data/lib/flexmock/expectation.rb

@@ -69,7 +69,7 @@ class FlexMock
     def return_value(args)
       case @return_queue.size
       when 0
-        block = lambda { @return_value }
+        block = lambda { |*args| @return_value }
       when 1
         block = @return_queue.first
       else
@@ -85,7 +85,7 @@ class FlexMock
       unless @yield_queue.empty?
         block = args.last
         values = (@yield_queue.size == 1) ? @yield_queue.first : @yield_queue.shift
-        if block.respond_to?(:call) 
+        if block && block.respond_to?(:call) 
           @return_value = block.call(*values)
         else
           fail MockError, "No Block given to mock with 'and_yield' expectation"
@@ -190,7 +190,7 @@ class FlexMock
         @return_queue << block
       else
         args.each do |arg|
-          @return_queue << lambda { arg }
+          @return_queue << lambda { |*a| arg }
         end
       end
       self

data/lib/flexmock/mock_container.rb

@@ -213,6 +213,9 @@ class FlexMock
         :new_record? => false,
         :class => model_class,
         :errors => container.flexmock("errors", :count => 0))
+      # HACK: Ruby 1.9 needs the following lambda so that model_class
+      # is correctly bound below.
+      lambda { }
       mock.should_receive(:is_a?).with(any).and_return { |other|
         other == model_class
       }

data/lib/flexmock/partial_mock.rb

@@ -104,22 +104,27 @@ class FlexMock
     # new_instances is a short cut method for overriding the behavior of any
     # new instances created via a mocked class object.
     #
-    # By default, new_instances will mock the behaviour of the :new and
-    # :allocate methods.  If you wish to mock a different set of class
-    # methods, just pass a list of symbols to as arguments.
+    # By default, new_instances will mock the behaviour of the :new
+    # method.  If you wish to mock a different set of class methods,
+    # just pass a list of symbols to as arguments.  (previous versions
+    # also mocked :allocate by default.  If you need :allocate to be
+    # mocked, just request it explicitly).
     #
-    # For example, to stub only objects created by :make (and not :new
-    # or :allocate), use:
+    # For example, to stub only objects created by :make (and not
+    # :new), use:
     #
     #    flexmock(ClassName).new_instances(:make).should_receive(...)
     #
     def new_instances(*allocators, &block)
       fail ArgumentError, "new_instances requires a Class to stub" unless Class === @obj
-      allocators = [:new, :allocate] if allocators.empty?
+      allocators = [:new] if allocators.empty?
       result = ExpectationRecorder.new
-      allocators.each do |m|
-        self.should_receive(m).and_return { |*args|
-          new_obj = invoke_original(m, args)
+      allocators.each do |allocate_method|
+        # HACK: Without the following lambda, Ruby 1.9 will not bind
+        # the allocate_method parameter correctly.
+        lambda { } 
+        self.should_receive(allocate_method).and_return { |*args|
+          new_obj = invoke_original(allocate_method, args)
           mock = flexmock_container.flexmock(new_obj)
           block.call(mock) if block_given?
           result.apply(mock)

data/lib/flexmock/rails/view_mocking.rb

@@ -3,18 +3,45 @@ require 'flexmock'
 class FlexMock
   module MockContainer
 
+    def rails_version
+      Rails::VERSION::STRING
+    end
+
     # Declare that the Rails controller under test should render the
     # named view.  If a view template name is given, it will be an
     # error if the named view is not rendered during the execution of
     # the contoller action.  If no template name is given, then the
     # any view may be rendered. If no view is actually rendered, then
-    # a assertion failure will occur.
+    # an assertion failure will occur.
+    #
+    #  def test_my_action_does_what_it_should
+    #    should_render_view 'show'
+    #   
+    #    get :show, :id => 1
+    #
+    #    assert_response :success
+    #  end
+    #
     def should_render_view(template_name=nil)
+      if rails_version <= '1.2.4'
+        should_render_view_prior_version_124(template_name)
+      elsif rails_version <= '2.0.0'
+        should_render_view_after_version_124(template_name)
+      else
+        should_render_view_after_version_202(template_name)
+      end
+    end
+
+    private
+
+    # This version of should_render_view will work for Rails 1.2.4
+    # (and prehaps some number of prior versions).
+    def should_render_view_prior_version_124(template_name) # :nodoc:
       view = flexmock("MockView")
-       view.should_receive(
-         :assigns => {},
-         :render_file => true,
-         :first_render => "dummy_template"
+      view.should_receive(
+        :assigns => {},
+        :render_file => true,
+        :first_render => "dummy_template"
         )
       if template_name
         view.should_receive(:file_exists?).with(/#{template_name}$/).once.
@@ -26,5 +53,49 @@ class FlexMock
       flexmock(@controller.class).should_receive(:view_class).once.
         and_return(view_class)
     end
+
+    # This version of should_render_view will work with versions of
+    # Rails after Version 1.2.4.
+    def should_render_view_after_version_124(template_name)
+      view = flexmock("MockView")
+      view.should_receive(
+        :assigns => {},
+        :render_file => true,
+        :template_format => :dummy_format,
+        :view_paths => :dummy_view_paths,
+        :pick_template_extension => :dummy_extension
+        )
+      if template_name
+        view.should_receive(:file_exists?).with(/#{template_name}$/).once.
+          and_return(true)
+      end
+      view.should_receive(:file_exists?).with(any).and_return(true)
+      
+      # The number of times this is called changes from version 1.2.6
+      # to 2.0.  The important thing is that it is checked at least once.
+      flexmock(@response).should_receive(:template).and_return(view).
+        at_least.once
+    end
+    
+    # This version of should_render_view will work with versions of
+    # Rails at Version 2.0.2 and after
+    def should_render_view_after_version_202(template_name)
+      viewmock = flexmock("ViewMock")
+      viewmock.should_receive(
+        :assigns => {},
+        :pick_template_extension => ".html",
+        :template_format =>nil,
+        :view_paths => nil,
+        :file_exists? => true,
+        :first_render => "")
+      if template_name
+        viewmock.should_receive(:render_file).with(/\/#{template_name}$/, any, any).
+          and_return(nil).once
+      else
+        viewmock.should_receive(:render_file).and_return(nil)
+      end
+      flexmock(ActionView::Base).should_receive(:new).and_return(viewmock)
+    end
+    
   end
 end

data/test/test_deprecated_methods.rb

@@ -52,7 +52,7 @@ class TestFlexMock < Test::Unit::TestCase
   end
 
   def test_handle_missing_method
-    expected_error = (VERSION >= "1.8.0") ? NoMethodError : NameError
+    expected_error = (RUBY_VERSION >= "1.8.0") ? NoMethodError : NameError
     ex = assert_raises(expected_error) {
       @mock.not_defined
     }

data/test/test_flexmodel.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 
 require 'test/unit'
+require 'flexmock'
 
 class DummyModel
 end

data/test/test_new_instances.rb

@@ -111,11 +111,19 @@ class TestNewInstances < Test::Unit::TestCase
     assert_match(/new_instances/, ex.message)
   end
   
-  def test_can_stub_objects_created_with_allocate_instead_of_new
+  def test_does_not_by_default_stub_objects_created_with_allocate
     flexstub(Dog).new_instances do |obj|
       obj.should_receive(:bark).and_return(:whimper)
     end
     m = Dog.allocate
+    assert_equal :woof,  m.bark
+  end
+  
+  def test_can_explicitly_stub_objects_created_with_allocate
+    flexstub(Dog).new_instances(:allocate) do |obj|
+      obj.should_receive(:bark).and_return(:whimper)
+    end
+    m = Dog.allocate
     assert_equal :whimper,  m.bark
   end
   
@@ -142,15 +150,6 @@ class TestNewInstances < Test::Unit::TestCase
     assert_equal 1, counter
   end
 
-  def test_stubbing_new_and_allocate_doesnt_double_stub_objects_on_allocate
-    counter = 0
-    flexstub(Dog).new_instances do |obj|
-      counter += 1
-    end
-    Dog.allocate
-    assert_equal 1, counter
-  end
-  
   # Current behavior does not install stubs into the block passed to new. 
   # This is rather difficult to achieve, although it would be nice.  For the
   # moment, we assure that they are not stubbed, but I am willing to change 

data/test/test_rails_view_stub.rb

@@ -3,15 +3,7 @@
 require 'test/unit'
 require 'flexmock/rails/view_mocking'
 
-######################################################################
-class TestRailsViewStub < Test::Unit::TestCase
-  include FlexMock::TestCase
-
-  def setup
-    @controller_class = flexmock("controller class")
-    @controller = flexmock("controller", :class => @controller_class)
-  end
-
+module ViewTests
   def test_view_mocks_as_stub
     should_render_view
     render "controller/new.rthml"
@@ -44,6 +36,23 @@ class TestRailsViewStub < Test::Unit::TestCase
 
   private
 
+  def pretend_to_be_rails_version(version)
+    flexmock(self).should_receive(:rails_version).and_return(version)
+  end
+end
+
+######################################################################
+class TestRailsViewStubForVersionsUpTo_1_2_4 < Test::Unit::TestCase
+  include FlexMock::TestCase
+  include ViewTests
+
+  def setup
+    @controller_class = flexmock("controller class")
+    @controller = flexmock("controller", :class => @controller_class)
+    pretend_to_be_rails_version("1.2.4")
+  end
+
+  # Simulate Rails rendering in version 1.2.4
   def render(*names)
     vc = @controller.class.view_class
     v = vc.new
@@ -54,4 +63,32 @@ class TestRailsViewStub < Test::Unit::TestCase
       v.file_exists?(name)
     end
   end
+
+end
+
+######################################################################
+class TestRailsViewStubForVersionsAfter_1_2_4 < Test::Unit::TestCase
+  include FlexMock::TestCase
+  include ViewTests
+
+  def setup
+    @controller_class = flexmock("controller class")
+    @controller = flexmock("controller", :class => @controller_class)
+    @response = flexmock("Response")
+    pretend_to_be_rails_version("2.0")
+  end
+
+  # Simulate Rails rendering after Rails version 1.2.4
+  def render(*names)
+    v = @response.template
+    v.assigns(:x => :y)
+    v.render_file
+    v.template_format
+    v.view_paths
+    v.pick_template_extension
+    names.each do |name|
+      v.file_exists?(name)
+    end
+  end
+
 end

data/test/test_record_mode.rb

@@ -40,6 +40,9 @@ class TestRecordMode < Test::Unit::TestCase
     FlexMock.use("mock") do |mock|
       mock.should_expect do |r|
         answers = [1, 2]
+        # HACK: The following lambda is needed in Ruby 1.9 to cause
+        # the answers to be properly bound in the following block.
+        lambda { }
         r.f { answers.shift }
       end
       assert_equal 1, mock.f

metadata

@@ -1,39 +1,47 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: flexmock
 version: !ruby/object:Gem::Version 
-  version: 0.8.0
-date: 2007-11-08 00:00:00 -05:00
-summary: Simple and Flexible Mock Objects for Testing
-require_paths: 
-- lib
-email: jim@weirichhouse.org
-homepage: http://onestepback.org/software/flexmock
-rubyforge_project: 
-description: FlexMock is a extremely simple mock object class compatible with the Test::Unit framework.  Although the FlexMock's  interface is simple, it is very flexible.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.8.1
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - Jim Weirich
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-05-21 00:00:00 -07:00
+default_executable: 
+dependencies: []
+
+description: FlexMock is a extremely simple mock object class compatible with the Test::Unit framework.  Although the FlexMock's  interface is simple, it is very flexible.
+email: jim@weirichhouse.org
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- README
+- CHANGES
+- doc/GoogleExample.rdoc
+- doc/releases/flexmock-0.4.0.rdoc
+- doc/releases/flexmock-0.4.1.rdoc
+- doc/releases/flexmock-0.4.2.rdoc
+- doc/releases/flexmock-0.4.3.rdoc
+- doc/releases/flexmock-0.5.0.rdoc
+- doc/releases/flexmock-0.5.1.rdoc
+- 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
+- doc/releases/flexmock-0.6.4.rdoc
+- doc/releases/flexmock-0.7.0.rdoc
+- doc/releases/flexmock-0.7.1.rdoc
+- doc/releases/flexmock-0.8.0.rdoc
 files: 
 - CHANGES
 - Rakefile
 - README
 - TAGS
-- lib/flexmock.rb
 - lib/flexmock/argument_matchers.rb
 - lib/flexmock/argument_types.rb
 - lib/flexmock/base.rb
@@ -49,6 +57,7 @@ files:
 - lib/flexmock/noop.rb
 - lib/flexmock/ordering.rb
 - lib/flexmock/partial_mock.rb
+- lib/flexmock/rails/view_mocking.rb
 - lib/flexmock/rails.rb
 - lib/flexmock/recorder.rb
 - lib/flexmock/rspec.rb
@@ -56,9 +65,10 @@ files:
 - lib/flexmock/test_unit_integration.rb
 - lib/flexmock/undefined.rb
 - lib/flexmock/validators.rb
-- lib/flexmock/rails/view_mocking.rb
+- lib/flexmock.rb
 - test/asserts.rb
 - test/redirect_error.rb
+- test/rspec_integration/integration_spec.rb
 - test/test_aliasing.rb
 - test/test_container_methods.rb
 - test/test_default_framework_adapter.rb
@@ -77,7 +87,6 @@ files:
 - test/test_should_receive.rb
 - test/test_tu_integration.rb
 - test/test_undefined.rb
-- test/rspec_integration/integration_spec.rb
 - test/test_unit_integration/test_auto_test_unit.rb
 - flexmock.blurb
 - install.rb
@@ -96,37 +105,35 @@ files:
 - doc/releases/flexmock-0.7.0.rdoc
 - doc/releases/flexmock-0.7.1.rdoc
 - doc/releases/flexmock-0.8.0.rdoc
-test_files: []
-
+has_rdoc: true
+homepage: http://onestepback.org/software/flexmock
+post_install_message: 
 rdoc_options: 
 - --title
 - Flex Mock
 - --main
 - README
 - --line-numbers
-extra_rdoc_files: 
-- README
-- CHANGES
-- doc/GoogleExample.rdoc
-- doc/releases/flexmock-0.4.0.rdoc
-- doc/releases/flexmock-0.4.1.rdoc
-- doc/releases/flexmock-0.4.2.rdoc
-- doc/releases/flexmock-0.4.3.rdoc
-- doc/releases/flexmock-0.5.0.rdoc
-- doc/releases/flexmock-0.5.1.rdoc
-- 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
-- doc/releases/flexmock-0.6.4.rdoc
-- doc/releases/flexmock-0.7.0.rdoc
-- doc/releases/flexmock-0.7.1.rdoc
-- doc/releases/flexmock-0.8.0.rdoc
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: 
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: Simple and Flexible Mock Objects for Testing
+test_files: []