diff options
| author | Pablo Ifran <pabloifran@gmail.com> | 2012-01-02 09:16:38 -0200 |
|---|---|---|
| committer | Pablo Ifran <pabloifran@gmail.com> | 2012-01-02 09:16:38 -0200 |
| commit | c8fe025965ceea0618ee7b620ca04ca8545d210b (patch) | |
| tree | 3d0b83dc449d6170ede097c919430ce1cfb27607 /actionpack/test/controller | |
| parent | 24b1fd21f0390bdf4d0dc96a14abc17a7a24219d (diff) | |
| parent | dc64aec7fa54cb34353f0c476136abf4191273fc (diff) | |
| download | rails-c8fe025965ceea0618ee7b620ca04ca8545d210b.tar.gz rails-c8fe025965ceea0618ee7b620ca04ca8545d210b.tar.bz2 rails-c8fe025965ceea0618ee7b620ca04ca8545d210b.zip | |
Merge branch 'master' of github.com:lifo/docrails
Diffstat (limited to 'actionpack/test/controller')
| -rw-r--r-- | actionpack/test/controller/action_pack_assertions_test.rb | 2 | ||||
| -rw-r--r-- | actionpack/test/controller/new_base/render_streaming_test.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb index 5252e43c25..fab70c71d6 100644 --- a/actionpack/test/controller/action_pack_assertions_test.rb +++ b/actionpack/test/controller/action_pack_assertions_test.rb @@ -165,7 +165,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one match ':controller/:action' end - set.install_helpers + set.install_helpers([ActionController::Base, ActionView::Base]) process :redirect_to_named_route assert_redirected_to 'http://test.host/route_one' diff --git a/actionpack/test/controller/new_base/render_streaming_test.rb b/actionpack/test/controller/new_base/render_streaming_test.rb index 1a17e24914..1532bd5c98 100644 --- a/actionpack/test/controller/new_base/render_streaming_test.rb +++ b/actionpack/test/controller/new_base/render_streaming_test.rb @@ -111,4 +111,4 @@ module RenderStreaming assert_equal cache, headers["Cache-Control"] end end -end if defined?(Fiber) +end |