comparison test/unit/time_entry_activity_test.rb @ 1115:433d4f72a19b redmine-2.2

Update to Redmine SVN revision 11137 on 2.2-stable branch

 # Redmine - project management software
-# Copyright (C) 2006-2011  Jean-Philippe Lang
+# Copyright (C) 2006-2012  Jean-Philippe Lang
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
 # as published by the Free Software Foundation; either version 2
 # of the License, or (at your option) any later version.

 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 require File.expand_path('../../test_helper', __FILE__)
 
 class TimeEntryActivityTest < ActiveSupport::TestCase
-  fixtures :enumerations, :time_entries
+  fixtures :enumerations, :time_entries, :custom_fields
+
+  include Redmine::I18n
 
   def test_should_be_an_enumeration
     assert TimeEntryActivity.ancestors.include?(Enumeration)
   end
 

     e.reload
     assert_equal "1", e.custom_value_for(field).value
   end
 
   def test_create_without_required_custom_field_should_fail
+    set_language_if_valid 'en'
     field = TimeEntryActivityCustomField.find_by_name('Billable')
     field.update_attribute(:is_required, true)
 
     e = TimeEntryActivity.new(:name => 'Custom Data')
     assert !e.save
-    assert_equal I18n.translate('activerecord.errors.messages.invalid'), e.errors.on(:custom_values)
+    assert_equal ["Billable can't be blank"], e.errors.full_messages
   end
 
   def test_create_with_required_custom_field_should_succeed
     field = TimeEntryActivityCustomField.find_by_name('Billable')
     field.update_attribute(:is_required, true)

     e = TimeEntryActivity.new(:name => 'Custom Data')
     e.custom_field_values = {field.id => "1"}
     assert e.save
   end
 
-  def test_update_issue_with_required_custom_field_change
+  def test_update_with_required_custom_field_change
+    set_language_if_valid 'en'
     field = TimeEntryActivityCustomField.find_by_name('Billable')
     field.update_attribute(:is_required, true)
 
     e = TimeEntryActivity.find(10)
     assert e.available_custom_fields.include?(field)
     # No change to custom field, record can be saved
     assert e.save
     # Blanking custom field, save should fail
     e.custom_field_values = {field.id => ""}
     assert !e.save
-    assert e.errors[:custom_values]
+    assert_equal ["Billable can't be blank"], e.errors.full_messages
 
     # Update custom field to valid value, save should succeed
     e.custom_field_values = {field.id => "0"}
     assert e.save
     e.reload
     assert_equal "0", e.custom_value_for(field).value
   end
-
 end