Make sure object name is translated in #error_messages_for

1 files changed, 10 insertions, 0 deletions

diff --git a/actionpack/test/template/active_record_helper_i18n_test.rb b/actionpack/test/template/active_record_helper_i18n_test.rb
index d78b0e4c0c..d35e79b94a 100644
--- a/actionpack/test/template/active_record_helper_i18n_test.rb
+++ b/actionpack/test/template/active_record_helper_i18n_test.rb
@@ -7,6 +7,7 @@ class ActiveRecordHelperI18nTest < Test::Unit::TestCase
   uses_mocha 'active_record_helper_i18n_test' do
     def setup
       @object = stub :errors => stub(:count => 1, :full_messages => ['full_messages'])
+      @object_name = 'book'
       stubs(:content_tag).returns 'content_tag'
 
       I18n.stubs(:t).with(:'header_message', :locale => 'en-US', :scope => [:active_record, :error], :count => 1, :object_name => '').returns "1 error prohibited this  from being saved"
@@ -20,17 +21,26 @@ 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
       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
       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
       error_messages_for(:object => @object, :locale => 'en-US')
     end
+    
+    def test_error_messages_for_given_object_name_it_translates_object_name
+      I18n.expects(:t).with(:header_message, :locale => 'en-US', :scope => [:active_record, :error], :count => 1, :object_name => @object_name).returns "1 error prohibited this #{@object_name} from being saved"
+      I18n.expects(:t).with(@object_name, :default => @object_name).once.returns @object_name
+      error_messages_for(:object => @object, :locale => 'en-US', :object_name => @object_name)
+    end
   end
 end
\ No newline at end of file