Merge remote-tracking branch 'upstream/master' into show-commit-status-from-latest-pipeline

* upstream/master: (39 commits)
  Improve build status specs contexts descriptions
  Add some missing tests for detailed status methods
  Remove trailing blank line from Allowable module
  Update manual build icon SVG
  Make it possible to mix `Gitlab::Routing` in
  Extract abilities checking module from ability model
  Extend tests for pipeline detailed status helpers
  Add tests for common build detailed status helpers
  Add missing tests for build `cancelable?` method
  Add tests for detailed build statuses factory
  Make it possible to retry build that was canceled
  Make build retryable only if complete and executed
  Improve readability in methods for detailed status
  Add tests for build cancelable/retryable statuses
  Extend specs for build play/stop detailed statuses
  Refine build stop/play extended status specs
  Use manual build icon in play/stop build statuses
  Adds manual action icon and case to show it
  Fix detailed status specs for pipeline stage model
  Fix detailed status badge for generic commit status
  ...

Author: godfat

app/helpers/ci_status_helper.rb

@@ -4,25 +4,7 @@ def ci_status_path(pipeline)
     builds_namespace_project_commit_path(project.namespace, project, pipeline.sha)
   end
 
-  def ci_status_with_icon(status, target = nil)
-    content = ci_icon_for_status(status) + ci_text_for_status(status)
-    klass = "ci-status ci-#{status}"
-
-    if target
-      link_to content, target, class: klass
-    else
-      content_tag :span, content, class: klass
-    end
-  end
-
-  def ci_text_for_status(status)
-    if detailed_status?(status)
-      status.text
-    else
-      status
-    end
-  end
-
+  # Is used by Commit and Merge Request Widget
   def ci_label_for_status(status)
     if detailed_status?(status)
       return status.label

app/models/ci/build.rb

@@ -100,6 +100,12 @@ def retry(build, user = nil)
       end
     end
 
+    def detailed_status(current_user)
+      Gitlab::Ci::Status::Build::Factory
+        .new(self, current_user)
+        .fabricate!
+    end
+
     def manual?
       self.when == 'manual'
     end
@@ -123,8 +129,13 @@ def play(current_user = nil)
       end
     end
 
+    def cancelable?
+      active?
+    end
+
     def retryable?
-      project.builds_enabled? && commands.present? && complete?
+      project.builds_enabled? && commands.present? &&
+        (success? || failed? || canceled?)
     end
 
     def retried?
@@ -148,7 +159,7 @@ def stops_environment?
     end
 
     def environment_action
-      self.options.fetch(:environment, {}).fetch(:action, 'start')
+      self.options.fetch(:environment, {}).fetch(:action, 'start') if self.options
     end
 
     def outdated_deployment?

app/models/ci/pipeline.rb

@@ -346,8 +346,10 @@ def merge_requests
         .select { |merge_request| merge_request.head_pipeline.try(:id) == self.id }
     end
 
-    def detailed_status
-      Gitlab::Ci::Status::Pipeline::Factory.new(self).fabricate!
+    def detailed_status(current_user)
+      Gitlab::Ci::Status::Pipeline::Factory
+        .new(self, current_user)
+        .fabricate!
     end
 
     private

app/models/ci/stage.rb

@@ -22,8 +22,10 @@ def status
       @status ||= statuses.latest.status
     end
 
-    def detailed_status
-      Gitlab::Ci::Status::Stage::Factory.new(self).fabricate!
+    def detailed_status(current_user)
+      Gitlab::Ci::Status::Stage::Factory
+        .new(self, current_user)
+        .fabricate!
     end
 
     def statuses

app/models/commit_status.rb

@@ -131,4 +131,10 @@ def stuck?
   def has_trace?
     false
   end
+
+  def detailed_status(current_user)
+    Gitlab::Ci::Status::Factory
+      .new(self, current_user)
+      .fabricate!
+  end
 end

app/views/admin/runners/show.html.haml

@@ -91,7 +91,7 @@
               %strong ##{build.id}
 
           %td.status
-            = ci_status_with_icon(build.status)
+            = render 'ci/status/badge', status: build.detailed_status(current_user)
 
           %td.status
             - if project

app/views/ci/status/_badge.html.haml

@@ -0,0 +1,10 @@
+- status = local_assigns.fetch(:status)
+
+- if status.has_details?
+  = link_to status.details_path, class: "ci-status ci-#{status}" do
+    = custom_icon(status.icon)
+    = status.text
+- else
+  %span{ class: "ci-status ci-#{status}" }
+    = custom_icon(status.icon)
+    = status.text

app/views/projects/builds/_header.html.haml

@@ -1,6 +1,6 @@
 .content-block.build-header
   .header-content
-    = ci_status_with_icon(@build.status)
+    = render 'ci/status/badge', status: @build.detailed_status(current_user)
     Build
     %strong ##{@build.id}
     in pipeline

app/views/projects/ci/builds/_build.html.haml

@@ -9,10 +9,7 @@
 
 %tr.build.commit{class: ('retried' if retried)}
   %td.status
-    - if can?(current_user, :read_build, build)
-      = ci_status_with_icon(build.status, namespace_project_build_url(http://github.com/build.project.namespace,%20build.project,%20build))
-    - else
-      = ci_status_with_icon(build.status)
+    = render "ci/status/badge", status: build.detailed_status(current_user)
 
   %td.branch-commit
     - if can?(current_user, :read_build, build)

app/views/projects/ci/pipelines/_pipeline.html.haml

@@ -1,13 +1,10 @@
 - status = pipeline.status
-- detailed_status = pipeline.detailed_status
 - show_commit = local_assigns.fetch(:show_commit, true)
 - show_branch = local_assigns.fetch(:show_branch, true)
 
 %tr.commit
   %td.commit-link
-    = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id), class: "ci-status ci-#{detailed_status}" do
-      = ci_icon_for_status(detailed_status)
-      = ci_text_for_status(detailed_status)
+    = render 'ci/status/badge', status: pipeline.detailed_status(current_user)
 
   %td
     = link_to namespace_project_pipeline_path(pipeline.project.namespace, pipeline.project, pipeline.id) do

app/views/projects/generic_commit_statuses/_generic_commit_status.html.haml

@@ -8,10 +8,7 @@
 
 %tr.generic_commit_status{class: ('retried' if retried)}
   %td.status
-    - if can?(current_user, :read_commit_status, generic_commit_status) && generic_commit_status.target_url
-      = ci_status_with_icon(generic_commit_status.status, generic_commit_status.target_url)
-    - else
-      = ci_status_with_icon(generic_commit_status.status)
+    = render 'ci/status/badge', status: generic_commit_status.detailed_status(current_user)
 
   %td.generic_commit_status-link
     - if can?(current_user, :read_commit_status, generic_commit_status) && generic_commit_status.target_url

app/views/projects/pipelines/_info.html.haml

@@ -1,6 +1,6 @@
 .page-content-header
   .header-main-content
-    = ci_status_with_icon(@pipeline.detailed_status)
+    = render 'ci/status/badge', status: @pipeline.detailed_status(current_user)
     %strong Pipeline ##{@commit.pipelines.last.id}
     triggered #{time_ago_with_tooltip(@commit.authored_date)} by
     = author_avatar(@commit, size: 24)

app/views/projects/stage/_graph.html.haml

@@ -19,4 +19,4 @@
           %li.build
             .curve
             .dropdown.inline.build-content
-              = render "projects/stage/in_stage_group", name: group_name, subject: grouped_statuses
+              = render 'projects/stage/in_stage_group', name: group_name, subject: grouped_statuses

app/views/shared/icons/_icon_status_manual.svg

@@ -0,0 +1,7 @@
+module Gitlab
+  module Allowable
+    def can?(user, action, subject)
+      Ability.allowed?(user, action, subject)
+    end
+  end
+end

lib/gitlab/allowable.rb

@@ -0,0 +1,37 @@
+module Gitlab
+  module Ci
+    module Status
+      module Build
+        class Cancelable < SimpleDelegator
+          include Status::Extended
+
+          def has_action?
+            can?(user, :update_build, subject)
+          end
+
+          def action_icon
+            'ban'
+          end
+
+          def action_path
+            cancel_namespace_project_build_path(subject.project.namespace,
+                                                subject.project,
+                                                subject)
+          end
+
+          def action_method
+            :post
+          end
+
+          def action_title
+            'Cancel'
+          end
+
+          def self.matches?(build, user)
+            build.cancelable?
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/status/build/cancelable.rb

@@ -0,0 +1,19 @@
+module Gitlab
+  module Ci
+    module Status
+      module Build
+        module Common
+          def has_details?
+            can?(user, :read_build, subject)
+          end
+
+          def details_path
+            namespace_project_build_path(subject.project.namespace,
+                                         subject.project,
+                                         subject)
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/status/build/common.rb

@@ -0,0 +1,18 @@
+module Gitlab
+  module Ci
+    module Status
+      module Build
+        class Factory < Status::Factory
+          def self.extended_statuses
+            [Status::Build::Stop, Status::Build::Play,
+             Status::Build::Cancelable, Status::Build::Retryable]
+          end
+
+          def self.common_helpers
+            Status::Build::Common
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/status/build/factory.rb

@@ -0,0 +1,53 @@
+module Gitlab
+  module Ci
+    module Status
+      module Build
+        class Play < SimpleDelegator
+          include Status::Extended
+
+          def text
+            'manual'
+          end
+
+          def label
+            'manual play action'
+          end
+
+          def icon
+            'icon_status_manual'
+          end
+
+          def has_action?
+            can?(user, :update_build, subject)
+          end
+
+          def action_icon
+            'play'
+          end
+
+          def action_title
+            'Play'
+          end
+
+          def action_class
+            'ci-play-icon'
+          end
+
+          def action_path
+            play_namespace_project_build_path(subject.project.namespace,
+                                              subject.project,
+                                              subject)
+          end
+
+          def action_method
+            :post
+          end
+
+          def self.matches?(build, user)
+            build.playable? && !build.stops_environment?
+          end
+        end
+      end
+    end
+  end
+end

lib/gitlab/ci/status/build/play.rb

@@ -0,0 +1,37 @@
+module Gitlab
+  module Ci
+    module Status
+      module Build
+        class Retryable < SimpleDelegator
+          include Status::Extended
+
+          def has_action?
+            can?(user, :update_build, subject)
+          end
+
+          def action_icon
+            'refresh'
+          end
+
+          def action_title
+            'Retry'
+          end
+
+          def action_path
+            retry_namespace_project_build_path(subject.project.namespace,
+                                               subject.project,
+                                               subject)
+          end
+
+          def action_method
+            :post
+          end
+
+          def self.matches?(build, user)
+            build.retryable?
+          end
+        end
+      end
+    end
+  end
+end