mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Avoid Skip in test, have a unified test for order

This commit is contained in:
Gaurish Sharma 2013-08-09 15:27:21 +05:30
parent 9f8116fb77
commit 90c450f6cd
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
activemodel/test/cases/serializers/json_serialization_test.rb
View File

@ -155,21 +155,18 @@ class JsonSerializationTest < ActiveModel::TestCase
end
end
test "as_json should keep the MRI default order in the hash" do
skip "on JRuby as order is different" if defined? JRUBY_VERSION
test "as_json should keep the default order in the hash" do
json = @contact.as_json
assert_equal %w(name age created_at awesome preferences), json.keys
attributes_order = %w(name age created_at awesome preferences)
#Order on JRUBY is different
if defined? JRUBY_VERSION
attributes_order = %w(age name created_at awesome preferences)
end
test "as_json should keep the JRuby default order in the hash" do
skip "on MRI as order is different" unless defined? JRUBY_VERSION
json = @contact.as_json
assert_equal %w(age name created_at awesome preferences), json.keys
assert_equal attributes_order, json.keys
end
test "from_json should work without a root (class attribute)" do
json = @contact.to_json
result = Contact.new.from_json(json)