TEST_CODEOWNERS/rails
3
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Removed deprecated RouteSet API, still many tests fail

Browse Source
This commit is contained in:
Piotr Sarnacki 2010-08-05 15:44:23 +02:00
parent 91fec0d24d
commit b3eb26a161
34 changed files with 567 additions and 606 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
actionpack/lib/action_dispatch/routing.rb
View File

@ -264,7 +264,6 @@ module ActionDispatch
# Target specific controllers by prefixing the command with <tt>CONTROLLER=x</tt>.
#
module Routing
autoload :DeprecatedMapper, 'action_dispatch/routing/deprecated_mapper'
autoload :Mapper, 'action_dispatch/routing/mapper'
autoload :Route, 'action_dispatch/routing/route'
autoload :RouteSet, 'action_dispatch/routing/route_set'

7
actionpack/lib/action_dispatch/routing/mapper.rb
View File

@ -443,11 +443,6 @@ def scope(*args)
options = args.extract_options!
options = options.dup
if name_prefix = options.delete(:name_prefix)
options[:as] ||= name_prefix
ActiveSupport::Deprecation.warn ":name_prefix was deprecated in the new router syntax. Use :as instead.", caller
end
options[:path] = args.first if args.first.is_a?(String)
recover = {}
@ -770,7 +765,7 @@ def resources(*resources, &block)
end
resource_scope(Resource.new(resources.pop, options)) do
yield if block_given?
instance_eval(&block) if block_given?
collection_scope do
get :index if parent_resource.actions.include?(:index)

12
actionpack/lib/action_dispatch/routing/route_set.rb
View File

@ -1,7 +1,6 @@
require 'rack/mount'
require 'forwardable'
require 'active_support/core_ext/object/to_query'
require 'action_dispatch/routing/deprecated_mapper'
module ActionDispatch
module Routing
@ -211,7 +210,6 @@ def initialize(request_class = ActionDispatch::Request)
self.routes = []
self.named_routes = NamedRouteCollection.new
self.resources_path_names = self.class.default_resources_path_names.dup
self.controller_namespaces = Set.new
self.default_url_options = {}
self.request_class = request_class
@ -227,14 +225,10 @@ def draw(&block)
clear! unless @disable_clear_and_finalize
mapper = Mapper.new(self)
if block.arity == 1
mapper.instance_exec(DeprecatedMapper.new(self), &block)
if default_scope
mapper.with_default_scope(default_scope, &block)
else
if default_scope
mapper.with_default_scope(default_scope, &block)
else
mapper.instance_exec(&block)
end
mapper.instance_exec(&block)
end
finalize! unless @disable_clear_and_finalize

18
actionpack/test/abstract_unit.rb
View File

@ -49,14 +49,6 @@
module Rails
end
# Monkey patch the old routes initialization to be silenced.
class ActionDispatch::Routing::DeprecatedMapper
def initialize_with_silencer(*args)
ActiveSupport::Deprecation.silence { initialize_without_silencer(*args) }
end
alias_method_chain :initialize, :silencer
end
ActiveSupport::Dependencies.hook!
# Show backtraces for deprecated behavior for quicker cleanup.
@ -128,14 +120,12 @@ class TestCase
# Hold off drawing routes until all the possible controller classes
# have been loaded.
setup_once do
SharedTestRoutes.draw do |map|
# FIXME: match ':controller(/:action(/:id))'
map.connect ':controller/:action/:id'
SharedTestRoutes.draw do
match ':controller(/:action)'
end
ActionController::IntegrationTest.app.routes.draw do |map|
# FIXME: match ':controller(/:action(/:id))'
map.connect ':controller/:action/:id'
ActionController::IntegrationTest.app.routes.draw do
match ':controller(/:action)'
end
end
end

2
actionpack/test/activerecord/active_record_store_test.rb
View File

@ -198,7 +198,7 @@ def test_allows_session_fixation
def with_test_route_set(options = {})
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => 'active_record_store_test/test'
end

18
actionpack/test/activerecord/polymorphic_routes_test.rb
View File

@ -451,18 +451,18 @@ def with_namespaced_routes(name)
def with_test_routes(options = {})
with_routing do |set|
set.draw do |map|
map.resources :projects do |projects|
projects.resources :tasks
projects.resource :bid do |bid|
bid.resources :tasks
set.draw do
resources :projects do
resources :tasks
resource :bid do
resources :tasks
end
end
map.resources :taxes do |taxes|
taxes.resources :faxes
taxes.resource :bid
resources :taxes do
resources :faxes
resource :bid
end
map.resources :series
resources :series
end
self.class.send(:include, @routes.url_helpers)

19
actionpack/test/controller/action_pack_assertions_test.rb
View File

@ -222,7 +222,7 @@ def test_post
# test the redirection to a named route
def test_assert_redirect_to_named_route
with_routing do |set|
set.draw do |map|
set.draw do
match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
match ':controller/:action'
end
@ -236,7 +236,7 @@ def test_assert_redirect_to_named_route
def test_assert_redirect_to_named_route_failure
with_routing do |set|
set.draw do |map|
set.draw do
match 'route_one', :to => 'action_pack_assertions#nothing', :as => :route_one
match 'route_two', :to => 'action_pack_assertions#nothing', :id => 'two', :as => :route_two
match ':controller/:action'
@ -258,10 +258,9 @@ def test_assert_redirect_to_nested_named_route
@controller = Admin::InnerModuleController.new
with_routing do |set|
set.draw do |map|
set.draw do
match 'admin/inner_module', :to => 'admin/inner_module#index', :as => :admin_inner_module
# match ':controller/:action'
map.connect ':controller/:action/:id'
match ':controller/:action'
end
process :redirect_to_index
# redirection is <{"action"=>"index", "controller"=>"admin/admin/inner_module"}>
@ -273,10 +272,9 @@ def test_assert_redirected_to_top_level_named_route_from_nested_controller
@controller = Admin::InnerModuleController.new
with_routing do |set|
set.draw do |map|
set.draw do
match '/action_pack_assertions/:id', :to => 'action_pack_assertions#index', :as => :top_level
# match ':controller/:action'
map.connect ':controller/:action/:id'
match ':controller/:action'
end
process :redirect_to_top_level_named_route
# assert_redirected_to "http://test.host/action_pack_assertions/foo" would pass because of exact match early return
@ -288,11 +286,10 @@ def test_assert_redirected_to_top_level_named_route_with_same_controller_name_in
@controller = Admin::InnerModuleController.new
with_routing do |set|
set.draw do |map|
set.draw do
# this controller exists in the admin namespace as well which is the only difference from previous test
match '/user/:id', :to => 'user#index', :as => :top_level
# match ':controller/:action'
map.connect ':controller/:action/:id'
match ':controller/:action'
end
process :redirect_to_top_level_named_route
# assert_redirected_to top_level_url('foo') would pass because of exact match early return

2
actionpack/test/controller/base_test.rb
View File

@ -294,7 +294,7 @@ def test_named_routes_with_path_without_doing_a_request_first
@controller.request = @request
with_routing do |set|
set.draw do |map|
set.draw do
resources :things
end

4
actionpack/test/controller/caching_test.rb
View File

@ -76,7 +76,7 @@ def teardown
def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
with_routing do |set|
set.draw do |map|
set.draw do
match 'posts.:format', :to => 'posts#index', :as => :formatted_posts
match '/', :to => 'posts#index', :as => :main
end
@ -452,7 +452,7 @@ def test_forbidden_is_not_cached
def test_xml_version_of_resource_is_treated_as_different_cache
with_routing do |set|
set.draw do |map|
set.draw do
match ':controller(/:action(.:format))'
end

2
actionpack/test/controller/flash_test.rb
View File

@ -255,7 +255,7 @@ def get(path, parameters = nil, env = {})
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => FlashIntegrationTest::TestController
end

2
actionpack/test/controller/integration_test.rb
View File

@ -427,7 +427,7 @@ def with_test_route_set
include set.url_helpers
end
set.draw do |map|
set.draw do
match ':action', :to => controller
get 'get/:action', :to => controller
end

2
actionpack/test/controller/mime_responds_test.rb
View File

@ -876,7 +876,7 @@ def test_error_is_raised_if_no_respond_to_is_declared_and_respond_with_is_called
private
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
resources :customers
resources :quiz_stores do
resources :customers

3
actionpack/test/controller/new_base/render_action_test.rb
View File

@ -83,6 +83,9 @@ class RenderActionTest < Rack::TestCase
end
class RenderLayoutTest < Rack::TestCase
def setup
end
describe "Both <controller_path>.html.erb and application.html.erb are missing"
test "rendering with layout => true" do

2
actionpack/test/controller/redirect_test.rb
View File

@ -232,7 +232,7 @@ def test_redirect_to_back_with_no_referer
def test_redirect_to_record
with_routing do |set|
set.draw do |map|
set.draw do
resources :workshops
match ':controller/:action'
end

2
actionpack/test/controller/render_test.rb
View File

@ -1120,7 +1120,7 @@ def test_head_with_location_header
def test_head_with_location_object
with_routing do |set|
set.draw do |map|
set.draw do
resources :customers
match ':controller/:action'
end

5
actionpack/test/controller/render_xml_test.rb
View File

@ -70,10 +70,9 @@ def test_rendering_xml_should_call_to_xml_with_extra_options
def test_rendering_with_object_location_should_set_header_with_url_for
with_routing do |set|
set.draw do |map|
set.draw do
resources :customers
# match ':controller/:action'
map.connect ':controller/:action/:id'
match ':controller/:action'
end
get :render_with_object_location

2
actionpack/test/controller/rescue_test.rb
View File

@ -371,7 +371,7 @@ def show_errors(exception)
private
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match 'foo', :to => ::RescueTest::TestController.action(:foo)
match 'invalid', :to => ::RescueTest::TestController.action(:invalid)
match 'b00m', :to => ::RescueTest::TestController.action(:b00m)

340
actionpack/test/controller/resources_test.rb
View File

@ -1,5 +1,6 @@
require 'abstract_unit'
require 'active_support/core_ext/object/try'
require 'active_support/core_ext/object/with_options'
class ResourcesController < ActionController::Base
def index() render :nothing => true end
@ -32,36 +33,6 @@ class ImagesController < ResourcesController; end
end
class ResourcesTest < ActionController::TestCase
def test_should_arrange_actions
resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
:collection => { :rss => :get, :reorder => :post, :csv => :post },
:member => { :rss => :get, :atom => :get, :upload => :post, :fix => :post },
:new => { :preview => :get, :draft => :get }}, {})
assert_resource_methods [:rss], resource, :collection, :get
assert_resource_methods [:csv, :reorder], resource, :collection, :post
assert_resource_methods [:edit, :rss, :atom], resource, :member, :get
assert_resource_methods [:upload, :fix], resource, :member, :post
assert_resource_methods [:new, :preview, :draft], resource, :new, :get
end
def test_should_resource_controller_name_equal_resource_name_by_default
resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {}, {})
assert_equal 'messages', resource.controller
end
def test_should_resource_controller_name_equal_controller_option
resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {:controller => 'posts'}, {})
assert_equal 'posts', resource.controller
end
def test_should_all_singleton_paths_be_the_same
[ :path, :nesting_path_prefix, :member_path ].each do |method|
resource = ActionDispatch::Routing::DeprecatedMapper::SingletonResource.new(:messages, {:path_prefix => 'admin'}, {})
assert_equal 'admin/messages', resource.send(method)
end
end
def test_default_restful_routes
with_restful_routing :messages do
assert_simply_restful_for :messages
@ -69,9 +40,9 @@ def test_default_restful_routes
end
def test_override_paths_for_member_and_collection_methods
collection_methods = { 'rss' => :get, 'reorder' => :post, 'csv' => :post }
member_methods = { 'rss' => :get, :atom => :get, :upload => :post, :fix => :post }
path_names = {:new => 'nuevo', 'rss' => 'canal', :fix => 'corrigir' }
collection_methods = { :rss => :get, :reorder => :post, :csv => :post }
member_methods = { :rss => :get, :atom => :get, :upload => :post, :fix => :post }
path_names = {:new => 'nuevo', :rss => 'canal', :fix => 'corrigir' }
with_restful_routing :messages,
:collection => collection_methods,
@ -89,7 +60,7 @@ def test_override_paths_for_member_and_collection_methods
end
collection_methods.each do |action, method|
assert_recognizes(options.merge(:action => action),
assert_recognizes(options.merge(:action => action.to_s),
:path => "/messages/#{path_names[action] || action}",
:method => method)
end
@ -112,12 +83,6 @@ def test_override_paths_for_member_and_collection_methods
end
end
def test_override_paths_for_default_restful_actions
resource = ActionDispatch::Routing::DeprecatedMapper::Resource.new(:messages, {
:path_names => {:new => 'nuevo', :edit => 'editar'}}, {})
assert_equal resource.new_path, "#{resource.path}/nuevo"
end
def test_multiple_default_restful_routes
with_restful_routing :messages, :comments do
assert_simply_restful_for :messages
@ -131,7 +96,7 @@ def test_with_custom_conditions
end
end
def test_irregular_id_with_no_requirements_should_raise_error
def test_irregular_id_with_no_constraints_should_raise_error
expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
with_restful_routing :messages do
@ -141,25 +106,25 @@ def test_irregular_id_with_no_requirements_should_raise_error
end
end
def test_irregular_id_with_requirements_should_pass
def test_irregular_id_with_constraints_should_pass
expected_options = {:controller => 'messages', :action => 'show', :id => '1.1.1'}
with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
with_restful_routing(:messages, :constraints => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
assert_recognizes(expected_options, :path => 'messages/1.1.1', :method => :get)
end
end
def test_with_path_prefix_requirements
def test_with_path_prefix_constraints
expected_options = {:controller => 'messages', :action => 'show', :thread_id => '1.1.1', :id => '1'}
with_restful_routing :messages, :path_prefix => '/thread/:thread_id', :requirements => {:thread_id => /[0-9]\.[0-9]\.[0-9]/} do
with_restful_routing :messages, :path_prefix => '/thread/:thread_id', :constraints => {:thread_id => /[0-9]\.[0-9]\.[0-9]/} do
assert_recognizes(expected_options, :path => 'thread/1.1.1/messages/1', :method => :get)
end
end
def test_irregular_id_requirements_should_get_passed_to_member_actions
def test_irregular_id_constraints_should_get_passed_to_member_actions
expected_options = {:controller => 'messages', :action => 'custom', :id => '1.1.1'}
with_restful_routing(:messages, :member => {:custom => :get}, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
with_restful_routing(:messages, :member => {:custom => :get}, :constraints => {:id => /[0-9]\.[0-9]\.[0-9]/}) do
assert_recognizes(expected_options, :path => 'messages/1.1.1/custom', :method => :get)
end
end
@ -274,7 +239,7 @@ def test_with_member_action
def test_with_member_action_and_requirement
expected_options = {:controller => 'messages', :action => 'mark', :id => '1.1.1'}
with_restful_routing(:messages, :requirements => {:id => /[0-9]\.[0-9]\.[0-9]/}, :member => { :mark => :get }) do
with_restful_routing(:messages, :constraints => {:id => /[0-9]\.[0-9]\.[0-9]/}, :member => { :mark => :get }) do
assert_recognizes(expected_options, :path => 'messages/1.1.1/mark', :method => :get)
end
end
@ -411,10 +376,10 @@ def test_override_new_method
def test_nested_restful_routes
with_routing do |set|
set.draw do |map|
map.resources :threads do |map|
map.resources :messages do |map|
map.resources :comments
set.draw do
resources :threads do
resources :messages do
resources :comments
end
end
end
@ -433,10 +398,10 @@ def test_nested_restful_routes
def test_nested_restful_routes_with_overwritten_defaults
with_routing do |set|
set.draw do |map|
map.resources :threads do |map|
map.resources :messages, :name_prefix => nil do |map|
map.resources :comments, :name_prefix => nil
set.draw do
resources :threads do
resources :messages, :name_prefix => nil do
resources :comments, :name_prefix => nil
end
end
end
@ -453,10 +418,10 @@ def test_nested_restful_routes_with_overwritten_defaults
def test_shallow_nested_restful_routes
with_routing do |set|
set.draw do |map|
map.resources :threads, :shallow => true do |map|
map.resources :messages do |map|
map.resources :comments
set.draw do
resources :threads, :shallow => true do
resources :messages do
resources :comments
end
end
end
@ -478,11 +443,11 @@ def test_shallow_nested_restful_routes
def test_shallow_nested_restful_routes_with_namespaces
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |map|
map.namespace :admin do |map|
map.resources :products, :shallow => true do |map|
map.resources :images
set.draw do
namespace :backoffice do
namespace :admin do
resources :products, :shallow => true do
resources :images
end
end
end
@ -531,9 +496,9 @@ def test_should_create_multiple_singleton_resource_routes
def test_should_create_nested_singleton_resource_routes
with_routing do |set|
set.draw do |map|
map.resource :admin, :controller => 'admin' do |admin|
admin.resource :account
set.draw do
resource :admin, :controller => 'admin' do
resource :account
end
end
@ -544,8 +509,8 @@ def test_should_create_nested_singleton_resource_routes
def test_resource_has_many_should_become_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :messages, :has_many => [ :comments, :authors ]
set.draw do
resources :messages, :has_many => [ :comments, :authors ]
end
assert_simply_restful_for :messages
@ -556,8 +521,8 @@ def test_resource_has_many_should_become_nested_resources
def test_resources_has_many_hash_should_become_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :threads, :has_many => { :messages => [ :comments, { :authors => :threads } ] }
set.draw do
resources :threads, :has_many => { :messages => [ :comments, { :authors => :threads } ] }
end
assert_simply_restful_for :threads
@ -570,8 +535,8 @@ def test_resources_has_many_hash_should_become_nested_resources
def test_shallow_resource_has_many_should_become_shallow_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :messages, :has_many => [ :comments, :authors ], :shallow => true
set.draw do
resources :messages, :has_many => [ :comments, :authors ], :shallow => true
end
assert_simply_restful_for :messages, :shallow => true
@ -582,8 +547,8 @@ def test_shallow_resource_has_many_should_become_shallow_nested_resources
def test_resource_has_one_should_become_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :messages, :has_one => :logo
set.draw do
resources :messages, :has_one => :logo
end
assert_simply_restful_for :messages
@ -593,8 +558,8 @@ def test_resource_has_one_should_become_nested_resources
def test_shallow_resource_has_one_should_become_shallow_nested_resources
with_routing do |set|
set.draw do |map|
map.resources :messages, :has_one => :logo, :shallow => true
set.draw do
resources :messages, :has_one => :logo, :shallow => true
end
assert_simply_restful_for :messages, :shallow => true
@ -638,9 +603,9 @@ def test_singleton_resource_with_two_member_actions_with_same_method
def test_should_nest_resources_in_singleton_resource
with_routing do |set|
set.draw do |map|
map.resource :account do |account|
account.resources :messages
set.draw do
resource :account do
resources :messages
end
end
@ -651,9 +616,9 @@ def test_should_nest_resources_in_singleton_resource
def test_should_nest_resources_in_singleton_resource_with_path_prefix
with_routing do |set|
set.draw do |map|
map.resource(:account, :path_prefix => ':site_id') do |account|
account.resources :messages
set.draw do
resource(:account, :path_prefix => ':site_id') do
resources :messages
end
end
@ -664,9 +629,9 @@ def test_should_nest_resources_in_singleton_resource_with_path_prefix
def test_should_nest_singleton_resource_in_resources
with_routing do |set|
set.draw do |map|
map.resources :threads do |thread|
thread.resource :admin, :controller => 'admin'
set.draw do
resources :threads do
resource :admin, :controller => 'admin'
end
end
@ -694,8 +659,8 @@ def test_should_not_allow_delete_or_put_on_collection_path
def test_should_not_allow_invalid_head_method_for_member_routes
with_routing do |set|
assert_raise(ArgumentError) do
set.draw do |map|
map.resources :messages, :member => {:something => :head}
set.draw do
resources :messages, :member => {:something => :head}
end
end
end
@ -704,8 +669,8 @@ def test_should_not_allow_invalid_head_method_for_member_routes
def test_should_not_allow_invalid_http_methods_for_member_routes
with_routing do |set|
assert_raise(ArgumentError) do
set.draw do |map|
map.resources :messages, :member => {:something => :invalid}
set.draw do
resources :messages, :member => {:something => :invalid}
end
end
end
@ -713,9 +678,9 @@ def test_should_not_allow_invalid_http_methods_for_member_routes
def test_resource_action_separator
with_routing do |set|
set.draw do |map|
map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
set.draw do
resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
end
action_separator = ActionController::Base.resource_action_separator
@ -733,8 +698,8 @@ def test_resource_action_separator
def test_new_style_named_routes_for_resource
with_routing do |set|
set.draw do |map|
map.resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
set.draw do
resources :messages, :collection => {:search => :get}, :new => {:preview => :any}, :name_prefix => 'thread_', :path_prefix => '/threads/:thread_id'
end
assert_simply_restful_for :messages, :name_prefix => 'thread_', :path_prefix => 'threads/1/', :options => { :thread_id => '1' }
assert_named_route "/threads/1/messages/search", "search_thread_messages_path", {}
@ -745,8 +710,8 @@ def test_new_style_named_routes_for_resource
def test_new_style_named_routes_for_singleton_resource
with_routing do |set|
set.draw do |map|
map.resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
set.draw do
resource :account, :member => {:login => :get}, :new => {:preview => :any}, :name_prefix => 'admin_', :path_prefix => '/admin'
end
assert_singleton_restful_for :account, :name_prefix => 'admin_', :path_prefix => 'admin/'
assert_named_route "/admin/account/login", "login_admin_account_path", {}
@ -757,9 +722,9 @@ def test_new_style_named_routes_for_singleton_resource
def test_resources_in_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.resources :products
set.draw do
namespace :backoffice do
resources :products
end
end
@ -769,9 +734,9 @@ def test_resources_in_namespace
def test_resource_has_many_in_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.resources :products, :has_many => :tags
set.draw do
namespace :backoffice do
resources :products, :has_many => :tags
end
end
@ -782,9 +747,9 @@ def test_resource_has_many_in_namespace
def test_resource_has_one_in_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.resources :products, :has_one => :manufacturer
set.draw do
namespace :backoffice do
resources :products, :has_one => :manufacturer
end
end
@ -795,10 +760,10 @@ def test_resource_has_one_in_namespace
def test_resources_in_nested_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.namespace :admin do |admin|
admin.resources :products
set.draw do
namespace :backoffice do
backoffice.namespace :admin do
resources :products
end
end
end
@ -809,8 +774,8 @@ def test_resources_in_nested_namespace
def test_resources_using_namespace
with_routing do |set|
set.draw do |map|
map.resources :products, :namespace => "backoffice/"
set.draw do
resources :products, :namespace => "backoffice/"
end
assert_simply_restful_for :products, :controller => "backoffice/products"
@ -819,9 +784,9 @@ def test_resources_using_namespace
def test_nested_resources_using_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.resources :products do |products|
set.draw do
namespace :backoffice do
resources :products do
products.resources :images
end
end
@ -833,10 +798,10 @@ def test_nested_resources_using_namespace
def test_nested_resources_in_nested_namespace
with_routing do |set|
set.draw do |map|
map.namespace :backoffice do |backoffice|
backoffice.namespace :admin do |admin|
admin.resources :products do |products|
set.draw do
namespace :backoffice do
backoffice.namespace :admin do
resources :products do
products.resources :images
end
end
@ -863,12 +828,12 @@ def test_with_path_segment
def test_multiple_with_path_segment_and_controller
with_routing do |set|
set.draw do |map|
map.resources :products do |products|
set.draw do
resources :products do
products.resources :product_reviews, :as => 'reviews', :controller => 'messages'
end
map.resources :tutors do |tutors|
tutors.resources :tutor_reviews, :as => 'reviews', :controller => 'comments'
resources :tutors do
resources :tutor_reviews, :as => 'reviews', :controller => 'comments'
end
end
@ -877,17 +842,22 @@ def test_multiple_with_path_segment_and_controller
end
end
def test_with_path_segment_path_prefix_requirements
def test_with_path_segment_path_prefix_constraints
expected_options = {:controller => 'messages', :action => 'show', :thread_id => '1.1.1', :id => '1'}
with_restful_routing :messages, :as => 'comments',:path_prefix => '/thread/:thread_id', :requirements => { :thread_id => /[0-9]\.[0-9]\.[0-9]/ } do
with_routing do |set|
set.draw do
scope '/thread/:thread_id', :constraints => { :thread_id => /[0-9]\.[0-9]\.[0-9]/ } do
resources :messages, :as => 'comments'
end
end
assert_recognizes(expected_options, :path => 'thread/1.1.1/comments/1', :method => :get)
end
end
def test_resource_has_only_show_action
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :show
set.draw do
resources :products, :only => :show
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, :show, [:index, :new, :create, :edit, :update, :destroy])
@ -897,8 +867,8 @@ def test_resource_has_only_show_action
def test_singleton_resource_has_only_show_action
with_routing do |set|
set.draw do |map|
map.resource :account, :only => :show
set.draw do
resource :account, :only => :show
end
assert_singleton_resource_allowed_routes('accounts', {}, :show, [:index, :new, :create, :edit, :update, :destroy])
@ -908,8 +878,8 @@ def test_singleton_resource_has_only_show_action
def test_resource_does_not_have_destroy_action
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :destroy
set.draw do
resources :products, :except => :destroy
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, [:index, :new, :create, :show, :edit, :update], :destroy)
@ -919,8 +889,8 @@ def test_resource_does_not_have_destroy_action
def test_singleton_resource_does_not_have_destroy_action
with_routing do |set|
set.draw do |map|
map.resource :account, :except => :destroy
set.draw do
resource :account, :except => :destroy
end
assert_singleton_resource_allowed_routes('accounts', {}, [:new, :create, :show, :edit, :update], :destroy)
@ -930,8 +900,8 @@ def test_singleton_resource_does_not_have_destroy_action
def test_resource_has_only_create_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :create
set.draw do
resources :products, :only => :create
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, :create, [:index, :new, :show, :edit, :update, :destroy])
@ -943,8 +913,8 @@ def test_resource_has_only_create_action_and_named_route
def test_resource_has_only_update_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :update
set.draw do
resources :products, :only => :update
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, :update, [:index, :new, :create, :show, :edit, :destroy])
@ -956,8 +926,8 @@ def test_resource_has_only_update_action_and_named_route
def test_resource_has_only_destroy_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :destroy
set.draw do
resources :products, :only => :destroy
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, :destroy, [:index, :new, :create, :show, :edit, :update])
@ -969,8 +939,8 @@ def test_resource_has_only_destroy_action_and_named_route
def test_singleton_resource_has_only_create_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resource :account, :only => :create
set.draw do
resource :account, :only => :create
end
assert_singleton_resource_allowed_routes('accounts', {}, :create, [:new, :show, :edit, :update, :destroy])
@ -982,8 +952,8 @@ def test_singleton_resource_has_only_create_action_and_named_route
def test_singleton_resource_has_only_update_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resource :account, :only => :update
set.draw do
resource :account, :only => :update
end
assert_singleton_resource_allowed_routes('accounts', {}, :update, [:new, :create, :show, :edit, :destroy])
@ -995,8 +965,8 @@ def test_singleton_resource_has_only_update_action_and_named_route
def test_singleton_resource_has_only_destroy_action_and_named_route
with_routing do |set|
set.draw do |map|
map.resource :account, :only => :destroy
set.draw do
resource :account, :only => :destroy
end
assert_singleton_resource_allowed_routes('accounts', {}, :destroy, [:new, :create, :show, :edit, :update])
@ -1008,8 +978,8 @@ def test_singleton_resource_has_only_destroy_action_and_named_route
def test_resource_has_only_collection_action
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :all, :collection => { :sale => :get }
set.draw do
resources :products, :except => :all, :collection => { :sale => :get }
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
@ -1022,8 +992,8 @@ def test_resource_has_only_collection_action
def test_resource_has_only_member_action
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :all, :member => { :preview => :get }
set.draw do
resources :products, :except => :all, :member => { :preview => :get }
end
assert_resource_allowed_routes('products', {}, { :id => '1' }, [], [:index, :new, :create, :show, :edit, :update, :destroy])
@ -1036,8 +1006,8 @@ def test_resource_has_only_member_action
def test_singleton_resource_has_only_member_action
with_routing do |set|
set.draw do |map|
map.resource :account, :except => :all, :member => { :signup => :get }
set.draw do
resource :account, :except => :all, :member => { :signup => :get }
end
assert_singleton_resource_allowed_routes('accounts', {}, [], [:new, :create, :show, :edit, :update, :destroy])
@ -1050,9 +1020,9 @@ def test_singleton_resource_has_only_member_action
def test_nested_resource_has_only_show_and_member_action
with_routing do |set|
set.draw do |map|
map.resources :products, :only => [:index, :show] do |product|
product.resources :images, :member => { :thumbnail => :get }, :only => :show
set.draw do
resources :products, :only => [:index, :show] do
resources :images, :member => { :thumbnail => :get }, :only => :show
end
end
@ -1066,9 +1036,9 @@ def test_nested_resource_has_only_show_and_member_action
def test_nested_resource_does_not_inherit_only_option
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :show do |product|
product.resources :images, :except => :destroy
set.draw do
resources :products, :only => :show do
resources :images, :except => :destroy
end
end
@ -1079,9 +1049,9 @@ def test_nested_resource_does_not_inherit_only_option
def test_nested_resource_does_not_inherit_only_option_by_default
with_routing do |set|
set.draw do |map|
map.resources :products, :only => :show do |product|
product.resources :images
set.draw do
resources :products, :only => :show do
resources :images
end
end
@ -1092,9 +1062,9 @@ def test_nested_resource_does_not_inherit_only_option_by_default
def test_nested_resource_does_not_inherit_except_option
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :show do |product|
product.resources :images, :only => :destroy
set.draw do
resources :products, :except => :show do
resources :images, :only => :destroy
end
end
@ -1105,9 +1075,9 @@ def test_nested_resource_does_not_inherit_except_option
def test_nested_resource_does_not_inherit_except_option_by_default
with_routing do |set|
set.draw do |map|
map.resources :products, :except => :show do |product|
product.resources :images
set.draw do
resources :products, :except => :show do
resources :images
end
end
@ -1118,8 +1088,8 @@ def test_nested_resource_does_not_inherit_except_option_by_default
def test_default_singleton_restful_route_uses_get
with_routing do |set|
set.draw do |map|
map.resource :product
set.draw do
resource :product
end
assert_routing '/product', :controller => 'products', :action => 'show'
@ -1135,15 +1105,41 @@ def test_singleton_resource_name_is_not_singularized
protected
def with_restful_routing(*args)
options = args.extract_options!
collection_methods = options.delete(:collection)
member_methods = options.delete(:member)
path_prefix = options.delete(:path_prefix)
args.push(options)
with_routing do |set|
set.draw { |map| map.resources(*args) }
set.draw do
scope(path_prefix || '') do
resources(*args) do
if collection_methods
collection do
collection_methods.each do |name, method|
send(method, name)
end
end
end
if member_methods
member do
member_methods.each do |name, method|
send(method, name)
end
end
end
end
end
end
yield
end
end
def with_singleton_resources(*args)
with_routing do |set|
set.draw { |map| map.resource(*args) }
set.draw {resource(*args) }
yield
end
end
@ -1385,7 +1381,7 @@ def assert_not_recognizes(expected_options, path)
end
def distinct_routes? (r1, r2)
if r1.conditions == r2.conditions and r1.requirements == r2.requirements then
if r1.conditions == r2.conditions and r1.constraints == r2.constraints then
if r1.segments.collect(&:to_s) == r2.segments.collect(&:to_s) then
return false
end

675
actionpack/test/controller/routing_test.rb
View File

File diff suppressed because it is too large Load Diff

13
actionpack/test/controller/test_test.rb
View File

@ -135,6 +135,11 @@ def setup
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
@request.env['PATH_INFO'] = nil
@routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
r.draw do
match ':controller(/:action(/:id))'
end
end
end
def test_raw_post_handling
@ -454,7 +459,7 @@ def test_assert_routing
def test_assert_routing_with_method
with_routing do |set|
set.draw { |map| map.resources(:content) }
set.draw { resources(:content) }
assert_routing({ :method => 'post', :path => 'content' }, { :controller => 'content', :action => 'create' })
end
end
@ -465,7 +470,7 @@ def test_assert_routing_in_module
def test_assert_routing_with_glob
with_routing do |set|
set.draw { |map| match('*path' => "pages#show") }
set.draw { match('*path' => "pages#show") }
assert_routing('/company/about', { :controller => 'pages', :action => 'show', :path => 'company/about' })
end
end
@ -487,7 +492,7 @@ def test_id_converted_to_string
def test_array_path_parameter_handled_properly
with_routing do |set|
set.draw do |map|
set.draw do
match 'file/*path', :to => 'test_test/test#test_params'
match ':controller/:action'
end
@ -702,7 +707,7 @@ class NamedRoutesControllerTest < ActionController::TestCase
def test_should_be_able_to_use_named_routes_before_a_request_is_done
with_routing do |set|
set.draw { |map| resources :contents }
set.draw { resources :contents }
assert_equal 'http://test.host/contents/new', new_content_url
assert_equal 'http://test.host/contents/1', content_url(:id => 1)
end

8
actionpack/test/controller/url_for_test.rb
View File

@ -130,7 +130,7 @@ def test_relative_url_root_is_respected
def test_named_routes
with_routing do |set|
set.draw do |map|
set.draw do
match 'this/is/verbose', :to => 'home#index', :as => :no_args
match 'home/sweet/home/:user', :to => 'home#index', :as => :home
end
@ -151,7 +151,7 @@ def test_named_routes
def test_relative_url_root_is_respected_for_named_routes
with_routing do |set|
set.draw do |map|
set.draw do
match '/home/sweet/home/:user', :to => 'home#index', :as => :home
end
@ -165,7 +165,7 @@ def test_relative_url_root_is_respected_for_named_routes
def test_only_path
with_routing do |set|
set.draw do |map|
set.draw do
match 'home/sweet/home/:user', :to => 'home#index', :as => :home
match ':controller/:action/:id'
end
@ -233,7 +233,7 @@ def test_path_generation_for_symbol_parameter_keys
def test_named_routes_with_nil_keys
with_routing do |set|
set.draw do |map|
set.draw do
match 'posts.:format', :to => 'posts#index', :as => :posts
match '/', :to => 'posts#index', :as => :main
end

5
actionpack/test/controller/url_rewriter_test.rb
View File

@ -19,6 +19,11 @@ def setup
@request = ActionController::TestRequest.new
@params = {}
@rewriter = Rewriter.new(@request) #.new(@request, @params)
@routes = ActionDispatch::Routing::RouteSet.new.tap do |r|
r.draw do
match ':controller(/:action(/:id))'
end
end
end
def test_port

2
actionpack/test/controller/webservice_test.rb
View File

@ -254,7 +254,7 @@ def with_params_parsers(parsers = {})
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
match '/', :to => 'web_service_test/test#assign_parameters'
end
yield

2
actionpack/test/dispatch/request/json_params_parsing_test.rb
View File

@ -56,7 +56,7 @@ def assert_parses(expected, actual, headers = {})
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::JsonParamsParsingTest::TestController
end
yield

2
actionpack/test/dispatch/request/multipart_params_parsing_test.rb
View File

@ -156,7 +156,7 @@ def parse_multipart(name)
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => 'multipart_params_parsing_test/test'
end
yield

2
actionpack/test/dispatch/request/query_string_parsing_test.rb
View File

@ -108,7 +108,7 @@ def teardown
private
def assert_parses(expected, actual)
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::QueryStringParsingTest::TestController
end

2
actionpack/test/dispatch/request/url_encoded_params_parsing_test.rb
View File

@ -129,7 +129,7 @@ def teardown
private
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::UrlEncodedParamsParsingTest::TestController
end
yield

2
actionpack/test/dispatch/request/xml_params_parsing_test.rb
View File

@ -96,7 +96,7 @@ def call(env)
private
def with_test_routing
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::XmlParamsParsingTest::TestController
end
yield

2
actionpack/test/dispatch/session/cookie_store_test.rb
View File

@ -298,7 +298,7 @@ def get(path, parameters = nil, env = {})
def with_test_route_set(options = {})
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::CookieStoreTest::TestController
end

2
actionpack/test/dispatch/session/mem_cache_store_test.rb
View File

@ -174,7 +174,7 @@ def test_prevents_session_fixation
private
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
match ':action', :to => ::MemCacheStoreTest::TestController
end

2
actionpack/test/template/atom_feed_helper_test.rb
View File

@ -314,7 +314,7 @@ def test_feed_xhtml
private
def with_restful_routing(resources)
with_routing do |set|
set.draw do |map|
set.draw do
resources(resources)
end
yield

4
actionpack/test/template/test_case_test.rb
View File

@ -172,7 +172,7 @@ class ATestHelperTest < ActionView::TestCase
test "is able to use named routes" do
with_routing do |set|
set.draw { |map| resources :contents }
set.draw { resources :contents }
assert_equal 'http://test.host/contents/new', new_content_url
assert_equal 'http://test.host/contents/1', content_url(:id => 1)
end
@ -180,7 +180,7 @@ class ATestHelperTest < ActionView::TestCase
test "named routes can be used from helper included in view" do
with_routing do |set|
set.draw { |map| resources :contents }
set.draw { resources :contents }
_helpers.module_eval do
def render_from_helper
new_content_url

2
actionpack/test/template/test_test.rb
View File

@ -47,7 +47,7 @@ def test_link_to_person
private
def with_test_route_set
with_routing do |set|
set.draw do |map|
set.draw do
match 'people', :to => 'people#index', :as => :people
end
yield

5
actionpack/test/template/url_helper_test.rb
View File

@ -394,7 +394,7 @@ def sort_query_string_params(uri)
class UrlHelperControllerTest < ActionController::TestCase
class UrlHelperController < ActionController::Base
test_routes do |map|
test_routes do
match 'url_helper_controller_test/url_helper/show/:id',
:to => 'url_helper_controller_test/url_helper#show',
:as => :show
@ -407,8 +407,7 @@ class UrlHelperController < ActionController::Base
:to => 'url_helper_controller_test/url_helper#show_named_route',
:as => :show_named_route
map.connect ":controller/:action/:id"
# match "/:controller(/:action(/:id))"
match "/:controller(/:action(/:id))"
match 'url_helper_controller_test/url_helper/normalize_recall_params',
:to => UrlHelperController.action(:normalize_recall),