diff options
author | Shinya Maeda <shinya@gitlab.com> | 2018-09-26 19:12:48 +0900 |
---|---|---|
committer | Alessio Caiazza <acaiazza@gitlab.com> | 2018-10-02 17:08:11 +0200 |
commit | 9266cd5e8b543ab356df3fba78bf9e01536a180d (patch) | |
tree | 945bf2af14acf74615dbb3744d1c514a1ea0fb2c /app/models/ci | |
parent | 4b0aa573498dda340bc24a63164433e1de670c03 (diff) | |
download | gitlab-ce-9266cd5e8b543ab356df3fba78bf9e01536a180d.tar.gz |
Add unit tests for Ci::Build. Fix validation on state transition
Diffstat (limited to 'app/models/ci')
-rw-r--r-- | app/models/ci/build.rb | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/app/models/ci/build.rb b/app/models/ci/build.rb index 1209e7ef696..f83dfa5d1c4 100644 --- a/app/models/ci/build.rb +++ b/app/models/ci/build.rb @@ -168,10 +168,8 @@ module Ci end event :enqueue_scheduled do - transition scheduled: :pending do - validate do |build| - build.scheduled_at && build.scheduled_at < Time.now - end + transition scheduled: :pending, if: ->(build) do + build.scheduled_at && build.scheduled_at < Time.now end end @@ -269,7 +267,7 @@ module Ci end def action? - %w[manual scheduled].include?(self.when) + %w[manual delayed].include?(self.when) end # rubocop: disable CodeReuse/ServiceClass |