aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_controller/routing.rb
diff options
context:
space:
mode:
authorMichael Koziarski <michael@koziarski.com>2007-08-29 03:14:15 +0000
committerMichael Koziarski <michael@koziarski.com>2007-08-29 03:14:15 +0000
commit719d3e8a9af1e3cd428c3177f99ef7e44b3b9814 (patch)
tree4a241726b1eb1d8fbf64f8b61c2394ace1ea8ed3 /actionpack/lib/action_controller/routing.rb
parentc6a18308eff836f25a99164d814d02576fe9415a (diff)
downloadrails-719d3e8a9af1e3cd428c3177f99ef7e44b3b9814.tar.gz
rails-719d3e8a9af1e3cd428c3177f99ef7e44b3b9814.tar.bz2
rails-719d3e8a9af1e3cd428c3177f99ef7e44b3b9814.zip
Use mocha to avoid the sleep calls in the compiled_template tests. [tarmo] Closes #9372
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7370 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/routing.rb')
-rw-r--r--actionpack/lib/action_controller/routing.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb
index 70ef8ab583..9ba972fe82 100644
--- a/actionpack/lib/action_controller/routing.rb
+++ b/actionpack/lib/action_controller/routing.rb
@@ -1238,7 +1238,7 @@ module ActionController
else
add_route ":controller/:action/:id"
end
- end
+ end
def add_route(path, options = {})
route = builder.build(path, options)