aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorKasper Timm Hansen <kaspth@gmail.com>2016-08-02 16:52:18 +0200
committerKasper Timm Hansen <kaspth@gmail.com>2016-08-02 16:52:18 +0200
commit70b995a77f3e47c24ae88509066d0cdc4b2d779e (patch)
treefa5498986069e7903bba22753ee202b87741f280 /actionpack/test/controller
parent1d542e47d15d0f29cf301dcb883143716c06552c (diff)
downloadrails-70b995a77f3e47c24ae88509066d0cdc4b2d779e.tar.gz
rails-70b995a77f3e47c24ae88509066d0cdc4b2d779e.tar.bz2
rails-70b995a77f3e47c24ae88509066d0cdc4b2d779e.zip
Fix wrong assignment.
Screwed up both the left and right hand sides!
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/parameters/serialization_test.rb9
1 files changed, 5 insertions, 4 deletions
diff --git a/actionpack/test/controller/parameters/serialization_test.rb b/actionpack/test/controller/parameters/serialization_test.rb
index 352dd8ffb7..c9d38c1f48 100644
--- a/actionpack/test/controller/parameters/serialization_test.rb
+++ b/actionpack/test/controller/parameters/serialization_test.rb
@@ -4,16 +4,17 @@ require 'active_support/core_ext/string/strip'
class ParametersSerializationTest < ActiveSupport::TestCase
setup do
- @old_permitted_parameters = ActionController::Parameters.always_permitted_parameters
- ActionController::Parameters.always_permitted_parameters = true
+ @old_permitted_parameters = ActionController::Parameters.permit_all_parameters
+ ActionController::Parameters.permit_all_parameters = false
end
teardown do
- ActionController::Parameters.always_permitted_parameters = @old_permitted_parameters
+ ActionController::Parameters.permit_all_parameters = @old_permitted_parameters
end
test 'yaml serialization' do
- assert_equal <<-end_of_yaml.strip_heredoc, YAML.dump(ActionController::Parameters.new(key: :value))
+ params = ActionController::Parameters.new(key: :value)
+ assert_equal <<-end_of_yaml.strip_heredoc, YAML.dump(params)
--- !ruby/object:ActionController::Parameters
parameters: !ruby/hash:ActiveSupport::HashWithIndifferentAccess
key: :value