Move illustration to build specific statuses

11 files changed, 101 insertions, 44 deletions

diff --git a/lib/gitlab/ci/status/build/action.rb b/lib/gitlab/ci/status/build/action.rb
index 6c9125647ad..17eb37448cb 100644
--- a/lib/gitlab/ci/status/build/action.rb
+++ b/lib/gitlab/ci/status/build/action.rb
@@ -14,6 +14,15 @@ module Gitlab
             end
           end
 
+          def illustration
+            {
+              image: 'illustrations/manual_action.svg',
+              size: 'svg-394',
+              title: _('This job requires a manual action'),
+              content: _('This job depends on a user to trigger its process. Often they are used to deploy code to production environments'),
+            }
+          end
+
           def self.matches?(build, user)
             build.playable?
           end
diff --git a/lib/gitlab/ci/status/build/canceled.rb b/lib/gitlab/ci/status/build/canceled.rb
new file mode 100644
index 00000000000..c83e2734a73
--- /dev/null
+++ b/lib/gitlab/ci/status/build/canceled.rb
@@ -0,0 +1,21 @@
+module Gitlab
+  module Ci
+    module Status
+      module Build
+        class Canceled < Status::Extended
+          def illustration
+            {
+              image: 'illustrations/canceled-job_empty.svg',
+              size: 'svg-430',
+              title: _('This job has been canceled')
+            }
+          end
+
+          def self.matches?(build, user)
+            build.canceled?
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/status/build/created.rb b/lib/gitlab/ci/status/build/created.rb
new file mode 100644
index 00000000000..5be8e9de425
--- /dev/null
+++ b/lib/gitlab/ci/status/build/created.rb
@@ -0,0 +1,22 @@
+module Gitlab
+  module Ci
+    module Status
+      module Build
+        class Created < Status::Extended
+          def illustration
+            {
+              image: 'illustrations/job_not_triggered.svg',
+              size: 'svg-306',
+              title: _('This job has not been triggered yet'),
+              content: _('This job depends on upstream jobs that need to succeed in order for this job to be triggered')
+            }
+          end
+
+          def self.matches?(build, user)
+            build.created?
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/status/build/factory.rb b/lib/gitlab/ci/status/build/factory.rb
index c852d607373..ae4b2bd79bc 100644
--- a/lib/gitlab/ci/status/build/factory.rb
+++ b/lib/gitlab/ci/status/build/factory.rb
@@ -9,7 +9,12 @@ module Gitlab
              [Status::Build::FailedAllowed,
               Status::Build::Play,
               Status::Build::Stop],
-             [Status::Build::Action]]
+             [Status::Build::Action],
+             [Status::Build::Action,
+              Status::Build::Canceled,
+              Status::Build::Created,
+              Status::Build::Pending,
+              Status::Build::Skipped]]
           end
 
           def self.common_helpers
diff --git a/lib/gitlab/ci/status/build/pending.rb b/lib/gitlab/ci/status/build/pending.rb
new file mode 100644
index 00000000000..9dd9a27ad57
--- /dev/null
+++ b/lib/gitlab/ci/status/build/pending.rb
@@ -0,0 +1,22 @@
+module Gitlab
+  module Ci
+    module Status
+      module Build
+        class Pending < Status::Extended
+          def illustration
+            {
+              image: 'illustrations/pending_job_empty.svg',
+              size: 'svg-430',
+              title: _('This job has not started yet'),
+              content: _('This job is in pending state and is waiting to be picked by a runner')
+            }
+          end
+
+          def self.matches?(build, user)
+            build.pending?
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/status/build/skipped.rb b/lib/gitlab/ci/status/build/skipped.rb
new file mode 100644
index 00000000000..3e678d0baee
--- /dev/null
+++ b/lib/gitlab/ci/status/build/skipped.rb
@@ -0,0 +1,21 @@
+module Gitlab
+  module Ci
+    module Status
+      module Build
+        class Skipped < Status::Extended
+          def illustration
+            {
+              image: 'illustrations/skipped-job_empty.svg',
+              size: 'svg-430',
+              title: _('This job has been skipped')
+            }
+          end
+
+          def self.matches?(build, user)
+            build.skipped?
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/lib/gitlab/ci/status/canceled.rb b/lib/gitlab/ci/status/canceled.rb
index bea8dcd5587..e6195a60d4f 100644
--- a/lib/gitlab/ci/status/canceled.rb
+++ b/lib/gitlab/ci/status/canceled.rb
@@ -17,14 +17,6 @@ module Gitlab
         def favicon
           'favicon_status_canceled'
         end
-
-        def illustration
-          {
-            image: 'illustrations/canceled-job_empty.svg',
-            size: 'svg-430',
-            title: _('This job has been canceled')
-          }
-        end
       end
     end
   end
diff --git a/lib/gitlab/ci/status/created.rb b/lib/gitlab/ci/status/created.rb
index 3b2a9e5d0ef..846f00b83dd 100644
--- a/lib/gitlab/ci/status/created.rb
+++ b/lib/gitlab/ci/status/created.rb
@@ -17,15 +17,6 @@ module Gitlab
         def favicon
           'favicon_status_created'
         end
-
-        def illustration
-          {
-            image: 'illustrations/job_not_triggered.svg',
-            size: 'svg-306',
-            title: _('This job has not been triggered yet'),
-            content: _('This job depends on upstream jobs that need to succeed in order for this job to be triggered')
-          }
-        end
       end
     end
   end
diff --git a/lib/gitlab/ci/status/manual.rb b/lib/gitlab/ci/status/manual.rb
index cb587a7815e..fc387e2fd25 100644
--- a/lib/gitlab/ci/status/manual.rb
+++ b/lib/gitlab/ci/status/manual.rb
@@ -17,15 +17,6 @@ module Gitlab
         def favicon
           'favicon_status_manual'
         end
-
-        def illustration
-          {
-            image: 'illustrations/manual_action.svg',
-            size: 'svg-394',
-            title: _('This job requires a manual action'),
-            content: _('This job depends on a user to trigger its process. Often they are used to deploy code to production environments')
-          }
-        end
       end
     end
   end
diff --git a/lib/gitlab/ci/status/pending.rb b/lib/gitlab/ci/status/pending.rb
index 6a27a83696a..6780780db32 100644
--- a/lib/gitlab/ci/status/pending.rb
+++ b/lib/gitlab/ci/status/pending.rb
@@ -17,15 +17,6 @@ module Gitlab
         def favicon
           'favicon_status_pending'
         end
-
-        def illustration
-          {
-            image: 'illustrations/pending_job_empty.svg',
-            size: 'svg-430',
-            title: _('This job has not started yet'),
-            content: _('This job is in pending state and is waiting to be picked by a runner')
-          }
-        end
       end
     end
   end
diff --git a/lib/gitlab/ci/status/skipped.rb b/lib/gitlab/ci/status/skipped.rb
index ff7529b5f03..0dbdc4de426 100644
--- a/lib/gitlab/ci/status/skipped.rb
+++ b/lib/gitlab/ci/status/skipped.rb
@@ -17,14 +17,6 @@ module Gitlab
         def favicon
           'favicon_status_skipped'
         end
-
-        def illustration
-          {
-            image: 'illustrations/skipped-job_empty.svg',
-            size: 'svg-430',
-            title: _('This job has been skipped')
-          }
-        end
       end
     end
   end