aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-03-11 14:03:20 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2017-03-11 14:07:01 +0900
commit6568da325d7445d1dd85b941ac54a6f41ec5ebe5 (patch)
treea1509b01d8c8e36acc43fc17469146bbceaaaa2d /actionpack
parent744d388a90bed2958210b5779d3fc3f9ad0cf550 (diff)
downloadrails-6568da325d7445d1dd85b941ac54a6f41ec5ebe5.tar.gz
rails-6568da325d7445d1dd85b941ac54a6f41ec5ebe5.tar.bz2
rails-6568da325d7445d1dd85b941ac54a6f41ec5ebe5.zip
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