##// END OF EJS Templates
jro_apps » redmine
RSS
Prevent unexpected nil in custom value validation....
Jean-Philippe Lang -
r1087:e13f49d91951
parent child
Show More
Side by Side Unified
Context file:
r1087:e13f49d91951 Loading diff...:
Show file before | Show file after | Hide comments
@@ -27,19 +27,24 class CustomValue < ActiveRecord::Base
27
27
28 protected
28 protected
29 def validate
29 def validate
30 errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.blank?
30 if value.blank?
31 errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
31 errors.add(:value, :activerecord_error_blank) if custom_field.is_required? and value.blank?
32 errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
32 else
33 errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
33 errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
34 case custom_field.field_format
34 errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length
35 when 'int'
35 errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
36 errors.add(:value, :activerecord_error_not_a_number) unless value.blank? || value =~ /^[+-]?\d+$/
36
37 when 'float'
37 # Format specific validations
38 begin; !value.blank? && Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
38 case custom_field.field_format
39 when 'date'
39 when 'int'
40 errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.blank?
40 errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[+-]?\d+$/
41 when 'list'
41 when 'float'
42 errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value) or value.blank?
42 begin; Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
43 when 'date'
44 errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
45 when 'list'
46 errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value)
47 end
43 end
48 end
44 end
49 end
45 end
50 end
Show file before | Show file after | Hide comments
@@ -20,7 +20,79 require File.dirname(__FILE__) + '/../test_helper'
20 class CustomValueTest < Test::Unit::TestCase
20 class CustomValueTest < Test::Unit::TestCase
21 fixtures :custom_fields
21 fixtures :custom_fields
22
22
23 def test_float_field
23 def test_string_field_validation_with_blank_value
24 f = CustomField.new(:field_format => 'string')
25 v = CustomValue.new(:custom_field => f)
26
27 v.value = nil
28 assert v.valid?
29 v.value = ''
30 assert v.valid?
31
32 f.is_required = true
33 v.value = nil
34 assert !v.valid?
35 v.value = ''
36 assert !v.valid?
37 end
38
39 def test_string_field_validation_with_min_and_max_lengths
40 f = CustomField.new(:field_format => 'string', :min_length => 2, :max_length => 5)
41 v = CustomValue.new(:custom_field => f, :value => '')
42 assert v.valid?
43 v.value = 'a'
44 assert !v.valid?
45 v.value = 'a' * 2
46 assert v.valid?
47 v.value = 'a' * 6
48 assert !v.valid?
49 end
50
51 def test_string_field_validation_with_regexp
52 f = CustomField.new(:field_format => 'string', :regexp => '^[A-Z0-9]*$')
53 v = CustomValue.new(:custom_field => f, :value => '')
54 assert v.valid?
55 v.value = 'abc'
56 assert !v.valid?
57 v.value = 'ABC'
58 assert v.valid?
59 end
60
61 def test_date_field_validation
62 f = CustomField.new(:field_format => 'date')
63 v = CustomValue.new(:custom_field => f, :value => '')
64 assert v.valid?
65 v.value = 'abc'
66 assert !v.valid?
67 v.value = '1975-07-14'
68 assert v.valid?
69 end
70
71 def test_list_field_validation
72 f = CustomField.new(:field_format => 'list', :possible_values => ['value1', 'value2'])
73 v = CustomValue.new(:custom_field => f, :value => '')
74 assert v.valid?
75 v.value = 'abc'
76 assert !v.valid?
77 v.value = 'value2'
78 assert v.valid?
79 end
80
81 def test_int_field_validation
82 f = CustomField.new(:field_format => 'int')
83 v = CustomValue.new(:custom_field => f, :value => '')
84 assert v.valid?
85 v.value = 'abc'
86 assert !v.valid?
87 v.value = '123'
88 assert v.valid?
89 v.value = '+123'
90 assert v.valid?
91 v.value = '-123'
92 assert v.valid?
93 end
94
95 def test_float_field_validation
24 v = CustomValue.new(:customized => User.find(:first), :custom_field => UserCustomField.find_by_name('Money'))
96 v = CustomValue.new(:customized => User.find(:first), :custom_field => UserCustomField.find_by_name('Money'))
25 v.value = '11.2'
97 v.value = '11.2'
26 assert v.save
98 assert v.save
General Comments 0
You need to be logged in to leave comments. Login now