diff options
author | Lin Jen-Shin <godfat@godfat.org> | 2016-09-12 20:22:59 +0800 |
---|---|---|
committer | Lin Jen-Shin <godfat@godfat.org> | 2016-09-12 20:22:59 +0800 |
commit | 47dccfb32935426a4f1cf386466961f61225208a (patch) | |
tree | 13322110eac7f8f2fd88f9678b8df300681b9800 | |
parent | 683d8b7f007ad750d088b074e50339c66bf5dd82 (diff) | |
download | gitlab-ce-47dccfb32935426a4f1cf386466961f61225208a.tar.gz |
Fix test (credits to Kamil)
-rw-r--r-- | app/models/concerns/has_status.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb index f7b8352405c..77fc66a7105 100644 --- a/app/models/concerns/has_status.rb +++ b/app/models/concerns/has_status.rb @@ -8,8 +8,9 @@ module HasStatus class_methods do def status_sql - scope = all.relevant + scope = all builds = scope.select('count(*)').to_sql + created = scope.created.select('count(*)').to_sql success = scope.success.select('count(*)').to_sql ignored = scope.ignored.select('count(*)').to_sql if scope.respond_to?(:ignored) ignored ||= '0' @@ -22,9 +23,9 @@ module HasStatus WHEN (#{builds})=0 THEN NULL WHEN (#{builds})=(#{skipped}) THEN 'skipped' WHEN (#{builds})=(#{success})+(#{ignored})+(#{skipped}) THEN 'success' - WHEN (#{builds})=(#{pending})+(#{skipped}) THEN 'pending' + WHEN (#{builds})=(#{created})+(#{pending})+(#{skipped}) THEN 'pending' WHEN (#{builds})=(#{canceled})+(#{success})+(#{ignored})+(#{skipped}) THEN 'canceled' - WHEN (#{running})+(#{pending})>0 THEN 'running' + WHEN (#{running})+(#{pending})+(#{created})>0 THEN 'running' ELSE 'failed' END)" |