aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller/dispatcher_test.rb
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2008-10-21 02:30:57 +0200
committerDavid Heinemeier Hansson <david@loudthinking.com>2008-10-21 02:30:57 +0200
commit68d84e259346c1bc3d8fd546162e5a93caf0bbdc (patch)
tree60f6e71fcb669eb0f9b6b0bc70fa5c2a81a103f6 /actionpack/test/controller/dispatcher_test.rb
parent9acb88e666269204821b78bec7b72d3d16597096 (diff)
parent326030a1e843245ae493fbdfb1b5eb72d1e59f26 (diff)
downloadrails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.tar.gz
rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.tar.bz2
rails-68d84e259346c1bc3d8fd546162e5a93caf0bbdc.zip
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/test/controller/dispatcher_test.rb')
-rw-r--r--actionpack/test/controller/dispatcher_test.rb10
1 files changed, 9 insertions, 1 deletions
diff --git a/actionpack/test/controller/dispatcher_test.rb b/actionpack/test/controller/dispatcher_test.rb
index 911fcab67b..3ee78a6156 100644
--- a/actionpack/test/controller/dispatcher_test.rb
+++ b/actionpack/test/controller/dispatcher_test.rb
@@ -26,9 +26,17 @@ class DispatcherTest < Test::Unit::TestCase
end
def test_clears_dependencies_after_dispatch_if_in_loading_mode
- ActionController::Routing::Routes.expects(:reload).once
ActiveSupport::Dependencies.expects(:clear).once
+ dispatch(@output, false)
+ end
+
+ def test_reloads_routes_before_dispatch_if_in_loading_mode
+ ActionController::Routing::Routes.expects(:reload).once
+ dispatch(@output, false)
+ end
+ def test_clears_asset_tag_cache_before_dispatch_if_in_loading_mode
+ ActionView::Helpers::AssetTagHelper::AssetTag::Cache.expects(:clear).once
dispatch(@output, false)
end