diff options
| author | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
|---|---|---|
| committer | Pratik Naik <pratiknaik@gmail.com> | 2009-09-30 22:27:02 +0100 |
| commit | dd2779e1b83b4d867d47dd286ec0c919f5df12a9 (patch) | |
| tree | 6e52ea0a329c24429f4d1d41b065e082f0ed6baa /activemodel/test | |
| parent | 329b14aa8fdd291a00d17ba12c2e0ab4c3a157cc (diff) | |
| parent | 420004e030e96f2ace6e27fd622c90ee9e986677 (diff) | |
| download | rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.gz rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.tar.bz2 rails-dd2779e1b83b4d867d47dd286ec0c919f5df12a9.zip | |
Merge commit 'mainstream/master'
Diffstat (limited to 'activemodel/test')
| -rw-r--r-- | activemodel/test/cases/lint_test.rb | 4 | ||||
| -rw-r--r-- | activemodel/test/cases/naming_test.rb | 2 | ||||
| -rw-r--r-- | activemodel/test/cases/validations/i18n_generate_message_validation_test.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/activemodel/test/cases/lint_test.rb b/activemodel/test/cases/lint_test.rb index 165c353045..ed576a91e2 100644 --- a/activemodel/test/cases/lint_test.rb +++ b/activemodel/test/cases/lint_test.rb @@ -1,6 +1,6 @@ require "cases/helper" -class TestLint < Test::Unit::TestCase +class TestLint < ActiveModel::TestCase class CompliantObject def to_model self @@ -47,4 +47,4 @@ class TestLint < Test::Unit::TestCase def test_errors_full_messages assert_output(CompliantObject.new, 0, 0, /test_errors_aref/) end -end
\ No newline at end of file +end diff --git a/activemodel/test/cases/naming_test.rb b/activemodel/test/cases/naming_test.rb index e75d4541a3..4d97af3d13 100644 --- a/activemodel/test/cases/naming_test.rb +++ b/activemodel/test/cases/naming_test.rb @@ -1,6 +1,6 @@ require 'cases/helper' -class NamingTest < Test::Unit::TestCase +class NamingTest < ActiveModel::TestCase def setup @model_name = ActiveModel::Name.new('Post::TrackBack') end diff --git a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb index 07e4341289..443a81c6ac 100644 --- a/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb +++ b/activemodel/test/cases/validations/i18n_generate_message_validation_test.rb @@ -3,7 +3,7 @@ require 'cases/tests_database' require 'models/person' -class I18nGenerateMessageValidationTest < Test::Unit::TestCase +class I18nGenerateMessageValidationTest < ActiveModel::TestCase def setup Person.reset_callbacks(:validate) @person = Person.new |