3 files changed, 14 insertions, 19 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index f2a4503f13..d0dfbfbc74 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -575,6 +575,13 @@ class AssertTemplateTest < ActionController::TestCase
     end
   end
 
+  def test_fails_expecting_not_known_layout
+    get :render_with_layout
+    assert_raise(ArgumentError) do
+      assert_template :layout => 1
+    end
+  end
+
   def test_passes_with_correct_layout
     get :render_with_layout
     assert_template :layout => "layouts/standard"
diff --git a/actionpack/test/controller/filters_test.rb b/actionpack/test/controller/filters_test.rb
index 38533dbf23..829729eb1b 100644
--- a/actionpack/test/controller/filters_test.rb
+++ b/actionpack/test/controller/filters_test.rb
@@ -504,7 +504,6 @@ class FilterTest < ActionController::TestCase
 
       def non_yielding_action
         @filters  << "it didn't yield"
-        @filter_return_value
       end
 
       def action_three
@@ -528,32 +527,15 @@ class FilterTest < ActionController::TestCase
     end
   end
 
-  def test_non_yielding_around_actions_not_returning_false_do_not_raise
+  def test_non_yielding_around_actions_do_not_raise
     controller = NonYieldingAroundFilterController.new
-    controller.instance_variable_set "@filter_return_value", true
     assert_nothing_raised do
       test_process(controller, "index")
     end
   end
 
-  def test_non_yielding_around_actions_returning_false_do_not_raise
-    controller = NonYieldingAroundFilterController.new
-    controller.instance_variable_set "@filter_return_value", false
-    assert_nothing_raised do
-      test_process(controller, "index")
-    end
-  end
-
-  def test_after_actions_are_not_run_if_around_action_returns_false
-    controller = NonYieldingAroundFilterController.new
-    controller.instance_variable_set "@filter_return_value", false
-    test_process(controller, "index")
-    assert_equal ["filter_one", "it didn't yield"], controller.assigns['filters']
-  end
-
   def test_after_actions_are_not_run_if_around_action_does_not_yield
     controller = NonYieldingAroundFilterController.new
-    controller.instance_variable_set "@filter_return_value", true
     test_process(controller, "index")
     assert_equal ["filter_one", "it didn't yield"], controller.assigns['filters']
   end
diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb
index ba98ad7605..2ed486516d 100644
--- a/actionpack/test/controller/parameters/parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -280,4 +280,10 @@ class ParametersPermitTest < ActiveSupport::TestCase
 
     assert_equal({ "controller" => "users", "action" => "create" }, params.to_h)
   end
+
+  test "to_unsafe_h returns unfiltered params" do
+    assert @params.to_h.is_a? Hash
+    assert_not @params.to_h.is_a? ActionController::Parameters
+    assert_equal @params.to_hash, @params.to_unsafe_h
+  end
 end