diff options
| author | José Valim <jose.valim@gmail.com> | 2009-12-11 19:24:32 -0200 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2009-12-11 19:24:32 -0200 |
| commit | cf7b94c013d4e824433a018001474e71ddd81a99 (patch) | |
| tree | 67b90f1e13a88d60170469e281f081711a976194 /activeresource/test/abstract_unit.rb | |
| parent | 6e55b32e98fcaad82184d2e21ee611a3465e4b20 (diff) | |
| parent | 2297eaed5b195ea42b99d062ad45f87dde9d3c60 (diff) | |
| download | rails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.gz rails-cf7b94c013d4e824433a018001474e71ddd81a99.tar.bz2 rails-cf7b94c013d4e824433a018001474e71ddd81a99.zip | |
Merge branch 'master' of git://github.com/rails/rails
Diffstat (limited to 'activeresource/test/abstract_unit.rb')
| -rw-r--r-- | activeresource/test/abstract_unit.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/activeresource/test/abstract_unit.rb b/activeresource/test/abstract_unit.rb index 10849be20c..3d684ff347 100644 --- a/activeresource/test/abstract_unit.rb +++ b/activeresource/test/abstract_unit.rb @@ -13,6 +13,7 @@ require 'test/unit' require 'active_support' require 'active_support/test_case' require 'active_resource' +require 'active_model/test_case' $:.unshift "#{File.dirname(__FILE__)}/../test" require 'setter_trap' |