6 files changed, 54 insertions, 10 deletions
diff --git a/actionpack/test/dispatch/cookies_test.rb b/actionpack/test/dispatch/cookies_test.rb
index dfcef14344..c7194cde4a 100644
--- a/actionpack/test/dispatch/cookies_test.rb
+++ b/actionpack/test/dispatch/cookies_test.rb
@@ -520,7 +520,7 @@ class CookiesTest < ActionController::TestCase
 
   def test_accessing_nonexistent_signed_cookie_should_not_raise_an_invalid_signature
     get :set_signed_cookie
-    assert_nil @controller.send(:cookies).signed[:non_existant_attribute]
+    assert_nil @controller.send(:cookies).signed[:non_existent_attribute]
   end
 
   def test_encrypted_cookie_using_default_serializer
@@ -638,7 +638,7 @@ class CookiesTest < ActionController::TestCase
 
   def test_accessing_nonexistent_encrypted_cookie_should_not_raise_invalid_message
     get :set_encrypted_cookie
-    assert_nil @controller.send(:cookies).encrypted[:non_existant_attribute]
+    assert_nil @controller.send(:cookies).encrypted[:non_existent_attribute]
   end
 
   def test_setting_invalid_encrypted_cookie_should_return_nil_when_accessing_it
diff --git a/actionpack/test/dispatch/mapper_test.rb b/actionpack/test/dispatch/mapper_test.rb
index 69098326b9..f6dd9272a6 100644
--- a/actionpack/test/dispatch/mapper_test.rb
+++ b/actionpack/test/dispatch/mapper_test.rb
@@ -102,6 +102,18 @@ module ActionDispatch
         assert_equal("PUT", fakeset.routes.first.verb)
       end
 
+      def test_to_scope
+        fakeset = FakeSet.new
+        mapper = Mapper.new fakeset
+        mapper.scope(to: "posts#index") do
+          mapper.get :all
+          mapper.post :most
+        end
+
+        assert_equal "posts#index", fakeset.routes.to_a[0].defaults[:to]
+        assert_equal "posts#index", fakeset.routes.to_a[1].defaults[:to]
+      end
+
       def test_map_slash
         fakeset = FakeSet.new
         mapper = Mapper.new fakeset
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/json_params_parsing_test.rb b/actionpack/test/dispatch/request/json_params_parsing_test.rb
index a07138b55e..6ab71ebc81 100644
--- a/actionpack/test/dispatch/request/json_params_parsing_test.rb
+++ b/actionpack/test/dispatch/request/json_params_parsing_test.rb
@@ -155,7 +155,7 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
   test "parses json params after custom json mime type registered" do
     begin
       Mime::Type.unregister :json
-      Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
+      Mime::Type.register "application/json", :json, %w(application/vnd.rails+json)
       assert_parses(
         {"user" => {"username" => "meinac"}, "username" => "meinac"},
         "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/json' }
@@ -169,10 +169,10 @@ class RootLessJSONParamsParsingTest < ActionDispatch::IntegrationTest
   test "parses json params after custom json mime type registered with synonym" do
     begin
       Mime::Type.unregister :json
-      Mime::Type.register "application/json", :json, %w(application/vnd.api+json)
+      Mime::Type.register "application/json", :json, %w(application/vnd.rails+json)
       assert_parses(
         {"user" => {"username" => "meinac"}, "username" => "meinac"},
-        "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/vnd.api+json' }
+        "{\"username\": \"meinac\"}", { 'CONTENT_TYPE' => 'application/vnd.rails+json' }
       )
     ensure
       Mime::Type.unregister :json
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 = {})
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index ade4b0c381..75fdc9469f 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -4795,3 +4795,33 @@ class TestPathParameters < ActionDispatch::IntegrationTest
     assert_equal "/ar | /ar/about", @response.body
   end
 end
+
+class TestInternalRoutingParams < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      get '/test_internal/:internal' => 'internal#internal'
+    end
+  end
+
+  class ::InternalController < ActionController::Base
+    def internal
+      head :ok
+    end
+  end
+
+  APP = build_app Routes
+
+  def app
+    APP
+  end
+
+  def test_paths_with_partial_dynamic_segments_are_recognised
+    get '/test_internal/123'
+    assert_equal 200, response.status
+
+    assert_equal(
+      { controller: 'internal', action: 'internal', internal: '123' },
+      request.path_parameters
+    )
+  end
+end