3 files changed, 18 insertions, 5 deletions
diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index d75e31db62..b8f0ffb64a 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -166,7 +166,7 @@ module TestGenerationPrefix
       assert_equal "/pure-awesomeness/blog/posts/1", last_response.body
     end
 
-    test "[ENGINE] url_helpers from engine have higher priotity than application's url_helpers" do
+    test "[ENGINE] url_helpers from engine have higher priority than application's url_helpers" do
       get "/awesome/blog/conflicting_url"
       assert_equal "engine", last_response.body
     end
@@ -319,14 +319,14 @@ module TestGenerationPrefix
       path = engine_object.polymorphic_url(Post.new, :host => "www.example.com")
       assert_equal "http://www.example.com/awesome/blog/posts/1", path
     end
-    
+
     private
       def verify_redirect(url, status = 301)
         assert_equal status, last_response.status
         assert_equal url, last_response.headers["Location"]
         assert_equal expected_redirect_body(url), last_response.body
       end
-      
+
       def expected_redirect_body(url)
         %(<html><body>You are being <a href="#{url}">redirected</a>.</body></html>)
       end
@@ -450,14 +450,14 @@ module TestGenerationPrefix
       get "/absolute_custom_redirect"
       verify_redirect "http://example.org/foo"
     end
-    
+
     private
       def verify_redirect(url, status = 301)
         assert_equal status, last_response.status
         assert_equal url, last_response.headers["Location"]
         assert_equal expected_redirect_body(url), last_response.body
       end
-      
+
       def expected_redirect_body(url)
         %(<html><body>You are being <a href="#{url}">redirected</a>.</body></html>)
       end
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 781f852633..8a5d85ab84 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -358,6 +358,17 @@ class RequestPort < BaseRequestTest
     request = stub_request 'HTTP_HOST' => 'www.example.org:8080'
     assert_equal ':8080', request.port_string
   end
+
+  test "server port" do
+    request = stub_request 'SERVER_PORT' => '8080'
+    assert_equal 8080, request.server_port
+
+    request = stub_request 'SERVER_PORT' => '80'
+    assert_equal 80, request.server_port
+
+    request = stub_request 'SERVER_PORT' => ''
+    assert_equal 0, request.server_port
+  end
 end
 
 class RequestPath < BaseRequestTest
diff --git a/actionpack/test/dispatch/routing/concerns_test.rb b/actionpack/test/dispatch/routing/concerns_test.rb
index 7ef513b0c8..6934271846 100644
--- a/actionpack/test/dispatch/routing/concerns_test.rb
+++ b/actionpack/test/dispatch/routing/concerns_test.rb
@@ -1,5 +1,7 @@
 require 'abstract_unit'
 
+class ReviewsController < ResourcesController; end
+
 class RoutingConcernsTest < ActionDispatch::IntegrationTest
   class Reviewable
     def self.call(mapper, options = {})