kolan
/
Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Negative estimated hours should not be valid (#12735). 

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11125 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2013-01-05 16:34:41 +00:00
parent 3e14c3017c
commit 45c93340b7
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/issue.rb
View File

@ -67,7 +67,7 @@ class Issue < ActiveRecord::Base
validates_length_of :subject, :maximum => 255 validates_length_of :subject, :maximum => 255
validates_inclusion_of :done_ratio, :in => 0..100 validates_inclusion_of :done_ratio, :in => 0..100
validates_numericality_of :estimated_hours, :allow_nil => true validates :estimated_hours, :numericality => {:greater_than_or_equal_to => 0, :allow_nil => true, :message => :invalid}
validates :start_date, :date => true validates :start_date, :date => true
validates :due_date, :date => true validates :due_date, :date => true
validate :validate_issue, :validate_required_fields validate :validate_issue, :validate_required_fields

9
test/unit/issue_test.rb
View File

@ -79,6 +79,15 @@ class IssueTest < ActiveSupport::TestCase
assert_include 'Due date must be greater than start date', issue.errors.full_messages assert_include 'Due date must be greater than start date', issue.errors.full_messages
end end
def test_estimated_hours_should_be_validated
set_language_if_valid 'en'
['-2'].each do |invalid|
issue = Issue.new(:estimated_hours => invalid)
assert !issue.valid?
assert_include 'Estimated time is invalid', issue.errors.full_messages
end
end
def test_create_with_required_custom_field def test_create_with_required_custom_field
set_language_if_valid 'en' set_language_if_valid 'en'
field = IssueCustomField.find_by_name('Database') field = IssueCustomField.find_by_name('Database')