1 files changed, 96 insertions, 1 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index fb1b8526d0..4775324b43 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -1031,6 +1031,18 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal 'users/home#index', @response.body
   end
 
+  def test_namespace_containing_numbers
+    draw do
+      namespace :v2 do
+        resources :subscriptions
+      end
+    end
+
+    get '/v2/subscriptions'
+    assert_equal 'v2/subscriptions#index', @response.body
+    assert_equal '/v2/subscriptions', v2_subscriptions_path
+  end
+
   def test_articles_with_id
     draw do
       controller :articles do
@@ -1134,6 +1146,33 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal 'api/products#list', @response.body
   end
 
+  def test_match_shorthand_inside_scope_with_variables_with_controller
+    draw do
+      scope ':locale' do
+        match 'questions/new', via: [:get]
+      end
+    end
+
+    get '/de/questions/new'
+    assert_equal 'questions#new', @response.body
+    assert_equal 'de', @request.params[:locale]
+  end
+
+  def test_match_shorthand_inside_nested_namespaces_and_scopes_with_controller
+    draw do
+      namespace :api do
+        namespace :v3 do
+          scope ':locale' do
+            get "products/list"
+          end
+        end
+      end
+    end
+
+    get '/api/v3/en/products/list'
+    assert_equal 'api/v3/products#list', @response.body
+  end
+
   def test_dynamically_generated_helpers_on_collection_do_not_clobber_resources_url_helper
     draw do
       resources :replies do
@@ -1307,7 +1346,7 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal 'en', @request.params[:locale]
   end
 
-  def test_default_params
+  def test_default_string_params
     draw do
       get 'inline_pages/(:id)', :to => 'pages#show', :id => 'home'
       get 'default_pages/(:id)', :to => 'pages#show', :defaults => { :id => 'home' }
@@ -1327,6 +1366,26 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal 'home', @request.params[:id]
   end
 
+  def test_default_integer_params
+    draw do
+      get 'inline_pages/(:page)', to: 'pages#show', page: 1
+      get 'default_pages/(:page)', to: 'pages#show', defaults: { page: 1 }
+
+      defaults page: 1 do
+        get 'scoped_pages/(:page)', to: 'pages#show'
+      end
+    end
+
+    get '/inline_pages'
+    assert_equal 1, @request.params[:page]
+
+    get '/default_pages'
+    assert_equal 1, @request.params[:page]
+
+    get '/scoped_pages'
+    assert_equal 1, @request.params[:page]
+  end
+
   def test_resource_constraints
     draw do
       resources :products, :constraints => { :id => /\d{4}/ } do
@@ -3341,6 +3400,42 @@ class TestPortConstraints < ActionDispatch::IntegrationTest
   end
 end
 
+class TestFormatConstraints < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+
+      get '/string', to: ok, constraints: { format: 'json'  }
+      get '/regexp',  to: ok, constraints: { format: /json/ }
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  def test_string_format_constraints
+    get 'http://www.example.com/string'
+    assert_response :success
+
+    get 'http://www.example.com/string.json'
+    assert_response :success
+
+    get 'http://www.example.com/string.html'
+    assert_response :not_found
+  end
+
+  def test_regexp_format_constraints
+    get 'http://www.example.com/regexp'
+    assert_response :success
+
+    get 'http://www.example.com/regexp.json'
+    assert_response :success
+
+    get 'http://www.example.com/regexp.html'
+    assert_response :not_found
+  end
+end
+
 class TestRouteDefaults < ActionDispatch::IntegrationTest
   stub_controllers do |routes|
     Routes = routes