jro_apps/redmine Commit - r10583:8b527ce24783

Fixed version date validation (#12359)....

Jean-Philippe Lang -

r10583:8b527ce24783

parent child

Context file:

r10583:8b527ce24783

app/models/version.rb +7 0

               validates_format_of :effective_date, :with => /^\d{4}-\d{2}-\d{2}$/, :message => :not_a_date, :allow_nil => true
               validates_inclusion_of :status, :in => VERSION_STATUSES
               validates_inclusion_of :sharing, :in => VERSION_SHARINGS
+              validate :validate_version
               scope :named, lambda {|arg| { :conditions => ["LOWER(#{table_name}.name) = LOWER(?)", arg.to_s.strip]}}
               scope :open, :conditions => {:status => 'open'}
                   progress
                 end
               end
+              def validate_version
+                if effective_date.nil? && @attributes['effective_date'].present?
+                  errors.add :effective_date, :not_a_date
+                end
+              end
             end

test/unit/version_test.rb +7 -1

               def test_invalid_effective_date_validation
                 v = Version.new(:project => Project.find(1), :name => '1.1', :effective_date => '99999-01-01')
-                assert !v.save
+                assert !v.valid?
+                v.effective_date = '2012-11-33'
+                assert !v.valid?
+                v.effective_date = '2012-31-11'
+                assert !v.valid?
+                v.effective_date = 'ABC'
+                assert !v.valid?
                 assert_include I18n.translate('activerecord.errors.messages.not_a_date'),
                                v.errors[:effective_date]
               end

General Comments 0

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

No TODOs yet

	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