From 35226db61858b3862252a3249fd02cdf084ea6a0 Mon Sep 17 00:00:00 2001 From: levsero Date: Wed, 12 Aug 2015 16:21:16 -0400 Subject: [PATCH 1/5] not raise against NEVER_UNPERMITTED_PARAMS Add a test checking that any param included in Parameters::NEVER_UNPERMITTED_PARAMS will not raise an error even if not explicitly permitted. --- test/raise_on_unpermitted_params_test.rb | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/test/raise_on_unpermitted_params_test.rb b/test/raise_on_unpermitted_params_test.rb index d44cc4e..3b8e8b0 100644 --- a/test/raise_on_unpermitted_params_test.rb +++ b/test/raise_on_unpermitted_params_test.rb @@ -30,4 +30,16 @@ def teardown params.permit(:book => [:pages]) end end -end \ No newline at end of file + + test "not raise on params included in NEVER_UNPERMITTED_PARAMS" do + # NEVER_UNPERMITTED_PARAMS = %w( controller action ) + key = ActionController::Parameters::NEVER_UNPERMITTED_PARAMS.sample + params = ActionController::Parameters.new({ + key => "Turnips" + }) + + assert_nothing_raised(ActionController::UnpermittedParameters) do + params.permit() + end + end +end From 259e228911fdc5224a30226ab96268073bfbe607 Mon Sep 17 00:00:00 2001 From: levsero Date: Wed, 12 Aug 2015 17:37:59 -0400 Subject: [PATCH 2/5] remove unnecessary exception --- test/raise_on_unpermitted_params_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/raise_on_unpermitted_params_test.rb b/test/raise_on_unpermitted_params_test.rb index 3b8e8b0..f48390e 100644 --- a/test/raise_on_unpermitted_params_test.rb +++ b/test/raise_on_unpermitted_params_test.rb @@ -38,7 +38,7 @@ def teardown key => "Turnips" }) - assert_nothing_raised(ActionController::UnpermittedParameters) do + assert_nothing_raised() do params.permit() end end From 2bb36c1300edac74ab8c32679f9df22cb3d0c630 Mon Sep 17 00:00:00 2001 From: levsero Date: Wed, 12 Aug 2015 17:38:37 -0400 Subject: [PATCH 3/5] Update raise_on_unpermitted_params_test.rb --- test/raise_on_unpermitted_params_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/raise_on_unpermitted_params_test.rb b/test/raise_on_unpermitted_params_test.rb index f48390e..e3e6734 100644 --- a/test/raise_on_unpermitted_params_test.rb +++ b/test/raise_on_unpermitted_params_test.rb @@ -38,7 +38,7 @@ def teardown key => "Turnips" }) - assert_nothing_raised() do + assert_nothing_raised do params.permit() end end From 0d321a1ddc0aebe23bb99edd0ea3ffcaaf34cb29 Mon Sep 17 00:00:00 2001 From: levsero Date: Wed, 12 Aug 2015 19:04:44 -0400 Subject: [PATCH 4/5] updated for ruby 1.8.7 compatibility `Array.sample` not supported in ruby 1.8.7 (with Gemfile.rails-3.0x ) so switched to using `index[0]` --- test/raise_on_unpermitted_params_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/raise_on_unpermitted_params_test.rb b/test/raise_on_unpermitted_params_test.rb index e3e6734..5e304e8 100644 --- a/test/raise_on_unpermitted_params_test.rb +++ b/test/raise_on_unpermitted_params_test.rb @@ -33,7 +33,7 @@ def teardown test "not raise on params included in NEVER_UNPERMITTED_PARAMS" do # NEVER_UNPERMITTED_PARAMS = %w( controller action ) - key = ActionController::Parameters::NEVER_UNPERMITTED_PARAMS.sample + key = ActionController::Parameters::NEVER_UNPERMITTED_PARAMS[0] params = ActionController::Parameters.new({ key => "Turnips" }) From fb2b9999c3e40627088cfe4c023ebbe4f92ace81 Mon Sep 17 00:00:00 2001 From: levsero Date: Sun, 23 Aug 2015 17:02:31 -0400 Subject: [PATCH 5/5] remove comment the comment wouldn't have stayed in sync with code changes. --- test/raise_on_unpermitted_params_test.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/test/raise_on_unpermitted_params_test.rb b/test/raise_on_unpermitted_params_test.rb index 5e304e8..c92300c 100644 --- a/test/raise_on_unpermitted_params_test.rb +++ b/test/raise_on_unpermitted_params_test.rb @@ -32,14 +32,13 @@ def teardown end test "not raise on params included in NEVER_UNPERMITTED_PARAMS" do - # NEVER_UNPERMITTED_PARAMS = %w( controller action ) key = ActionController::Parameters::NEVER_UNPERMITTED_PARAMS[0] params = ActionController::Parameters.new({ key => "Turnips" }) assert_nothing_raised do - params.permit() + params.permit end end end