Merge branch 'master' of github.com:rails/rails

1 files changed, 1 insertions, 7 deletions

diff --git a/actionpack/test/controller/parameters/parameters_require_test.rb b/actionpack/test/controller/parameters/parameters_require_test.rb
index 21b3eaa6b5..bdaba8d2d8 100644
--- a/actionpack/test/controller/parameters/parameters_require_test.rb
+++ b/actionpack/test/controller/parameters/parameters_require_test.rb
@@ -2,14 +2,8 @@ require 'abstract_unit'
 require 'action_controller/metal/strong_parameters'
 
 class ParametersRequireTest < ActiveSupport::TestCase
-  test "required parameters must be present" do
+  test "required parameters must be present not merely not nil" do
     assert_raises(ActionController::ParameterMissing) do
-      ActionController::Parameters.new(name: {}).require(:person)
-    end
-  end
-
-  test "required parameters can't be blank" do
-    assert_raises(ActionController::EmptyParameter) do
       ActionController::Parameters.new(person: {}).require(:person)
     end
   end