mirror of
https://github.com/rails/rails.git
synced 2022-11-09 12:12:34 -05:00
More test porting
This commit is contained in:
parent
511cef296b
commit
9fbde11b8b
3 changed files with 9 additions and 10 deletions
|
@ -70,8 +70,8 @@ class PageCachingTest < ActionController::TestCase
|
|||
def test_page_caching_resources_saves_to_correct_path_with_extension_even_if_default_route
|
||||
with_routing do |set|
|
||||
set.draw do |map|
|
||||
map.main '', :controller => 'posts', :format => nil
|
||||
map.formatted_posts 'posts.:format', :controller => 'posts'
|
||||
match 'posts.:format', :to => 'posts#index', :as => :formatted_posts
|
||||
match '/', :to => 'posts#index', :as => :main
|
||||
end
|
||||
@params[:format] = 'rss'
|
||||
assert_equal '/posts.rss', @rewriter.rewrite(@params)
|
||||
|
@ -422,8 +422,7 @@ class ActionCacheTest < ActionController::TestCase
|
|||
def test_xml_version_of_resource_is_treated_as_different_cache
|
||||
with_routing do |set|
|
||||
set.draw do |map|
|
||||
map.connect ':controller/:action.:format'
|
||||
map.connect ':controller/:action'
|
||||
match ':controller(/:action(.:format))'
|
||||
end
|
||||
|
||||
get :index, :format => 'xml'
|
||||
|
|
|
@ -456,8 +456,8 @@ XML
|
|||
def test_array_path_parameter_handled_properly
|
||||
with_routing do |set|
|
||||
set.draw do |map|
|
||||
map.connect 'file/*path', :controller => 'test_test/test', :action => 'test_params'
|
||||
map.connect ':controller/:action/:id'
|
||||
match 'file/*path', :to => 'test_test/test#test_params'
|
||||
match ':controller/:action'
|
||||
end
|
||||
|
||||
get :test_params, :path => ['hello', 'world']
|
||||
|
@ -662,7 +662,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| map.resources :contents }
|
||||
set.draw { |map| resources :contents }
|
||||
assert_equal 'http://test.host/contents/new', new_content_url
|
||||
assert_equal 'http://test.host/contents/1', content_url(:id => 1)
|
||||
end
|
||||
|
|
|
@ -331,8 +331,8 @@ class UrlWriterTests < ActionController::TestCase
|
|||
def test_named_routes_with_nil_keys
|
||||
with_routing do |set|
|
||||
set.draw do |map|
|
||||
map.main '', :controller => 'posts', :format => nil
|
||||
map.resources :posts
|
||||
match 'posts.:format', :to => 'posts#index', :as => :posts
|
||||
match '/', :to => 'posts#index', :as => :main
|
||||
end
|
||||
|
||||
# We need to create a new class in order to install the new named route.
|
||||
|
@ -350,7 +350,7 @@ class UrlWriterTests < ActionController::TestCase
|
|||
def test_formatted_url_methods_are_deprecated
|
||||
with_routing do |set|
|
||||
set.draw do |map|
|
||||
map.resources :posts
|
||||
resources :posts
|
||||
end
|
||||
# We need to create a new class in order to install the new named route.
|
||||
kls = Class.new { include ActionController::UrlWriter }
|
||||
|
|
Loading…
Reference in a new issue