diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-04 19:36:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-04 19:36:26 +0200 |
| commit | 583b60d109522907020700225f1c739737297a2d (patch) | |
| tree | a36d986cbbb73c94d217cbe86c9af7ef97a89567 /activerecord/test | |
| parent | 44a98967676492995d19fd4d541dbc9d52bf6b53 (diff) | |
| parent | 0dd3b4630fea4bd4d4010b7096c9ee79d34c4501 (diff) | |
| download | rails-583b60d109522907020700225f1c739737297a2d.tar.gz rails-583b60d109522907020700225f1c739737297a2d.tar.bz2 rails-583b60d109522907020700225f1c739737297a2d.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'activerecord/test')
| -rw-r--r-- | activerecord/test/cases/validations/i18n_generate_message_validation_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb b/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb index 15730c2a87..8ee2a5868c 100644 --- a/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb +++ b/activerecord/test/cases/validations/i18n_generate_message_validation_test.rb @@ -15,7 +15,7 @@ class I18nGenerateMessageValidationTest < ActiveRecord::TestCase end def test_generate_message_invalid_with_custom_message - assert_equal 'custom message title', @topic.errors.generate_message(:title, :invalid, :default => 'custom message {{value}}', :value => 'title') + assert_equal 'custom message title', @topic.errors.generate_message(:title, :invalid, :default => 'custom message %{value}', :value => 'title') end # validates_uniqueness_of: generate_message(attr_name, :taken, :default => configuration[:message]) @@ -24,7 +24,7 @@ class I18nGenerateMessageValidationTest < ActiveRecord::TestCase end def test_generate_message_taken_with_custom_message - assert_equal 'custom message title', @topic.errors.generate_message(:title, :taken, :default => 'custom message {{value}}', :value => 'title') + assert_equal 'custom message title', @topic.errors.generate_message(:title, :taken, :default => 'custom message %{value}', :value => 'title') end # ActiveRecord#RecordInvalid exception |