From f886fe2d8ccc900cde2629577e5c0be8c7d4c67f Mon Sep 17 00:00:00 2001
From: Guillermo Iguaran <guilleiguaran@gmail.com>
Date: Sat, 2 Nov 2013 14:30:03 -0500
Subject: Revert "Merge pull request #9660 from
 sebasoga/change_strong_parameters_require_behaviour"

This reverts commit c2b5a8e61ba0f35015e6ac949a5c8fce2042a1f2, reversing
changes made to 1918b12c0429caec2a6134ac5e5b42ade103fe90.

See: https://github.com/rails/rails/pull/9660#issuecomment-27627493
---
 .../controller/parameters/parameters_require_test.rb  |  8 +-------
 actionpack/test/controller/required_params_test.rb    | 19 -------------------
 actionpack/test/dispatch/debug_exceptions_test.rb     |  6 ------
 3 files changed, 1 insertion(+), 32 deletions(-)

(limited to 'actionpack/test')

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
diff --git a/actionpack/test/controller/required_params_test.rb b/actionpack/test/controller/required_params_test.rb
index b27069140b..343d57c300 100644
--- a/actionpack/test/controller/required_params_test.rb
+++ b/actionpack/test/controller/required_params_test.rb
@@ -5,11 +5,6 @@ class BooksController < ActionController::Base
     params.require(:book).require(:name)
     head :ok
   end
-
-  def update
-    params.require(:book)
-    head :ok
-  end
 end
 
 class ActionControllerRequiredParamsTest < ActionController::TestCase
@@ -25,20 +20,6 @@ class ActionControllerRequiredParamsTest < ActionController::TestCase
     end
   end
 
-  test "empty required parameters will raise an exception" do
-    assert_raise ActionController::EmptyParameter do
-      put :update, {book: {}}
-    end
-
-    assert_raise ActionController::EmptyParameter do
-      put :update, {book: ''}
-    end
-
-    assert_raise ActionController::EmptyParameter do
-      put :update, {book: nil}
-    end
-  end
-
   test "required parameters that are present will not raise" do
     post :create, { book: { name: "Mjallo!" } }
     assert_response :ok
diff --git a/actionpack/test/dispatch/debug_exceptions_test.rb b/actionpack/test/dispatch/debug_exceptions_test.rb
index 6e28e4a982..3045a07ad6 100644
--- a/actionpack/test/dispatch/debug_exceptions_test.rb
+++ b/actionpack/test/dispatch/debug_exceptions_test.rb
@@ -43,8 +43,6 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
         raise ActionController::UrlGenerationError, "No route matches"
       when "/parameter_missing"
         raise ActionController::ParameterMissing, :missing_param_key
-      when "/required_key_empty_value"
-        raise ActionController::EmptyParameter, :empty_param_key
       else
         raise "puke!"
       end
@@ -128,10 +126,6 @@ class DebugExceptionsTest < ActionDispatch::IntegrationTest
     get "/parameter_missing", {}, {'action_dispatch.show_exceptions' => true}
     assert_response 400
     assert_match(/ActionController::ParameterMissing/, body)
-
-    get "/required_key_empty_value", {}, {'action_dispatch.show_exceptions' => true}
-    assert_response 400
-    assert_match(/ActionController::EmptyParameter/, body)
   end
 
   test "rescue with text error for xhr request" do
-- 
cgit v1.2.3