jro_apps/redmine Commit - r1087:e13f49d91951

Prevent unexpected nil in custom value validation....

Jean-Philippe Lang -

r1087:e13f49d91951

parent child

Context file:

r1087:e13f49d91951

Collapse all files

app/models/custom_value.rb +11 -6

             # redMine - project management software
             # Copyright (C) 2006  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.
             #
             # This program is distributed in the hope that it will be useful,
             # but WITHOUT ANY WARRANTY; without even the implied warranty of
             # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
             # GNU General Public License for more details.
             #
             # You should have received a copy of the GNU General Public License
             # along with this program; if not, write to the Free Software
             # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             class CustomValue < ActiveRecord::Base
               belongs_to :custom_field
               belongs_to :customized, :polymorphic => true
               def after_initialize
                 if custom_field && new_record? && (customized_type.blank? || (customized && customized.new_record?))
                   self.value ||= custom_field.default_value
                 end
               end
             protected
               def validate
-                errors.add(:value, :activerecord_error_blank) and return if custom_field.is_required? and value.blank?
+                if value.blank?
+                  errors.add(:value, :activerecord_error_blank) if custom_field.is_required? and value.blank?
+                else
                   errors.add(:value, :activerecord_error_invalid) unless custom_field.regexp.blank? or value =~ Regexp.new(custom_field.regexp)
-                errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length and value.length > 0
+                  errors.add(:value, :activerecord_error_too_short) if custom_field.min_length > 0 and value.length < custom_field.min_length
                   errors.add(:value, :activerecord_error_too_long) if custom_field.max_length > 0 and value.length > custom_field.max_length
+                  # Format specific validations
                   case custom_field.field_format
                   when 'int'
-                  errors.add(:value, :activerecord_error_not_a_number) unless value.blank? || value =~ /^[+-]?\d+$/
+                    errors.add(:value, :activerecord_error_not_a_number) unless value =~ /^[+-]?\d+$/
                   when 'float'
-                  begin; !value.blank? && Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
+                    begin; Kernel.Float(value); rescue; errors.add(:value, :activerecord_error_invalid) end
                   when 'date'
-                  errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/ or value.blank?
+                    errors.add(:value, :activerecord_error_not_a_date) unless value =~ /^\d{4}-\d{2}-\d{2}$/
                   when 'list'
-                  errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value) or value.blank?
+                    errors.add(:value, :activerecord_error_inclusion) unless custom_field.possible_values.include?(value)
+                  end
                 end
               end
             end

test/unit/custom_value_test.rb +73 -1

@@ -1,45 +1,117
1	# redMine - project management software	1	# redMine - project management software
2	# Copyright (C) 2006-2007 Jean-Philippe Lang	2	# Copyright (C) 2006-2007 Jean-Philippe Lang
3	#	3	#
4	# This program is free software; you can redistribute it and/or	4	# This program is free software; you can redistribute it and/or
5	# modify it under the terms of the GNU General Public License	5	# modify it under the terms of the GNU General Public License
6	# as published by the Free Software Foundation; either version 2	6	# as published by the Free Software Foundation; either version 2
7	# of the License, or (at your option) any later version.	7	# of the License, or (at your option) any later version.
8	#	8	#
9	# This program is distributed in the hope that it will be useful,	9	# This program is distributed in the hope that it will be useful,
10	# but WITHOUT ANY WARRANTY; without even the implied warranty of	10	# but WITHOUT ANY WARRANTY; without even the implied warranty of
11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the	11	# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12	# GNU General Public License for more details.	12	# GNU General Public License for more details.
13	#	13	#
14	# You should have received a copy of the GNU General Public License	14	# You should have received a copy of the GNU General Public License
15	# along with this program; if not, write to the Free Software	15	# along with this program; if not, write to the Free Software
16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.	16	# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17		17
18	require File.dirname(__FILE__) + '/../test_helper'	18	require File.dirname(__FILE__) + '/../test_helper'
19		19
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
27	v.value = ''	99	v.value = ''
28	assert v.save	100	assert v.save
29	v.value = '-6.250'	101	v.value = '-6.250'
30	assert v.save	102	assert v.save
31	v.value = '6a'	103	v.value = '6a'
32	assert !v.save	104	assert !v.save
33	end	105	end
34		106
35	def test_default_value	107	def test_default_value
36	field = CustomField.find_by_default_value('Default string')	108	field = CustomField.find_by_default_value('Default string')
37	assert_not_nil field	109	assert_not_nil field
38		110
39	v = CustomValue.new(:custom_field => field)	111	v = CustomValue.new(:custom_field => field)
40	assert_equal 'Default string', v.value	112	assert_equal 'Default string', v.value
41		113
42	v = CustomValue.new(:custom_field => field, :value => 'Not empty')	114	v = CustomValue.new(:custom_field => field, :value => 'Not empty')
43	assert_equal 'Not empty', v.value	115	assert_equal 'Not empty', v.value
44	end	116	end
45	end	117	end

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages