aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2017-03-11 16:33:10 -0500
committerGitHub <noreply@github.com>2017-03-11 16:33:10 -0500
commitc186bf6b44af5021d59252b01e939efa1f4fe366 (patch)
tree4a331e74c40fa5791e33ea4537e2a65d948d566b /actionpack
parent158a01e73f7120533d0ec4c589939b2c5099eb1b (diff)
parent6568da325d7445d1dd85b941ac54a6f41ec5ebe5 (diff)
downloadrails-c186bf6b44af5021d59252b01e939efa1f4fe366.tar.gz
rails-c186bf6b44af5021d59252b01e939efa1f4fe366.tar.bz2
rails-c186bf6b44af5021d59252b01e939efa1f4fe366.zip
Merge pull request #28378 from y-yagi/use_correct_variable_in_reverse_merge_test
Use correct value in `reverse_merge` test
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/parameters/parameters_permit_test.rb12
1 files changed, 4 insertions, 8 deletions
diff --git a/actionpack/test/controller/parameters/parameters_permit_test.rb b/actionpack/test/controller/parameters/parameters_permit_test.rb
index b51c55b1f1..9f3025587e 100644
--- a/actionpack/test/controller/parameters/parameters_permit_test.rb
+++ b/actionpack/test/controller/parameters/parameters_permit_test.rb
@@ -310,17 +310,13 @@ class ParametersPermitTest < ActiveSupport::TestCase
refute_predicate merged_params[:person], :empty?
end
- test "not permitted is sticky beyond reverse_merge!" do
- merged_params = @params.reverse_merge(a: "b")
-
- refute_predicate @params, :permitted?
+ test "not permitted is sticky beyond reverse_merge" do
+ refute_predicate @params.reverse_merge(a: "b"), :permitted?
end
- test "permitted is sticky beyond reverse_merge!" do
+ test "permitted is sticky beyond reverse_merge" do
@params.permit!
- merged_params = @params.reverse_merge(a: "b")
-
- assert_predicate @params, :permitted?
+ assert_predicate @params.reverse_merge(a: "b"), :permitted?
end
test "#reverse_merge! with parameters" do