Extracts custom field values validation from CustomValue so that they can be validated globally from the customized object (#1189).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@8717 e93f8b46-1217-0410-a6f0-8f06a7374b81

5 files changed, 106 insertions, 111 deletions

diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 336d86e79..129faad1e 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1,5 +1,5 @@
 # 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
@@ -1308,17 +1308,18 @@ class IssuesControllerTest < ActionController::TestCase
     field.update_attribute(:is_required, true)
 
     @request.session[:user_id] = 2
-    post :create, :project_id => 1,
-               :issue => {:tracker_id => 1,
-                          :subject => 'This is the test_new issue',
-                          :description => 'This is the description',
-                          :priority_id => 5}
+    assert_no_difference 'Issue.count' do
+      post :create, :project_id => 1,
+                 :issue => {:tracker_id => 1,
+                            :subject => 'This is the test_new issue',
+                            :description => 'This is the description',
+                            :priority_id => 5}
+    end
     assert_response :success
     assert_template 'new'
     issue = assigns(:issue)
     assert_not_nil issue
-    assert_equal I18n.translate('activerecord.errors.messages.invalid'),
-                 issue.errors[:custom_values].to_s
+    assert_error_tag :content => /Database can't be blank/
   end
 
   def test_post_create_with_watchers
diff --git a/test/unit/custom_field_test.rb b/test/unit/custom_field_test.rb
index 8b075cba8..2d1183b72 100644
--- a/test/unit/custom_field_test.rb
+++ b/test/unit/custom_field_test.rb
@@ -1,5 +1,5 @@
 # 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
@@ -44,6 +44,14 @@ class CustomFieldTest < ActiveSupport::TestCase
     assert field.save
   end
 
+  def test_default_value_should_be_validated
+    field = CustomField.new(:name => 'Test', :field_format => 'int')
+    field.default_value = 'abc'
+    assert !field.valid?
+    field.default_value = '6'
+    assert field.valid?
+  end
+
   def test_possible_values_should_accept_an_array
     field = CustomField.new
     field.possible_values = ["One value", ""]
@@ -85,4 +93,75 @@ class CustomFieldTest < ActiveSupport::TestCase
   def test_new_subclass_instance_with_non_subclass_name_should_return_nil
     assert_nil CustomField.new_subclass_instance('Project')
   end
+
+  def test_string_field_validation_with_blank_value
+    f = CustomField.new(:field_format => 'string')
+
+    assert f.valid_field_value?(nil)
+    assert f.valid_field_value?('')
+
+    f.is_required = true
+    assert !f.valid_field_value?(nil)
+    assert !f.valid_field_value?('')
+  end
+
+  def test_string_field_validation_with_min_and_max_lengths
+    f = CustomField.new(:field_format => 'string', :min_length => 2, :max_length => 5)
+
+    assert f.valid_field_value?(nil)
+    assert f.valid_field_value?('')
+    assert f.valid_field_value?('a' * 2)
+    assert !f.valid_field_value?('a')
+    assert !f.valid_field_value?('a' * 6)
+  end
+
+  def test_string_field_validation_with_regexp
+    f = CustomField.new(:field_format => 'string', :regexp => '^[A-Z0-9]*$')
+
+    assert f.valid_field_value?(nil)
+    assert f.valid_field_value?('')
+    assert f.valid_field_value?('ABC')
+    assert !f.valid_field_value?('abc')
+  end
+
+  def test_date_field_validation
+    f = CustomField.new(:field_format => 'date')
+
+    assert f.valid_field_value?(nil)
+    assert f.valid_field_value?('')
+    assert f.valid_field_value?('1975-07-14')
+    assert !f.valid_field_value?('1975-07-33')
+    assert !f.valid_field_value?('abc')
+  end
+
+  def test_list_field_validation
+    f = CustomField.new(:field_format => 'list', :possible_values => ['value1', 'value2'])
+
+    assert f.valid_field_value?(nil)
+    assert f.valid_field_value?('')
+    assert f.valid_field_value?('value2')
+    assert !f.valid_field_value?('abc')
+  end
+
+  def test_int_field_validation
+    f = CustomField.new(:field_format => 'int')
+
+    assert f.valid_field_value?(nil)
+    assert f.valid_field_value?('')
+    assert f.valid_field_value?('123')
+    assert f.valid_field_value?('+123')
+    assert f.valid_field_value?('-123')
+    assert !f.valid_field_value?('6abc')
+  end
+
+  def test_float_field_validation
+    f = CustomField.new(:field_format => 'float')
+
+    assert f.valid_field_value?(nil)
+    assert f.valid_field_value?('')
+    assert f.valid_field_value?('11.2')
+    assert f.valid_field_value?('-6.250')
+    assert f.valid_field_value?('5')
+    assert !f.valid_field_value?('6abc')
+  end
 end
diff --git a/test/unit/custom_value_test.rb b/test/unit/custom_value_test.rb
index 95931d277..5155c5efc 100644
--- a/test/unit/custom_value_test.rb
+++ b/test/unit/custom_value_test.rb
@@ -1,5 +1,5 @@
 # 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
@@ -20,92 +20,6 @@ require File.expand_path('../../test_helper', __FILE__)
 class CustomValueTest < ActiveSupport::TestCase
   fixtures :custom_fields, :custom_values, :users
 
-  def test_string_field_validation_with_blank_value
-    f = CustomField.new(:field_format => 'string')
-    v = CustomValue.new(:custom_field => f)
-
-    v.value = nil
-    assert v.valid?
-    v.value = ''
-    assert v.valid?
-
-    f.is_required = true
-    v.value = nil
-    assert !v.valid?
-    v.value = ''
-    assert !v.valid?
-  end
-
-  def test_string_field_validation_with_min_and_max_lengths
-    f = CustomField.new(:field_format => 'string', :min_length => 2, :max_length => 5)
-    v = CustomValue.new(:custom_field => f, :value => '')
-    assert v.valid?
-    v.value = 'a'
-    assert !v.valid?
-    v.value = 'a' * 2
-    assert v.valid?
-    v.value = 'a' * 6
-    assert !v.valid?
-  end
-
-  def test_string_field_validation_with_regexp
-    f = CustomField.new(:field_format => 'string', :regexp => '^[A-Z0-9]*$')
-    v = CustomValue.new(:custom_field => f, :value => '')
-    assert v.valid?
-    v.value = 'abc'
-    assert !v.valid?
-    v.value = 'ABC'
-    assert v.valid?
-  end
-
-  def test_date_field_validation
-    f = CustomField.new(:field_format => 'date')
-    v = CustomValue.new(:custom_field => f, :value => '')
-    assert v.valid?
-    v.value = 'abc'
-    assert !v.valid?
-    v.value = '1975-07-33'
-    assert !v.valid?
-    v.value = '1975-07-14'
-    assert v.valid?
-  end
-
-  def test_list_field_validation
-    f = CustomField.new(:field_format => 'list', :possible_values => ['value1', 'value2'])
-    v = CustomValue.new(:custom_field => f, :value => '')
-    assert v.valid?
-    v.value = 'abc'
-    assert !v.valid?
-    v.value = 'value2'
-    assert v.valid?
-  end
-
-  def test_int_field_validation
-    f = CustomField.new(:field_format => 'int')
-    v = CustomValue.new(:custom_field => f, :value => '')
-    assert v.valid?
-    v.value = 'abc'
-    assert !v.valid?
-    v.value = '123'
-    assert v.valid?
-    v.value = '+123'
-    assert v.valid?
-    v.value = '-123'
-    assert v.valid?
-  end
-
-  def test_float_field_validation
-    v = CustomValue.new(:customized => User.find(:first), :custom_field => UserCustomField.find_by_name('Money'))
-    v.value = '11.2'
-    assert v.save
-    v.value = ''
-    assert v.save
-    v.value = '-6.250'
-    assert v.save
-    v.value = '6a'
-    assert !v.save
-  end
-
   def test_default_value
     field = CustomField.find_by_default_value('Default string')
     assert_not_nil field
diff --git a/test/unit/issue_test.rb b/test/unit/issue_test.rb
index b4ba86e49..2a5a14964 100644
--- a/test/unit/issue_test.rb
+++ b/test/unit/issue_test.rb
@@ -1,5 +1,5 @@
 # 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
@@ -29,6 +29,8 @@ class IssueTest < ActiveSupport::TestCase
            :custom_fields, :custom_fields_projects, :custom_fields_trackers, :custom_values,
            :time_entries
 
+  include Redmine::I18n
+
   def test_create
     issue = Issue.new(:project_id => 1, :tracker_id => 1, :author_id => 3,
                       :status_id => 1, :priority => IssuePriority.all.first,
@@ -48,6 +50,7 @@ class IssueTest < ActiveSupport::TestCase
   end
 
   def test_create_with_required_custom_field
+    set_language_if_valid 'en'
     field = IssueCustomField.find_by_name('Database')
     field.update_attribute(:is_required, true)
 
@@ -57,18 +60,15 @@ class IssueTest < ActiveSupport::TestCase
     assert issue.available_custom_fields.include?(field)
     # No value for the custom field
     assert !issue.save
-    assert_equal I18n.translate('activerecord.errors.messages.invalid'),
-                 issue.errors[:custom_values].to_s
+    assert_equal "Database can't be blank", issue.errors[:base].to_s
     # Blank value
     issue.custom_field_values = { field.id => '' }
     assert !issue.save
-    assert_equal I18n.translate('activerecord.errors.messages.invalid'),
-                 issue.errors[:custom_values].to_s
+    assert_equal "Database can't be blank", issue.errors[:base].to_s
     # Invalid value
     issue.custom_field_values = { field.id => 'SQLServer' }
     assert !issue.save
-    assert_equal I18n.translate('activerecord.errors.messages.invalid'),
-                 issue.errors[:custom_values].to_s
+    assert_equal "Database is not included in the list", issue.errors[:base].to_s
     # Valid value
     issue.custom_field_values = { field.id => 'PostgreSQL' }
     assert issue.save
@@ -327,8 +327,7 @@ class IssueTest < ActiveSupport::TestCase
     attributes['tracker_id'] = '1'
     issue = Issue.new(:project => Project.find(1))
     issue.attributes = attributes
-    assert_not_nil issue.custom_value_for(1)
-    assert_equal 'MySQL', issue.custom_value_for(1).value
+    assert_equal 'MySQL', issue.custom_field_value(1)
   end
 
   def test_should_update_issue_with_disabled_tracker
diff --git a/test/unit/time_entry_activity_test.rb b/test/unit/time_entry_activity_test.rb
index f376dbe25..bbdc77895 100644
--- a/test/unit/time_entry_activity_test.rb
+++ b/test/unit/time_entry_activity_test.rb
@@ -1,5 +1,5 @@
 # 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
@@ -20,6 +20,8 @@ require File.expand_path('../../test_helper', __FILE__)
 class TimeEntryActivityTest < ActiveSupport::TestCase
   fixtures :enumerations, :time_entries
 
+  include Redmine::I18n
+
   def test_should_be_an_enumeration
     assert TimeEntryActivity.ancestors.include?(Enumeration)
   end
@@ -44,13 +46,13 @@ class TimeEntryActivityTest < ActiveSupport::TestCase
   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[:custom_values].to_s
+    assert_equal "Billable can't be blank", e.errors[:base].to_s
   end
 
   def test_create_with_required_custom_field_should_succeed
@@ -62,7 +64,8 @@ class TimeEntryActivityTest < ActiveSupport::TestCase
     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)
 
@@ -73,7 +76,7 @@ class TimeEntryActivityTest < ActiveSupport::TestCase
     # 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[:base].to_s
 
     # Update custom field to valid value, save should succeed
     e.custom_field_values = {field.id => "0"}
@@ -81,6 +84,5 @@ class TimeEntryActivityTest < ActiveSupport::TestCase
     e.reload
     assert_equal "0", e.custom_value_for(field).value
   end
-
 end