1 files changed, 51 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index fed26d89f8..205238990e 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -482,11 +482,17 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
         get :preview, :on => :member
       end
 
-      resources :profiles, :param => :username do
+      resources :profiles, :param => :username, :username => /[a-z]+/ do
         get :details, :on => :member
         resources :messages
       end
 
+      resources :orders do
+        constraints :download => /[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}/ do
+          resources :downloads, :param => :download, :shallow => true
+        end
+      end
+
       scope :as => "routes" do
         get "/c/:id", :as => :collision, :to => "collision#show"
         get "/collision", :to => "collision#show"
@@ -2243,6 +2249,23 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal '34', @request.params[:id]
   end
 
+  def test_custom_param_constraint
+    get '/profiles/bob1'
+    assert_equal 404, @response.status
+
+    get '/profiles/bob1/details'
+    assert_equal 404, @response.status
+
+    get '/profiles/bob1/messages/34'
+    assert_equal 404, @response.status
+  end
+
+  def test_shallow_custom_param
+    get '/downloads/0c0c0b68-d24b-11e1-a861-001ff3fffe6f.zip'
+    assert_equal 'downloads#show', @response.body
+    assert_equal '0c0c0b68-d24b-11e1-a861-001ff3fffe6f', @request.params[:download]
+  end
+
 private
   def with_https
     old_https = https?
@@ -2679,3 +2702,30 @@ class TestInvalidUrls < ActionDispatch::IntegrationTest
     end
   end
 end
+
+class TestOptionalRootSegments < ActionDispatch::IntegrationTest
+  stub_controllers do |routes|
+    Routes = routes
+    Routes.draw do
+      get '/(page/:page)', :to => 'pages#index', :as => :root
+    end
+  end
+
+  def app
+    Routes
+  end
+
+  include Routes.url_helpers
+
+  def test_optional_root_segments
+    get '/'
+    assert_equal 'pages#index', @response.body
+    assert_equal '/', root_path
+
+    get '/page/1'
+    assert_equal 'pages#index', @response.body
+    assert_equal '1', @request.params[:page]
+    assert_equal '/page/1', root_path('1')
+    assert_equal '/page/1', root_path(:page => '1')
+  end
+end