diff options
| author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-21 17:20:51 +0000 |
|---|---|---|
| committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-01-21 17:20:51 +0000 |
| commit | 39814fcce0b429eb06654600e4669f1405ffa7d9 (patch) | |
| tree | bc5cbe7888b3c31b1e2a92f246512218014fdf76 /activerecord/test/cases/json_serialization_test.rb | |
| parent | 1d4f4cdfe22cbe4962ae8953c96bc5c70d8d4e6a (diff) | |
| download | rails-39814fcce0b429eb06654600e4669f1405ffa7d9.tar.gz rails-39814fcce0b429eb06654600e4669f1405ffa7d9.tar.bz2 rails-39814fcce0b429eb06654600e4669f1405ffa7d9.zip | |
Merge branch 'ar-test-cleanup' of git://git.geeksomnia.com/rails
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@8681 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/cases/json_serialization_test.rb')
| -rw-r--r-- | activerecord/test/cases/json_serialization_test.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/activerecord/test/cases/json_serialization_test.rb b/activerecord/test/cases/json_serialization_test.rb index 779b8e02ad..c4597a110d 100644 --- a/activerecord/test/cases/json_serialization_test.rb +++ b/activerecord/test/cases/json_serialization_test.rb @@ -1,4 +1,4 @@ -require 'abstract_unit' +require "cases/helper" require 'models/contact' require 'models/post' require 'models/author' @@ -6,7 +6,7 @@ require 'models/tagging' require 'models/tag' require 'models/comment' -class JsonSerializationTest < ActiveSupport::TestCase +class JsonSerializationTest < ActiveRecord::TestCase def setup @contact = Contact.new( :name => 'Konata Izumi', @@ -63,7 +63,7 @@ class JsonSerializationTest < ActiveSupport::TestCase end end -class DatabaseConnectedJsonEncodingTest < ActiveSupport::TestCase +class DatabaseConnectedJsonEncodingTest < ActiveRecord::TestCase fixtures :authors, :posts, :comments, :tags, :taggings def setup |