Merge branch 'master' of https://github.com/rails/rails

1 files changed, 595 insertions, 21 deletions

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 3f090b7254..5e5758a60e 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -13,6 +13,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  class YoutubeFavoritesRedirector
+    def self.call(params, request)
+      "http://www.youtube.com/watch?v=#{params[:youtube_id]}"
+    end
+  end
+
   stub_controllers do |routes|
     Routes = routes
     Routes.draw do
@@ -40,11 +46,29 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         get  :new, :path => "build"
         post :create, :path => "create", :as => ""
         put  :update
+        get  :remove, :action => :destroy, :as => :remove
+      end
+
+      scope "pagemark", :controller => "pagemarks", :as => :pagemark do
+        get  "new", :path => "build"
+        post "create", :as => ""
+        put  "update"
         get  "remove", :action => :destroy, :as => :remove
       end
 
       match 'account/logout' => redirect("/logout"), :as => :logout_redirect
       match 'account/login', :to => redirect("/login")
+      match 'secure', :to => redirect("/secure/login")
+
+      match 'mobile', :to => redirect(:subdomain => 'mobile')
+      match 'documentation', :to => redirect(:domain => 'example-documentation.com', :path => '')
+      match 'new_documentation', :to => redirect(:path => '/documentation/new')
+      match 'super_new_documentation', :to => redirect(:host => 'super-docs.com')
+
+      match 'stores/:name',        :to => redirect(:subdomain => 'stores', :path => '/%{name}')
+      match 'stores/:name(*rest)', :to => redirect(:subdomain => 'stores', :path => '/%{name}%{rest}')
+
+      match 'youtube_favorites/:youtube_id/:name', :to => redirect(YoutubeFavoritesRedirector)
 
       constraints(lambda { |req| true }) do
         match 'account/overview'
@@ -128,7 +152,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
           end
 
           member do
-            get  :some_path_with_name
+            get  'some_path_with_name'
             put  :accessible_projects
             post :resend, :generate_new_password
           end
@@ -147,6 +171,11 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       resources :replies do
+        collection do
+          get 'page/:page' => 'replies#index', :page => %r{\d+}
+          get ':page' => 'replies#index', :page => %r{\d+}
+        end
+
         new do
           post :preview
         end
@@ -158,7 +187,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       resources :posts, :only => [:index, :show] do
-        resources :comments, :except => :destroy
+        namespace :admin do
+          root :to => "index#index"
+        end
+        resources :comments, :except => :destroy do
+          get "views" => "comments#views", :as => :views
+        end
       end
 
       resource  :past, :only => :destroy
@@ -176,6 +210,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
+      scope '/hello' do
+        shallow do
+          resources :notes do
+            resources :trackbacks
+          end
+        end
+      end
+
       resources :threads, :shallow => true do
         resource :owner
         resources :messages do
@@ -187,7 +229,9 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
-      resources :sheep
+      resources :sheep do
+        get "_it", :on => :member
+      end
 
       resources :clients do
         namespace :google do
@@ -200,22 +244,28 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       end
 
       resources :customers do
-        get "recent" => "customers#recent", :as => :recent, :on => :collection
-        get "profile" => "customers#profile", :as => :profile, :on => :member
-        post "preview" => "customers#preview", :as => :preview, :on => :new
+        get :recent, :on => :collection
+        get "profile", :on => :member
+        get "secret/profile" => "customers#secret", :on => :member
+        post "preview" => "customers#preview", :as => :another_preview, :on => :new
         resource :avatar do
-          get "thumbnail(.:format)" => "avatars#thumbnail", :as => :thumbnail, :on => :member
+          get "thumbnail" => "avatars#thumbnail", :as => :thumbnail, :on => :member
         end
         resources :invoices do
-          get "outstanding" => "invoices#outstanding", :as => :outstanding, :on => :collection
+          get "outstanding" => "invoices#outstanding", :on => :collection
           get "overdue", :to => :overdue, :on => :collection
           get "print" => "invoices#print", :as => :print, :on => :member
           post "preview" => "invoices#preview", :as => :preview, :on => :new
+          get "aged/:months", :on => :collection, :action => :aged, :as => :aged
         end
         resources :notes, :shallow => true do
           get "preview" => "notes#preview", :as => :preview, :on => :new
           get "print" => "notes#print", :as => :print, :on => :member
         end
+        get "inactive", :on => :collection
+        post "deactivate", :on => :member
+        get "old", :on => :collection, :as => :stale
+        get "export"
       end
 
       namespace :api do
@@ -337,6 +387,14 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       resources :content
 
+      namespace :transport do
+        resources :taxis
+      end
+
+      namespace :medical do
+        resource :taxis
+      end
+
       scope :constraints => { :id => /\d+/ } do
         get '/tickets', :to => 'tickets#index', :as => :tickets
       end
@@ -371,6 +429,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
+      namespace :wiki do
+        resources :articles, :id => /[^\/]+/ do
+          resources :comments, :only => [:create, :new]
+        end
+      end
+
+      resources :wiki_pages, :path => :pages
+      resource :wiki_account, :path => :my_account
+
       scope :only => :show do
         namespace :only do
           resources :sectors, :only => :index do
@@ -405,11 +472,41 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         end
       end
 
+      resources :sections, :id => /.+/ do
+        get :preview, :on => :member
+      end
+
+      scope :as => "routes" do
+        get "/c/:id", :as => :collision, :to => "collision#show"
+        get "/collision", :to => "collision#show"
+        get "/no_collision", :to => "collision#show", :as => nil
+
+        get "/fc/:id", :as => :forced_collision, :to => "forced_collision#show"
+        get "/forced_collision", :as => :forced_collision, :to => "forced_collision#show"
+      end
+
+      match '/purchases/:token/:filename',
+        :to => 'purchases#fetch',
+        :token => /[[:alnum:]]{10}/,
+        :filename => /(.+)/,
+        :as => :purchase
+
+      resources :lists, :id => /([A-Za-z0-9]{25})|default/ do
+        resources :todos, :id => /\d+/
+      end
+
+      scope '/countries/:country', :constraints => lambda { |params, req| %[all France].include?(params[:country]) } do
+        match '/',       :to => 'countries#index'
+        match '/cities', :to => 'countries#cities'
+      end
+
+      match '/countries/:country/(*other)', :to => redirect{ |params, req| params[:other] ? "/countries/all/#{params[:other]}" : '/countries/all' }
+
       match '/:locale/*file.:format', :to => 'files#show', :file => /path\/to\/existing\/file/
     end
   end
 
-  class TestAltApp < ActionController::IntegrationTest
+  class TestAltApp < ActionDispatch::IntegrationTest
     class AltRequest
       def initialize(env)
         @env = env
@@ -599,6 +696,55 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_redirect_hash_with_subdomain
+    with_test_routes do
+      get '/mobile'
+      verify_redirect 'http://mobile.example.com/mobile'
+    end
+  end
+
+  def test_redirect_hash_with_domain_and_path
+    with_test_routes do
+      get '/documentation'
+      verify_redirect 'http://www.example-documentation.com'
+    end
+  end
+
+  def test_redirect_hash_with_path
+    with_test_routes do
+      get '/new_documentation'
+      verify_redirect 'http://www.example.com/documentation/new'
+    end
+  end
+
+  def test_redirect_hash_with_host
+    with_test_routes do
+      get '/super_new_documentation?section=top'
+      verify_redirect 'http://super-docs.com/super_new_documentation?section=top'
+    end
+  end
+
+  def test_redirect_hash_path_substitution
+    with_test_routes do
+      get '/stores/iernest'
+      verify_redirect 'http://stores.example.com/iernest'
+    end
+  end
+
+  def test_redirect_hash_path_substitution_with_catch_all
+    with_test_routes do
+      get '/stores/iernest/products'
+      verify_redirect 'http://stores.example.com/iernest/products'
+    end
+  end
+
+  def test_redirect_class
+    with_test_routes do
+      get '/youtube_favorites/oHg5SJYRHA0/rick-rolld'
+      verify_redirect 'http://www.youtube.com/watch?v=oHg5SJYRHA0'
+    end
+  end
+
   def test_openid
     with_test_routes do
       get '/openid/login'
@@ -613,15 +759,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     with_test_routes do
       get '/bookmark/build'
       assert_equal 'bookmarks#new', @response.body
-      assert_equal '/bookmark/build', new_bookmark_path
+      assert_equal '/bookmark/build', bookmark_new_path
 
       post '/bookmark/create'
       assert_equal 'bookmarks#create', @response.body
       assert_equal '/bookmark/create', bookmark_path
 
-      put '/bookmark'
+      put '/bookmark/update'
       assert_equal 'bookmarks#update', @response.body
-      assert_equal '/bookmark', update_bookmark_path
+      assert_equal '/bookmark/update', bookmark_update_path
 
       get '/bookmark/remove'
       assert_equal 'bookmarks#destroy', @response.body
@@ -629,6 +775,26 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_pagemarks
+    with_test_routes do
+      get '/pagemark/build'
+      assert_equal 'pagemarks#new', @response.body
+      assert_equal '/pagemark/build', pagemark_new_path
+
+      post '/pagemark/create'
+      assert_equal 'pagemarks#create', @response.body
+      assert_equal '/pagemark/create', pagemark_path
+
+      put '/pagemark/update'
+      assert_equal 'pagemarks#update', @response.body
+      assert_equal '/pagemark/update', pagemark_update_path
+
+      get '/pagemark/remove'
+      assert_equal 'pagemarks#destroy', @response.body
+      assert_equal '/pagemark/remove', pagemark_remove_path
+    end
+  end
+
   def test_admin
     with_test_routes do
       get '/admin', {}, {'REMOTE_ADDR' => '192.168.1.100'}
@@ -963,6 +1129,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
       assert_equal '/sheep/1', sheep_path(1)
       assert_equal '/sheep/new', new_sheep_path
       assert_equal '/sheep/1/edit', edit_sheep_path(1)
+      assert_equal '/sheep/1/_it', _it_sheep_path(1)
     end
   end
 
@@ -1141,14 +1308,6 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
-  def test_index
-    with_test_routes do
-      assert_equal '/info', info_path
-      get '/info'
-      assert_equal 'projects#info', @response.body
-    end
-  end
-
   def test_match_shorthand_with_no_scope
     with_test_routes do
       assert_equal '/account/overview', account_overview_path
@@ -1165,6 +1324,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_dynamically_generated_helpers_on_collection_do_not_clobber_resources_url_helper
+    with_test_routes do
+      assert_equal '/replies', replies_path
+    end
+  end
+
   def test_scoped_controller_with_namespace_and_action
     with_test_routes do
       assert_equal '/account/twitter/callback', account_callback_path("twitter")
@@ -1524,11 +1689,66 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_shallow_nested_resources_within_scope
+    with_test_routes do
+
+      get '/hello/notes/1/trackbacks'
+      assert_equal 'trackbacks#index', @response.body
+      assert_equal '/hello/notes/1/trackbacks', note_trackbacks_path(:note_id => 1)
+
+      get '/hello/notes/1/edit'
+      assert_equal 'notes#edit', @response.body
+      assert_equal '/hello/notes/1/edit', edit_note_path(:id => '1')
+
+      get '/hello/notes/1/trackbacks/new'
+      assert_equal 'trackbacks#new', @response.body
+      assert_equal '/hello/notes/1/trackbacks/new', new_note_trackback_path(:note_id => 1)
+
+      get '/hello/trackbacks/1'
+      assert_equal 'trackbacks#show', @response.body
+      assert_equal '/hello/trackbacks/1', trackback_path(:id => '1')
+
+      get '/hello/trackbacks/1/edit'
+      assert_equal 'trackbacks#edit', @response.body
+      assert_equal '/hello/trackbacks/1/edit', edit_trackback_path(:id => '1')
+
+      put '/hello/trackbacks/1'
+      assert_equal 'trackbacks#update', @response.body
+
+      post '/hello/notes/1/trackbacks'
+      assert_equal 'trackbacks#create', @response.body
+
+      delete '/hello/trackbacks/1'
+      assert_equal 'trackbacks#destroy', @response.body
+
+      get '/hello/notes'
+      assert_equal 'notes#index', @response.body
+
+      post '/hello/notes'
+      assert_equal 'notes#create', @response.body
+
+      get '/hello/notes/new'
+      assert_equal 'notes#new', @response.body
+      assert_equal '/hello/notes/new', new_note_path
+
+      get '/hello/notes/1'
+      assert_equal 'notes#show', @response.body
+      assert_equal '/hello/notes/1', note_path(:id => 1)
+
+      put '/hello/notes/1'
+      assert_equal 'notes#update', @response.body
+
+      delete '/hello/notes/1'
+      assert_equal 'notes#destroy', @response.body
+    end
+  end
+
   def test_custom_resource_routes_are_scoped
     with_test_routes do
       assert_equal '/customers/recent', recent_customers_path
       assert_equal '/customers/1/profile', profile_customer_path(:id => '1')
-      assert_equal '/customers/new/preview', preview_new_customer_path
+      assert_equal '/customers/1/secret/profile', secret_profile_customer_path(:id => '1')
+      assert_equal '/customers/new/preview', another_preview_new_customer_path
       assert_equal '/customers/1/avatar/thumbnail.jpg', thumbnail_customer_avatar_path(:customer_id => '1', :format => :jpg)
       assert_equal '/customers/1/invoices/outstanding', outstanding_customer_invoices_path(:customer_id => '1')
       assert_equal '/customers/1/invoices/2/print', print_customer_invoice_path(:customer_id => '1', :id => '2')
@@ -1541,6 +1761,9 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
 
       get '/customers/1/invoices/overdue'
       assert_equal 'invoices#overdue', @response.body
+
+      get '/customers/1/secret/profile'
+      assert_equal 'customers#secret', @response.body
     end
   end
 
@@ -1884,11 +2107,269 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     end
   end
 
+  def test_resources_are_not_pluralized
+    with_test_routes do
+      get '/transport/taxis'
+      assert_equal 'transport/taxis#index', @response.body
+      assert_equal '/transport/taxis', transport_taxis_path
+
+      get '/transport/taxis/new'
+      assert_equal 'transport/taxis#new', @response.body
+      assert_equal '/transport/taxis/new', new_transport_taxi_path
+
+      post '/transport/taxis'
+      assert_equal 'transport/taxis#create', @response.body
+
+      get '/transport/taxis/1'
+      assert_equal 'transport/taxis#show', @response.body
+      assert_equal '/transport/taxis/1', transport_taxi_path(:id => '1')
+
+      get '/transport/taxis/1/edit'
+      assert_equal 'transport/taxis#edit', @response.body
+      assert_equal '/transport/taxis/1/edit', edit_transport_taxi_path(:id => '1')
+
+      put '/transport/taxis/1'
+      assert_equal 'transport/taxis#update', @response.body
+
+      delete '/transport/taxis/1'
+      assert_equal 'transport/taxis#destroy', @response.body
+    end
+  end
+
+  def test_singleton_resources_are_not_singularized
+    with_test_routes do
+      get '/medical/taxis/new'
+      assert_equal 'medical/taxes#new', @response.body
+      assert_equal '/medical/taxis/new', new_medical_taxis_path
+
+      post '/medical/taxis'
+      assert_equal 'medical/taxes#create', @response.body
+
+      get '/medical/taxis'
+      assert_equal 'medical/taxes#show', @response.body
+      assert_equal '/medical/taxis', medical_taxis_path
+
+      get '/medical/taxis/edit'
+      assert_equal 'medical/taxes#edit', @response.body
+      assert_equal '/medical/taxis/edit', edit_medical_taxis_path
+
+      put '/medical/taxis'
+      assert_equal 'medical/taxes#update', @response.body
+
+      delete '/medical/taxis'
+      assert_equal 'medical/taxes#destroy', @response.body
+    end
+  end
+
+  def test_greedy_resource_id_regexp_doesnt_match_edit_and_custom_action
+    with_test_routes do
+      get '/sections/1/edit'
+      assert_equal 'sections#edit', @response.body
+      assert_equal '/sections/1/edit', edit_section_path(:id => '1')
+
+      get '/sections/1/preview'
+      assert_equal 'sections#preview', @response.body
+      assert_equal '/sections/1/preview', preview_section_path(:id => '1')
+    end
+  end
+
+  def test_resource_constraints_are_pushed_to_scope
+    with_test_routes do
+      get '/wiki/articles/Ruby_on_Rails_3.0'
+      assert_equal 'wiki/articles#show', @response.body
+      assert_equal '/wiki/articles/Ruby_on_Rails_3.0', wiki_article_path(:id => 'Ruby_on_Rails_3.0')
+
+      get '/wiki/articles/Ruby_on_Rails_3.0/comments/new'
+      assert_equal 'wiki/comments#new', @response.body
+      assert_equal '/wiki/articles/Ruby_on_Rails_3.0/comments/new', new_wiki_article_comment_path(:article_id => 'Ruby_on_Rails_3.0')
+
+      post '/wiki/articles/Ruby_on_Rails_3.0/comments'
+      assert_equal 'wiki/comments#create', @response.body
+      assert_equal '/wiki/articles/Ruby_on_Rails_3.0/comments', wiki_article_comments_path(:article_id => 'Ruby_on_Rails_3.0')
+    end
+  end
+
+  def test_resources_path_can_be_a_symbol
+    with_test_routes do
+      get '/pages'
+      assert_equal 'wiki_pages#index', @response.body
+      assert_equal '/pages', wiki_pages_path
+
+      get '/pages/Ruby_on_Rails'
+      assert_equal 'wiki_pages#show', @response.body
+      assert_equal '/pages/Ruby_on_Rails', wiki_page_path(:id => 'Ruby_on_Rails')
+
+      get '/my_account'
+      assert_equal 'wiki_accounts#show', @response.body
+      assert_equal '/my_account', wiki_account_path
+    end
+  end
+
+  def test_redirect_https
+    with_test_routes do
+      with_https do
+        get '/secure'
+        verify_redirect 'https://www.example.com/secure/login'
+      end
+    end
+  end
+
+  def test_symbolized_path_parameters_is_not_stale
+    get '/countries/France'
+    assert_equal 'countries#index', @response.body
+
+    get '/countries/France/cities'
+    assert_equal 'countries#cities', @response.body
+
+    get '/countries/UK'
+    verify_redirect 'http://www.example.com/countries/all'
+
+    get '/countries/UK/cities'
+    verify_redirect 'http://www.example.com/countries/all/cities'
+  end
+
+  def test_custom_resource_actions_defined_using_string
+    get '/customers/inactive'
+    assert_equal 'customers#inactive', @response.body
+    assert_equal '/customers/inactive', inactive_customers_path
+
+    post '/customers/1/deactivate'
+    assert_equal 'customers#deactivate', @response.body
+    assert_equal '/customers/1/deactivate', deactivate_customer_path(:id => '1')
+
+    get '/customers/old'
+    assert_equal 'customers#old', @response.body
+    assert_equal '/customers/old', stale_customers_path
+
+    get '/customers/1/invoices/aged/3'
+    assert_equal 'invoices#aged', @response.body
+    assert_equal '/customers/1/invoices/aged/3', aged_customer_invoices_path(:customer_id => '1', :months => '3')
+  end
+
+  def test_route_defined_in_resources_scope_level
+    get '/customers/1/export'
+    assert_equal 'customers#export', @response.body
+    assert_equal '/customers/1/export', customer_export_path(:customer_id => '1')
+  end
+
+  def test_named_character_classes_in_regexp_constraints
+    get '/purchases/315004be7e/Ruby_on_Rails_3.pdf'
+    assert_equal 'purchases#fetch', @response.body
+    assert_equal '/purchases/315004be7e/Ruby_on_Rails_3.pdf', purchase_path(:token => '315004be7e', :filename => 'Ruby_on_Rails_3.pdf')
+  end
+
+  def test_nested_resource_constraints
+    get '/lists/01234012340123401234fffff'
+    assert_equal 'lists#show', @response.body
+    assert_equal '/lists/01234012340123401234fffff', list_path(:id => '01234012340123401234fffff')
+
+    get '/lists/01234012340123401234fffff/todos/1'
+    assert_equal 'todos#show', @response.body
+    assert_equal '/lists/01234012340123401234fffff/todos/1', list_todo_path(:list_id => '01234012340123401234fffff', :id => '1')
+
+    get '/lists/2/todos/1'
+    assert_equal 'Not Found', @response.body
+    assert_raises(ActionController::RoutingError){ list_todo_path(:list_id => '2', :id => '1') }
+  end
+
+  def test_named_routes_collision_is_avoided_unless_explicitly_given_as
+    assert_equal "/c/1", routes_collision_path(1)
+    assert_equal "/forced_collision", routes_forced_collision_path
+  end
+
+  def test_explicitly_avoiding_the_named_route
+    assert !respond_to?(:routes_no_collision_path)
+  end
+
+  def test_controller_name_with_leading_slash_raise_error
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { get '/feeds/:service', :to => '/feeds#show' }
+      end
+    end
+
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { get '/feeds/:service', :controller => '/feeds', :action => 'show' }
+      end
+    end
+
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { get '/api/feeds/:service', :to => '/api/feeds#show' }
+      end
+    end
+
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { controller("/feeds") { get '/feeds/:service', :to => :show } }
+      end
+    end
+
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { resources :feeds, :controller => '/feeds' }
+      end
+    end
+  end
+
+  def test_invalid_route_name_raises_error
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { get '/products', :to => 'products#index', :as => 'products ' }
+      end
+    end
+
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { get '/products', :to => 'products#index', :as => ' products' }
+      end
+    end
+
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { get '/products', :to => 'products#index', :as => 'products!' }
+      end
+    end
+
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { get '/products', :to => 'products#index', :as => 'products index' }
+      end
+    end
+
+    assert_raise(ArgumentError) do
+      self.class.stub_controllers do |routes|
+        routes.draw { get '/products', :to => 'products#index', :as => '1products' }
+      end
+    end
+  end
+
+  def test_nested_route_in_nested_resource
+    get "/posts/1/comments/2/views"
+    assert_equal "comments#views", @response.body
+    assert_equal "/posts/1/comments/2/views", post_comment_views_path(:post_id => '1', :comment_id => '2')
+  end
+
+  def test_root_in_deeply_nested_scope
+    get "/posts/1/admin"
+    assert_equal "admin/index#index", @response.body
+    assert_equal "/posts/1/admin", post_admin_root_path(:post_id => '1')
+  end
+
 private
   def with_test_routes
     yield
   end
 
+  def with_https
+    old_https = https?
+    https!
+    yield
+  ensure
+    https!(old_https)
+  end
+
   def verify_redirect(url, status=301)
     assert_equal status, @response.status
     assert_equal url, @response.headers['Location']
@@ -1899,3 +2380,96 @@ private
     %(<html><body>You are being <a href="#{ERB::Util.h(url)}">redirected</a>.</body></html>)
   end
 end
+
+class TestAppendingRoutes < ActionDispatch::IntegrationTest
+  def simple_app(resp)
+    lambda { |e| [ 200, { 'Content-Type' => 'text/plain' }, [resp] ] }
+  end
+
+  setup do
+    s = self
+    @app = ActionDispatch::Routing::RouteSet.new
+    @app.append do
+      match '/hello'   => s.simple_app('fail')
+      match '/goodbye' => s.simple_app('goodbye')
+    end
+
+    @app.draw do
+      match '/hello' => s.simple_app('hello')
+    end
+  end
+
+  def test_goodbye_should_be_available
+    get '/goodbye'
+    assert_equal 'goodbye', @response.body
+  end
+
+  def test_hello_should_not_be_overwritten
+    get '/hello'
+    assert_equal 'hello', @response.body
+  end
+
+  def test_missing_routes_are_still_missing
+    get '/random'
+    assert_equal 404, @response.status
+  end
+end
+
+class TestDefaultScope < ActionDispatch::IntegrationTest
+  module ::Blog
+    class PostsController < ActionController::Base
+      def index
+        render :text => "blog/posts#index"
+      end
+    end
+  end
+
+  DefaultScopeRoutes = ActionDispatch::Routing::RouteSet.new
+  DefaultScopeRoutes.default_scope = {:module => :blog}
+  DefaultScopeRoutes.draw do
+    resources :posts
+  end
+
+  def app
+    DefaultScopeRoutes
+  end
+
+  include DefaultScopeRoutes.url_helpers
+
+  def test_default_scope
+    get '/posts'
+    assert_equal "blog/posts#index", @response.body
+  end
+end
+
+class TestHttpMethods < ActionDispatch::IntegrationTest
+  RFC2616 = %w(OPTIONS GET HEAD POST PUT DELETE TRACE CONNECT)
+  RFC2518 = %w(PROPFIND PROPPATCH MKCOL COPY MOVE LOCK UNLOCK)
+  RFC3253 = %w(VERSION-CONTROL REPORT CHECKOUT CHECKIN UNCHECKOUT MKWORKSPACE UPDATE LABEL MERGE BASELINE-CONTROL MKACTIVITY)
+  RFC3648 = %w(ORDERPATCH)
+  RFC3744 = %w(ACL)
+  RFC5323 = %w(SEARCH)
+  RFC5789 = %w(PATCH)
+
+  def simple_app(response)
+    lambda { |env| [ 200, { 'Content-Type' => 'text/plain' }, [response] ] }
+  end
+
+  setup do
+    s = self
+    @app = ActionDispatch::Routing::RouteSet.new
+
+    @app.draw do
+      (RFC2616 + RFC2518 + RFC3253 + RFC3648 + RFC3744 + RFC5323 + RFC5789).each do |method|
+        match '/' => s.simple_app(method), :via => method.underscore.to_sym
+      end
+    end
+  end
+
+  (RFC2616 + RFC2518 + RFC3253 + RFC3648 + RFC3744 + RFC5323 + RFC5789).each do |method|
+    test "request method #{method.underscore} can be matched" do
+      get '/', nil, 'REQUEST_METHOD' => method
+      assert_equal method, @response.body
+    end
+  end
+end