diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2016-10-22 00:02:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-22 00:02:01 +0200 |
| commit | 5dce39e82929382ea8d0f93a6dd21fb0ed6d95a0 (patch) | |
| tree | 88f547731cb9f811b241c7a8c90cf165e51eee2f | |
| parent | b6f935bbf9b8470b370ea613dc61218849aabf89 (diff) | |
| parent | fe09e7bd7155e8ff9ae58671a4a3508d52d54712 (diff) | |
| download | rails-5dce39e82929382ea8d0f93a6dd21fb0ed6d95a0.tar.gz rails-5dce39e82929382ea8d0f93a6dd21fb0ed6d95a0.tar.bz2 rails-5dce39e82929382ea8d0f93a6dd21fb0ed6d95a0.zip | |
Merge pull request #26860 from headius/soft_ordering_in_yaml_dump
Soften this test since YAML.dump may produce keys in other orders.
| -rw-r--r-- | actionpack/test/controller/parameters/serialization_test.rb | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/actionpack/test/controller/parameters/serialization_test.rb b/actionpack/test/controller/parameters/serialization_test.rb index 4fb1564c68..6fba2fde91 100644 --- a/actionpack/test/controller/parameters/serialization_test.rb +++ b/actionpack/test/controller/parameters/serialization_test.rb @@ -14,12 +14,10 @@ class ParametersSerializationTest < ActiveSupport::TestCase test "yaml serialization" do 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 - permitted: false - end_of_yaml + yaml_dump = YAML.dump(params) + assert_match("--- !ruby/object:ActionController::Parameters", yaml_dump) + assert_match(/parameters: !ruby\/hash:ActiveSupport::HashWithIndifferentAccess\n\s+key: :value/, yaml_dump) + assert_match("permitted: false", yaml_dump) end test "yaml deserialization" do |