aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
diff options
context:
space:
mode:
authorLuca Guidi <guidi.luca@gmail.com>2008-07-08 17:41:18 +0200
committerLuca Guidi <guidi.luca@gmail.com>2008-07-08 17:41:18 +0200
commitdc77359c16abc0f693e3847e677c0cad62d0df50 (patch)
treebb846220da827a6ce28c33ea7b1906639bfc545f /actionpack/test
parentcf5d6ab9a849d19ac683180cc7b603ca94b13ed7 (diff)
downloadrails-dc77359c16abc0f693e3847e677c0cad62d0df50.tar.gz
rails-dc77359c16abc0f693e3847e677c0cad62d0df50.tar.bz2
rails-dc77359c16abc0f693e3847e677c0cad62d0df50.zip
Removed unnecessary or condition in #error_messages_for
Diffstat (limited to 'actionpack/test')
-rw-r--r--actionpack/test/template/active_record_helper_i18n_test.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/template/active_record_helper_i18n_test.rb b/actionpack/test/template/active_record_helper_i18n_test.rb
index d35e79b94a..feec64aa30 100644
--- a/actionpack/test/template/active_record_helper_i18n_test.rb
+++ b/actionpack/test/template/active_record_helper_i18n_test.rb
@@ -21,19 +21,19 @@ class ActiveRecordHelperI18nTest < Test::Unit::TestCase
def test_error_messages_for_given_no_header_message_option_it_translates_header_message
I18n.expects(:t).with(:'header_message', :locale => 'en-US', :scope => [:active_record, :error], :count => 1, :object_name => '').returns 'header message'
- I18n.expects(:t).with('', :default => '').once
+ I18n.expects(:t).with('', :default => '').once.returns ''
error_messages_for(:object => @object, :locale => 'en-US')
end
def test_error_messages_for_given_a_message_option_it_does_not_translate_message
I18n.expects(:t).with(:'message', :locale => 'en-US', :scope => [:active_record, :error]).never
- I18n.expects(:t).with('', :default => '').once
+ I18n.expects(:t).with('', :default => '').once.returns ''
error_messages_for(:object => @object, :message => 'message', :locale => 'en-US')
end
def test_error_messages_for_given_no_message_option_it_translates_message
I18n.expects(:t).with(:'message', :locale => 'en-US', :scope => [:active_record, :error]).returns 'There were problems with the following fields:'
- I18n.expects(:t).with('', :default => '').once
+ I18n.expects(:t).with('', :default => '').once.returns ''
error_messages_for(:object => @object, :locale => 'en-US')
end