Refactor CI helpers

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

1 files changed, 23 insertions, 13 deletions

diff --git a/app/helpers/ci_status_helper.rb b/app/helpers/ci_status_helper.rb
index 18c30ddb281..3a88ed7107e 100644
--- a/app/helpers/ci_status_helper.rb
+++ b/app/helpers/ci_status_helper.rb
@@ -4,19 +4,7 @@ module CiStatusHelper
   end
 
   def ci_status_icon(ci_commit)
-    icon_name =
-      case ci_commit.status
-      when 'success'
-        'check'
-      when 'failed'
-        'close'
-      when 'running', 'pending'
-        'clock-o'
-      else
-        'circle'
-      end
-
-    icon(icon_name)
+    ci_icon_for_status(ci_commit.status)
   end
 
   def ci_status_color(ci_commit)
@@ -31,4 +19,26 @@ module CiStatusHelper
       'gray'
     end
   end
+
+  def ci_status_with_icon(status)
+    content_tag :span, class: "ci-status ci-#{status}" do
+      ci_icon_for_status(status) + ' '.html_safe + status
+    end
+  end
+
+  def ci_icon_for_status(status)
+    icon_name =
+      case status
+      when 'success'
+        'check'
+      when 'failed'
+        'close'
+      when 'running', 'pending'
+        'clock-o'
+      else
+        'circle'
+      end
+
+    icon(icon_name)
+  end
 end