From 5b3b9b0ebcbe35038adaf7b1636032e6f436ed1c Mon Sep 17 00:00:00 2001 From: Benjamin Quorning Date: Tue, 6 Nov 2012 21:22:57 +0100 Subject: Fix buggy tests --- actionpack/test/controller/parameters/parameters_permit_test.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb index fc63470174..ec8fd4a40a 100644 --- a/actionpack/test/controller/parameters/parameters_permit_test.rb +++ b/actionpack/test/controller/parameters/parameters_permit_test.rb @@ -24,7 +24,7 @@ class ParametersPermitTest < ActiveSupport::TestCase assert !@params.slice(:person).permitted? assert !@params[:person][:name].permitted? - @params.each { |key, value| assert(value.permitted?) if key == :person } + @params.each { |key, value| assert(!value.permitted?) if key == "person" } assert !@params.fetch(:person).permitted? @@ -32,8 +32,8 @@ class ParametersPermitTest < ActiveSupport::TestCase end test "permitted is sticky on mutators" do - assert !@params.delete_if { |k| k == :person }.permitted? - assert !@params.keep_if { |k,v| k == :person }.permitted? + assert !@params.delete_if { |k| k == "person" }.permitted? + assert !@params.keep_if { |k,v| k == "person" }.permitted? end test "permitted is sticky beyond merges" do @@ -77,7 +77,7 @@ class ParametersPermitTest < ActiveSupport::TestCase ActionController::Parameters.permit_all_parameters = false end end - + test "permitting parameters as an array" do assert_equal "32", @params[:person].permit([ :age ])[:age] end -- cgit v1.2.3 From 93eaffe59b713e94424212540a8788f0b273f8eb Mon Sep 17 00:00:00 2001 From: Benjamin Quorning Date: Tue, 6 Nov 2012 21:23:24 +0100 Subject: Current tests are testing stickiness of non-permitted parameters --- actionpack/test/controller/parameters/parameters_permit_test.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'actionpack/test') diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb index ec8fd4a40a..2a7ddff235 100644 --- a/actionpack/test/controller/parameters/parameters_permit_test.rb +++ b/actionpack/test/controller/parameters/parameters_permit_test.rb @@ -20,7 +20,7 @@ class ParametersPermitTest < ActiveSupport::TestCase assert_equal "monkey", @params.fetch(:foo) { "monkey" } end - test "permitted is sticky on accessors" do + test "not permitted is sticky on accessors" do assert !@params.slice(:person).permitted? assert !@params[:person][:name].permitted? @@ -31,12 +31,12 @@ class ParametersPermitTest < ActiveSupport::TestCase assert !@params.values_at(:person).first.permitted? end - test "permitted is sticky on mutators" do + test "not permitted is sticky on mutators" do assert !@params.delete_if { |k| k == "person" }.permitted? assert !@params.keep_if { |k,v| k == "person" }.permitted? end - test "permitted is sticky beyond merges" do + test "not permitted is sticky beyond merges" do assert !@params.merge(a: "b").permitted? end -- cgit v1.2.3 From 1a0f14e0453d3a36f134989752721292aed54892 Mon Sep 17 00:00:00 2001 From: Benjamin Quorning Date: Tue, 6 Nov 2012 21:24:14 +0100 Subject: Test that not permitted is sticky on #except --- actionpack/test/controller/parameters/parameters_permit_test.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'actionpack/test') diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb index 2a7ddff235..79ce7bb3a7 100644 --- a/actionpack/test/controller/parameters/parameters_permit_test.rb +++ b/actionpack/test/controller/parameters/parameters_permit_test.rb @@ -23,6 +23,7 @@ class ParametersPermitTest < ActiveSupport::TestCase test "not permitted is sticky on accessors" do assert !@params.slice(:person).permitted? assert !@params[:person][:name].permitted? + assert !@params[:person].except(:name).permitted? @params.each { |key, value| assert(!value.permitted?) if key == "person" } -- cgit v1.2.3 From 478d80fd5788a4b3e7c8482bfd3713eef7d00884 Mon Sep 17 00:00:00 2001 From: Benjamin Quorning Date: Tue, 6 Nov 2012 21:30:12 +0100 Subject: Test that permitted? is sticky on accessors, mutators, and merges --- .../parameters/parameters_permit_test.rb | 24 ++++++++++++++++++++++ 1 file changed, 24 insertions(+) (limited to 'actionpack/test') diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb index 79ce7bb3a7..7cc71fe6dc 100644 --- a/actionpack/test/controller/parameters/parameters_permit_test.rb +++ b/actionpack/test/controller/parameters/parameters_permit_test.rb @@ -32,15 +32,39 @@ class ParametersPermitTest < ActiveSupport::TestCase assert !@params.values_at(:person).first.permitted? end + test "permitted is sticky on accessors" do + @params.permit! + assert @params.slice(:person).permitted? + assert @params[:person][:name].permitted? + assert @params[:person].except(:name).permitted? + + @params.each { |key, value| assert(value.permitted?) if key == "person" } + + assert @params.fetch(:person).permitted? + + assert @params.values_at(:person).first.permitted? + end + test "not permitted is sticky on mutators" do assert !@params.delete_if { |k| k == "person" }.permitted? assert !@params.keep_if { |k,v| k == "person" }.permitted? end + test "permitted is sticky on mutators" do + @params.permit! + assert @params.delete_if { |k| k == "person" }.permitted? + assert @params.keep_if { |k,v| k == "person" }.permitted? + end + test "not permitted is sticky beyond merges" do assert !@params.merge(a: "b").permitted? end + test "permitted is sticky beyond merges" do + @params.permit! + assert @params.merge(a: "b").permitted? + end + test "modifying the parameters" do @params[:person][:hometown] = "Chicago" @params[:person][:family] = { brother: "Jonas" } -- cgit v1.2.3