diff options
author | Piotr Sarnacki <drogus@gmail.com> | 2010-07-02 00:29:20 +0200 |
---|---|---|
committer | José Valim <jose.valim@gmail.com> | 2010-07-02 01:51:03 +0200 |
commit | f7ba614c2db31933cbc12eda87518de3eca0228c (patch) | |
tree | 8aabbf6e719a3eff1eaec47988512eda3e8341b3 /actionpack/test/dispatch/url_generation_test.rb | |
parent | f8720a04d129668c7554c1a7270fba5418510b47 (diff) | |
download | rails-f7ba614c2db31933cbc12eda87518de3eca0228c.tar.gz rails-f7ba614c2db31933cbc12eda87518de3eca0228c.tar.bz2 rails-f7ba614c2db31933cbc12eda87518de3eca0228c.zip |
Unify routes naming by renaming router to routes
Signed-off-by: José Valim <jose.valim@gmail.com>
Diffstat (limited to 'actionpack/test/dispatch/url_generation_test.rb')
-rw-r--r-- | actionpack/test/dispatch/url_generation_test.rb | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb index 326b336a1a..f83651d583 100644 --- a/actionpack/test/dispatch/url_generation_test.rb +++ b/actionpack/test/dispatch/url_generation_test.rb @@ -2,24 +2,24 @@ require 'abstract_unit' module TestUrlGeneration class WithMountPoint < ActionDispatch::IntegrationTest - Router = ActionDispatch::Routing::RouteSet.new - Router.draw { match "/foo", :to => "my_route_generating#index", :as => :foo } + Routes = ActionDispatch::Routing::RouteSet.new + Routes.draw { match "/foo", :to => "my_route_generating#index", :as => :foo } class ::MyRouteGeneratingController < ActionController::Base - include Router.url_helpers + include Routes.url_helpers def index render :text => foo_path end end - include Router.url_helpers + include Routes.url_helpers - def _router - Router + def _routes + Routes end def app - Router + Routes end test "generating URLS normally" do @@ -30,7 +30,7 @@ module TestUrlGeneration assert_equal "/bar/foo", foo_path(:script_name => "/bar") end - test "the request's SCRIPT_NAME takes precedence over the router's" do + test "the request's SCRIPT_NAME takes precedence over the routes'" do get "/foo", {}, 'SCRIPT_NAME' => "/new" assert_equal "/new/foo", response.body end |