made sure that the possible new output_buffer created by CacheHelper …

…is of the same type as the original
kommen · Jul 19, 2011 · bd6206b · bd6206b
1 parent b2a2035
commit bd6206b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
@@ -808,8 +808,8 @@ def test_output_buffer
     cache_helper.extend(ActionView::Helpers::CacheHelper)
     cache_helper.expects(:controller).returns(controller).at_least(0)
     cache_helper.expects(:output_buffer).returns(output_buffer).at_least(0)
-    # if the output_buffer is changed, the new one should be html_safe
-    cache_helper.expects(:output_buffer=).with(responds_with(:html_safe?, true)).returns(true).at_least(0)
+    # if the output_buffer is changed, the new one should be html_safe and of the same type
+    cache_helper.expects(:output_buffer=).with(responds_with(:html_safe?, true)).with(instance_of(output_buffer.class)).at_least(0)
 
     assert_nothing_raised do
       cache_helper.send :fragment_for, 'Test fragment name', 'Test fragment', &Proc.new{ nil }
@@ -824,8 +824,8 @@ def test_safe_buffer
     cache_helper.extend(ActionView::Helpers::CacheHelper)
     cache_helper.expects(:controller).returns(controller).at_least(0)
     cache_helper.expects(:output_buffer).returns(output_buffer).at_least(0)
-    # if the output_buffer is changed, the new one should be html_safe
-    cache_helper.expects(:output_buffer=).with(responds_with(:html_safe?, true)).returns(true).at_least(0)
+    # if the output_buffer is changed, the new one should be html_safe and of the same type
+    cache_helper.expects(:output_buffer=).with(responds_with(:html_safe?, true)).with(instance_of(output_buffer.class)).at_least(0)
 
     assert_nothing_raised do
       cache_helper.send :fragment_for, 'Test fragment name', 'Test fragment', &Proc.new{ nil }