From 57126ee5e392a4dc2eed22963d25020a48a93413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Mendon=C3=A7a=20Fran=C3=A7a?= Date: Sat, 19 Jan 2013 15:32:27 -0200 Subject: Restore and adapt the implementation reverted at https://github.com/rails/rails/commit/cc1c3c5be061e7572018f734e5239750ab449e3f Now instead of raise, we log by default in development and test --- .../controller/parameters/log_on_unpermitted_params_test.rb | 6 +++--- .../controller/parameters/raise_on_unpermitted_params_test.rb | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) (limited to 'actionpack/test/controller/parameters') diff --git a/actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb b/actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb index fb50dabff9..22e603b881 100644 --- a/actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb +++ b/actionpack/test/controller/parameters/log_on_unpermitted_params_test.rb @@ -3,11 +3,11 @@ require 'action_controller/metal/strong_parameters' class LogOnUnpermittedParamsTest < ActiveSupport::TestCase def setup - ActionController::Parameters.action_on_unpermitted = :log + ActionController::Parameters.action_on_unpermitted_parameters = :log end def teardown - ActionController::Parameters.action_on_unpermitted = false + ActionController::Parameters.action_on_unpermitted_parameters = false end test "logs on unexpected params" do @@ -47,4 +47,4 @@ class LogOnUnpermittedParamsTest < ActiveSupport::TestCase ActionController::Base.logger = old_logger end end -end \ No newline at end of file +end diff --git a/actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb b/actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb index e2933b86eb..f9cc9f96f1 100644 --- a/actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb +++ b/actionpack/test/controller/parameters/raise_on_unpermitted_params_test.rb @@ -3,11 +3,11 @@ require 'action_controller/metal/strong_parameters' class RaiseOnUnpermittedParamsTest < ActiveSupport::TestCase def setup - ActionController::Parameters.action_on_unpermitted = :raise + ActionController::Parameters.action_on_unpermitted_parameters = :raise end def teardown - ActionController::Parameters.action_on_unpermitted = false + ActionController::Parameters.action_on_unpermitted_parameters = false end test "raises on unexpected params" do @@ -16,7 +16,7 @@ class RaiseOnUnpermittedParamsTest < ActiveSupport::TestCase fishing: "Turnips" }) - assert_raises(ActionController::UnexpectedParameters) do + assert_raises(ActionController::UnpermittedParameters) do params.permit(book: [:pages]) end end @@ -26,8 +26,8 @@ class RaiseOnUnpermittedParamsTest < ActiveSupport::TestCase book: { pages: 65, title: "Green Cats and where to find then." } }) - assert_raises(ActionController::UnexpectedParameters) do + assert_raises(ActionController::UnpermittedParameters) do params.permit(book: [:pages]) end end -end \ No newline at end of file +end -- cgit v1.2.3