diff options
| author | José Valim <jose.valim@gmail.com> | 2010-01-30 13:07:48 +0100 |
|---|---|---|
| committer | José Valim <jose.valim@gmail.com> | 2010-01-30 13:12:12 +0100 |
| commit | d6e2f5013cdc0aa830d167a84582f48dc636dc81 (patch) | |
| tree | ff2f5726ad2a452a768fc551571ed3e09a80d1e6 /activerecord/test | |
| parent | 431fc3c81735f8873e52f4a1942a5ac761d18cc9 (diff) | |
| download | rails-d6e2f5013cdc0aa830d167a84582f48dc636dc81.tar.gz rails-d6e2f5013cdc0aa830d167a84582f48dc636dc81.tar.bz2 rails-d6e2f5013cdc0aa830d167a84582f48dc636dc81.zip | |
Drop AR I18n deprecation and simple use errors.messages as fallback.
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/autosave_association_test.rb | 4 | ||||
| -rw-r--r-- | activerecord/test/cases/validations/i18n_validation_test.rb | 14 |
2 files changed, 9 insertions, 9 deletions
diff --git a/activerecord/test/cases/autosave_association_test.rb b/activerecord/test/cases/autosave_association_test.rb index cc5460ddb7..2995cc6f72 100644 --- a/activerecord/test/cases/autosave_association_test.rb +++ b/activerecord/test/cases/autosave_association_test.rb @@ -1002,9 +1002,9 @@ module AutosaveAssociationOnACollectionAssociationTests end def test_should_default_invalid_error_from_i18n - I18n.backend.store_translations(:en, :errors => { :models => + I18n.backend.store_translations(:en, :activerecord => {:errors => { :models => { @association_name.to_s.singularize.to_sym => { :blank => "cannot be blank" } } - }) + }}) @pirate.send(@association_name).build(:name => '') diff --git a/activerecord/test/cases/validations/i18n_validation_test.rb b/activerecord/test/cases/validations/i18n_validation_test.rb index 5dfbb1516f..a0ff35f948 100644 --- a/activerecord/test/cases/validations/i18n_validation_test.rb +++ b/activerecord/test/cases/validations/i18n_validation_test.rb @@ -50,8 +50,8 @@ class I18nValidationTest < ActiveRecord::TestCase # validates_uniqueness_of w/o mocha def test_validates_associated_finds_custom_model_key_translation - I18n.backend.store_translations 'en', :errors => {:models => {:topic => {:attributes => {:title => {:taken => 'custom message'}}}}} - I18n.backend.store_translations 'en', :errors => {:messages => {:taken => 'global message'}} + I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:title => {:taken => 'custom message'}}}}}} + I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:taken => 'global message'}}} Topic.validates_uniqueness_of :title unique_topic.valid? @@ -59,7 +59,7 @@ class I18nValidationTest < ActiveRecord::TestCase end def test_validates_associated_finds_global_default_translation - I18n.backend.store_translations 'en', :errors => {:messages => {:taken => 'global message'}} + I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:taken => 'global message'}}} Topic.validates_uniqueness_of :title unique_topic.valid? @@ -83,16 +83,16 @@ class I18nValidationTest < ActiveRecord::TestCase # validates_associated w/o mocha def test_validates_associated_finds_custom_model_key_translation - I18n.backend.store_translations 'en', :errors => {:models => {:topic => {:attributes => {:replies => {:invalid => 'custom message'}}}}} - I18n.backend.store_translations 'en', :errors => {:messages => {:invalid => 'global message'}} + I18n.backend.store_translations 'en', :activerecord => {:errors => {:models => {:topic => {:attributes => {:replies => {:invalid => 'custom message'}}}}}} + I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}} Topic.validates_associated :replies replied_topic.valid? - assert_equal ['custom message'], replied_topic.errors[:replies] + assert_equal ['custom message'], replied_topic.errors[:replies].uniq end def test_validates_associated_finds_global_default_translation - I18n.backend.store_translations 'en', :errors => {:messages => {:invalid => 'global message'}} + I18n.backend.store_translations 'en', :activerecord => {:errors => {:messages => {:invalid => 'global message'}}} Topic.validates_associated :replies replied_topic.valid? |