diff options
| author | Emilio Tagua <miloops@gmail.com> | 2009-07-01 20:36:53 -0300 |
|---|---|---|
| committer | Emilio Tagua <miloops@gmail.com> | 2009-07-01 20:36:53 -0300 |
| commit | 084e4a2dd4322c9ea748a426cb37bf90ab83613d (patch) | |
| tree | 90c6130b3f8becfd733618752a0649e932f5d514 /activerecord/test | |
| parent | 260c847817bbc3ad990609b7e41f787e1d2940ea (diff) | |
| parent | 92bff2ebf122252cf3ff64160bdfa9891fcff3f4 (diff) | |
| download | rails-084e4a2dd4322c9ea748a426cb37bf90ab83613d.tar.gz rails-084e4a2dd4322c9ea748a426cb37bf90ab83613d.tar.bz2 rails-084e4a2dd4322c9ea748a426cb37bf90ab83613d.zip | |
Merge commit 'rails/master'
Diffstat (limited to 'activerecord/test')
| -rwxr-xr-x | activerecord/test/cases/base_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/helper.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/activerecord/test/cases/base_test.rb b/activerecord/test/cases/base_test.rb index 0f3f6e41a5..f9ac37cc87 100755 --- a/activerecord/test/cases/base_test.rb +++ b/activerecord/test/cases/base_test.rb @@ -2116,4 +2116,8 @@ class BasicsTest < ActiveRecord::TestCase assert_equal custom_datetime, parrot[attribute] end end + + def test_dup + assert !Minimalistic.new.freeze.dup.frozen? + end end diff --git a/activerecord/test/cases/helper.rb b/activerecord/test/cases/helper.rb index c30186286d..d1e7caed89 100644 --- a/activerecord/test/cases/helper.rb +++ b/activerecord/test/cases/helper.rb @@ -6,8 +6,6 @@ require 'config' require 'rubygems' require 'test/unit' require 'stringio' -gem 'mocha', '>= 0.9.5' -require 'mocha' require 'active_record' require 'active_record/test_case' |