Skip to content
Browse files

Simplify some JSON tests

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7750 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 5b2e8b1 commit 55640fb939ff76247adad28077ff7e01d3bf463b @jeremy jeremy committed Oct 6, 2007
Showing with 4 additions and 4 deletions.
  1. +4 −4 activerecord/test/json_serialization_test.rb
View
8 activerecord/test/json_serialization_test.rb
@@ -23,7 +23,7 @@ def test_should_encode_all_encodable_attributes
assert_match %r{"name": "Konata Izumi"}, json
assert_match %r{"age": 16}, json
- assert_match %r{"created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}}, json
+ assert json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
assert_match %r{"awesome": true}, json
assert_match %r{"preferences": \{"shows": "anime"\}}, json
end
@@ -34,7 +34,7 @@ def test_should_allow_attribute_filtering_with_only
assert_match %r{"name": "Konata Izumi"}, json
assert_match %r{"age": 16}, json
assert_no_match %r{"awesome": true}, json
- assert_no_match %r{"created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}}, json
+ assert !json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
assert_no_match %r{"preferences": \{"shows": "anime"\}}, json
end
@@ -44,7 +44,7 @@ def test_should_allow_attribute_filtering_with_except
assert_no_match %r{"name": "Konata Izumi"}, json
assert_no_match %r{"age": 16}, json
assert_match %r{"awesome": true}, json
- assert_match %r{"created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}}, json
+ assert json.include?(%("created_at": #{ActiveSupport::JSON.encode(Time.utc(2006, 8, 1))}))
assert_match %r{"preferences": \{"shows": "anime"\}}, json
end
@@ -174,4 +174,4 @@ def test_should_allow_options_for_hash_of_authors
assert_equal %({1: {"name": "David"}}), authors_hash.to_json(:only => [1, :name])
end
-end
+end

0 comments on commit 55640fb

Please sign in to comment.
Something went wrong with that request. Please try again.