3 files changed, 18 insertions, 1 deletions
diff --git a/actionpack/test/controller/new_base/render_html_test.rb b/actionpack/test/controller/new_base/render_html_test.rb
index 49c1b67d04..e9ea57e329 100644
--- a/actionpack/test/controller/new_base/render_html_test.rb
+++ b/actionpack/test/controller/new_base/render_html_test.rb
@@ -4,7 +4,6 @@ module RenderHtml
   class MinimalController < ActionController::Metal
     include AbstractController::Rendering
     include ActionController::Rendering
-    include ActionView::Rendering
 
     def index
       render html: "Hello World!"
diff --git a/actionpack/test/controller/required_params_test.rb b/actionpack/test/controller/required_params_test.rb
index a901e56332..168f64ce41 100644
--- a/actionpack/test/controller/required_params_test.rb
+++ b/actionpack/test/controller/required_params_test.rb
@@ -48,4 +48,21 @@ class ParametersRequireTest < ActiveSupport::TestCase
       ActionController::Parameters.new(person: {}).require(:person)
     end
   end
+
+  test "require array when all required params are present" do
+    safe_params = ActionController::Parameters.new(person: {first_name: 'Gaurish', title: 'Mjallo', city: 'Barcelona'})
+      .require(:person)
+      .require([:first_name, :title])
+
+    assert_kind_of Array, safe_params
+    assert_equal ['Gaurish', 'Mjallo'], safe_params
+  end
+
+  test "require array when a required param is missing" do
+    assert_raises(ActionController::ParameterMissing) do
+      ActionController::Parameters.new(person: {first_name: 'Gaurish', title: nil})
+        .require(:person)
+        .require([:first_name, :title])
+    end
+  end
 end
diff --git a/actionpack/test/controller/url_for_integration_test.rb b/actionpack/test/controller/url_for_integration_test.rb
index 0e4c2b7c32..dfc2712e3e 100644
--- a/actionpack/test/controller/url_for_integration_test.rb
+++ b/actionpack/test/controller/url_for_integration_test.rb
@@ -158,6 +158,7 @@ module ActionPack
 
       ['/posts/ping',[    { :controller => 'posts', :action => 'ping' }]],
       ['/posts/show/1',[  { :controller => 'posts', :action => 'show', :id => '1' }]],
+      ['/posts/show/1',[  { :controller => 'posts', :action => 'show', :id => '1', :format => '' }]],
       ['/posts',[         { :controller => 'posts' }]],
       ['/posts',[         { :controller => 'posts', :action => 'index' }]],
       ['/posts/create',[  { :action => 'create' }, {:day=>nil, :month=>nil, :controller=>"posts", :action=>"show_date"}, '/blog']],