1 files changed, 85 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index cb5299e8d3..9f31ce8127 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -2678,6 +2678,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal '0c0c0b68-d24b-11e1-a861-001ff3fffe6f', @request.params[:download]
   end
 
+  def test_action_from_path_is_not_frozen
+    draw do
+      get 'search' => 'search'
+    end
+
+    get '/search'
+    assert !@request.params[:action].frozen?
+  end
+
 private
 
   def draw(&block)
@@ -3252,3 +3261,79 @@ class TestOptionalRootSegments < ActionDispatch::IntegrationTest
     assert_equal '/page/1', root_path(:page => '1')
   end
 end
+
+class TestPortConstraints < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+
+      get '/integer', to: ok, constraints: { :port =>  8080  }
+      get '/string',  to: ok, constraints: { :port => '8080' }
+      get '/array',   to: ok, constraints: { :port => [8080] }
+      get '/regexp',  to: ok, constraints: { :port => /8080/ }
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  def test_integer_port_constraints
+    get 'http://www.example.com/integer'
+    assert_response :not_found
+
+    get 'http://www.example.com:8080/integer'
+    assert_response :success
+  end
+
+  def test_string_port_constraints
+    get 'http://www.example.com/string'
+    assert_response :not_found
+
+    get 'http://www.example.com:8080/string'
+    assert_response :success
+  end
+
+  def test_array_port_constraints
+    get 'http://www.example.com/array'
+    assert_response :not_found
+
+    get 'http://www.example.com:8080/array'
+    assert_response :success
+  end
+
+  def test_regexp_port_constraints
+    get 'http://www.example.com/regexp'
+    assert_response :not_found
+
+    get 'http://www.example.com:8080/regexp'
+    assert_response :success
+  end
+end
+
+class TestRouteDefaults < ActionDispatch::IntegrationTest
+  stub_controllers do |routes|
+    Routes = routes
+    Routes.draw do
+      resources :posts, bucket_type: 'post'
+      resources :projects, defaults: { bucket_type: 'project' }
+    end
+  end
+
+  def app
+    Routes
+  end
+
+  include Routes.url_helpers
+
+  def test_route_options_are_required_for_url_for
+    assert_raises(ActionController::UrlGenerationError) do
+      assert_equal '/posts/1', url_for(controller: 'posts', action: 'show', id: 1, only_path: true)
+    end
+
+    assert_equal '/posts/1', url_for(controller: 'posts', action: 'show', id: 1, bucket_type: 'post', only_path: true)
+  end
+
+  def test_route_defaults_are_not_required_for_url_for
+    assert_equal '/projects/1', url_for(controller: 'projects', action: 'show', id: 1, only_path: true)
+  end
+end