From ae38358310cb9ea613b3a08781158308e0dc4551 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Tue, 9 Apr 2019 16:47:13 -0500
Subject: [PATCH 1/6] Adds a way to start multiple manual jobs in stage

- Adds an endpoint on PipelinesController
- Adds a service that iterates over every build in a stage and
plays it.
- Includes 'play_manual' details on EntitySerializer
- Builds a new Stage state: PlayManual. An stage can take this status if
it has manual builds or an skipped, scheduled or manual status
- Includes FE modifications and specs
---
 .../components/graph/graph_component.vue      |  1 +
 .../graph/stage_column_component.vue          | 25 ++++-
 app/assets/stylesheets/pages/pipelines.scss   |  1 +
 .../projects/pipelines_controller.rb          | 17 +++-
 app/helpers/gitlab_routing_helper.rb          |  6 ++
 app/models/ci/legacy_stage.rb                 |  8 ++
 app/models/ci/pipeline.rb                     |  4 +
 app/models/ci/stage.rb                        |  4 +
 app/models/concerns/has_status.rb             |  4 +
 app/serializers/stage_entity.rb               |  8 +-
 .../stages/detailed_status_entity.rb          |  9 ++
 app/serializers/stages/play_manual_entity.rb  |  9 ++
 .../ci/play_stage_manual_builds_service.rb    | 25 +++++
 .../unreleased/28741-play-all-manual-jobs.yml |  5 +
 config/routes/project.rb                      |  1 +
 lib/gitlab/ci/status/stage/common.rb          |  4 +
 lib/gitlab/ci/status/stage/factory.rb         |  3 +-
 lib/gitlab/ci/status/stage/play_manual.rb     | 46 +++++++++
 locale/gitlab.pot                             |  3 +
 .../projects/pipelines_controller_spec.rb     | 43 +++++++++
 .../projects/pipelines/pipeline_spec.rb       |  6 ++
 .../graph/stage_column_component_spec.js      | 49 ++++++++++
 .../gitlab/ci/status/stage/factory_spec.rb    | 18 ++++
 .../ci/status/stage/play_manual_spec.rb       | 95 +++++++++++++++++++
 spec/models/ci/pipeline_spec.rb               | 28 ++++++
 spec/models/ci/stage_spec.rb                  | 31 +++++-
 spec/models/concerns/has_status_spec.rb       | 24 +++++
 spec/serializers/pipeline_serializer_spec.rb  |  4 +-
 spec/serializers/stage_entity_spec.rb         | 16 ++++
 .../play_stage_manual_builds_service_spec.rb  | 49 ++++++++++
 30 files changed, 539 insertions(+), 7 deletions(-)
 create mode 100644 app/serializers/stages/detailed_status_entity.rb
 create mode 100644 app/serializers/stages/play_manual_entity.rb
 create mode 100644 app/services/ci/play_stage_manual_builds_service.rb
 create mode 100644 changelogs/unreleased/28741-play-all-manual-jobs.yml
 create mode 100644 lib/gitlab/ci/status/stage/play_manual.rb
 create mode 100644 spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
 create mode 100644 spec/services/ci/play_stage_manual_builds_service_spec.rb

diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
index a49dc311bd0..62b81d8d937 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
@@ -24,6 +24,7 @@ export default {
           :groups="stage.groups"
           :stage-connector-class="stageConnectorClass(index, stage)"
           :is-first-column="isFirstColumn(index)"
+          :action="stage.play_manual_details"
           @refreshPipelineGraph="refreshPipelineGraph"
         />
       </ul>
diff --git a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
index 348c407f1b5..7e611b93087 100644
--- a/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/stage_column_component.vue
@@ -3,11 +3,13 @@ import _ from 'underscore';
 import stageColumnMixin from 'ee_else_ce/pipelines/mixins/stage_column_mixin';
 import JobItem from './job_item.vue';
 import JobGroupDropdown from './job_group_dropdown.vue';
+import ActionComponent from './action_component.vue';
 
 export default {
   components: {
     JobItem,
     JobGroupDropdown,
+    ActionComponent,
   },
   mixins: [stageColumnMixin],
   props: {
@@ -29,6 +31,16 @@ export default {
       required: false,
       default: '',
     },
+    action: {
+      type: Object,
+      required: false,
+      default: () => ({}),
+    },
+  },
+  computed: {
+    hasAction() {
+      return !_.isEmpty(this.action);
+    },
   },
   methods: {
     groupId(group) {
@@ -42,7 +54,18 @@ export default {
 </script>
 <template>
   <li :class="stageConnectorClass" class="stage-column">
-    <div class="stage-name">{{ title }}</div>
+    <div class="stage-name position-relative">
+      {{ title }}
+      <action-component
+        v-if="hasAction"
+        :action-icon="action.icon"
+        :tooltip-text="action.title"
+        :link="action.path"
+        class="js-stage-action position-absolute position-top-0 rounded"
+        @pipelineActionRequestComplete="pipelineActionRequestComplete"
+      />
+    </div>
+
     <div class="builds-container">
       <ul>
         <li
diff --git a/app/assets/stylesheets/pages/pipelines.scss b/app/assets/stylesheets/pages/pipelines.scss
index 093fc89a56f..96fdf74267e 100644
--- a/app/assets/stylesheets/pages/pipelines.scss
+++ b/app/assets/stylesheets/pages/pipelines.scss
@@ -565,6 +565,7 @@
     white-space: nowrap;
     overflow: hidden;
     text-overflow: ellipsis;
+    line-height: 2.2em;
   }
 
   .build {
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 22c4b8eef1f..147b50d8b76 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -6,7 +6,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   before_action :authorize_read_pipeline!
   before_action :authorize_read_build!, only: [:index]
   before_action :authorize_create_pipeline!, only: [:new, :create]
-  before_action :authorize_update_pipeline!, only: [:retry, :cancel]
+  before_action :authorize_update_pipeline!, only: [:retry, :cancel, :play_all_manual]
 
   around_action :allow_gitaly_ref_name_caching, only: [:index, :show]
 
@@ -147,6 +147,17 @@ def charts
     @counts[:failed] = @project.all_pipelines.failed.count(:all)
   end
 
+  def play_all_manual
+    return not_found unless pipeline_stage
+
+    ::Ci::PlayStageManualBuildsService.new(@project, current_user)
+      .execute(pipeline_stage)
+
+    render json: StageSerializer
+      .new(project: @project, current_user: @current_user)
+      .represent(pipeline_stage, details: true)
+  end
+
   private
 
   def serialize_pipelines
@@ -196,4 +207,8 @@ def limited_pipelines_count(project, scope = nil)
 
     view_context.limited_counter_with_delimiter(finder.execute)
   end
+
+  def pipeline_stage
+    @pipeline_stage ||= pipeline.find_stage_by_name(params[:stage])
+  end
 end
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index 04cf43be452..78bcd4a8919 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -193,4 +193,10 @@ def take_ownership_pipeline_schedule_path(schedule, *args)
     project = schedule.project
     take_ownership_project_pipeline_schedule_path(project, schedule, *args)
   end
+
+  # Stages
+  def play_all_project_stage_path(pipeline, stage_name)
+    project = pipeline.project
+    play_all_manual_namespace_project_pipeline_path(project.namespace, project, pipeline, stage: stage_name) # rubocop:disable Cop/ProjectPathHelper
+  end
 end
diff --git a/app/models/ci/legacy_stage.rb b/app/models/ci/legacy_stage.rb
index 96dbc7b6895..26fe18c4d3e 100644
--- a/app/models/ci/legacy_stage.rb
+++ b/app/models/ci/legacy_stage.rb
@@ -51,6 +51,14 @@ def success?
       status.to_s == 'success'
     end
 
+    def manual_playable?
+      %w[success running failed].include?(status.to_s)
+    end
+
+    def blocked_or_skipped?
+      %[manual scheduled skipped].include?(status.to_s)
+    end
+
     def has_warnings?
       if @warnings.is_a?(Integer)
         @warnings > 0
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 2b7835d7fab..20c0088fd10 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -771,6 +771,10 @@ def source_ref_slug
       Gitlab::Utils.slugify(source_ref.to_s)
     end
 
+    def find_stage_by_name(name)
+      stages.find_by(name: name)
+    end
+
     private
 
     def ci_yaml_from_repo
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index b25b0369666..b58af5fe1e0 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -100,6 +100,10 @@ def groups
       @groups ||= Ci::Group.fabricate(self)
     end
 
+    def manual_playable?
+      %w[success running failed].include?(status)
+    end
+
     def has_warnings?
       number_of_warnings.positive?
     end
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb
index 8882f48c281..921d3cbef19 100644
--- a/app/models/concerns/has_status.rb
+++ b/app/models/concerns/has_status.rb
@@ -122,6 +122,10 @@ def blocked?
     BLOCKED_STATUS.include?(status)
   end
 
+  def blocked_or_skipped?
+    blocked? || status == 'skipped'
+  end
+
   private
 
   def calculate_duration
diff --git a/app/serializers/stage_entity.rb b/app/serializers/stage_entity.rb
index 029dd3d0684..54b892b1652 100644
--- a/app/serializers/stage_entity.rb
+++ b/app/serializers/stage_entity.rb
@@ -42,14 +42,20 @@ class StageEntity < Grape::Entity
       format: :json)
   end
 
+  expose :play_manual_details,
+    if: -> (status, _) { detailed_status.has_manual_builds? },
+    with: Stages::PlayManualEntity
+
   private
 
   alias_method :stage, :object
 
   def detailed_status
-    stage.detailed_status(request.current_user)
+    @detailed_status ||= stage.detailed_status(request.current_user)
   end
 
+  alias_method :play_manual_details, :detailed_status
+
   def grouped_statuses
     @grouped_statuses ||= stage.statuses.latest_ordered.group_by(&:status)
   end
diff --git a/app/serializers/stages/detailed_status_entity.rb b/app/serializers/stages/detailed_status_entity.rb
new file mode 100644
index 00000000000..4cd63b3f094
--- /dev/null
+++ b/app/serializers/stages/detailed_status_entity.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module Stages
+  class DetailedStatusEntity < DetailedStatusEntity
+    expose :manual_builds_details,
+      if: -> (status, _) { status.has_manual_builds? },
+      with: Stages::PlayManualEntity
+  end
+end
diff --git a/app/serializers/stages/play_manual_entity.rb b/app/serializers/stages/play_manual_entity.rb
new file mode 100644
index 00000000000..618b38c9743
--- /dev/null
+++ b/app/serializers/stages/play_manual_entity.rb
@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class Stages::PlayManualEntity < Grape::Entity
+  expose :action_icon, as: :icon
+  expose :action_button_title, as: :button_title
+  expose :action_title, as: :title
+  expose :action_path, as: :path
+  expose :action_method, as: :method
+end
diff --git a/app/services/ci/play_stage_manual_builds_service.rb b/app/services/ci/play_stage_manual_builds_service.rb
new file mode 100644
index 00000000000..1c62a58c104
--- /dev/null
+++ b/app/services/ci/play_stage_manual_builds_service.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Ci
+  class PlayStageManualBuildsService < BaseService
+    include Gitlab::Utils::StrongMemoize
+
+    def execute(stage)
+      @stage = stage
+
+      manual_builds.each do |build|
+        build.play(current_user)
+      end
+    end
+
+    private
+
+    attr_reader :stage
+
+    def manual_builds
+      strong_memoize(:manual_builds) do
+        stage.builds.manual
+      end
+    end
+  end
+end
diff --git a/changelogs/unreleased/28741-play-all-manual-jobs.yml b/changelogs/unreleased/28741-play-all-manual-jobs.yml
new file mode 100644
index 00000000000..30b26e3c0ed
--- /dev/null
+++ b/changelogs/unreleased/28741-play-all-manual-jobs.yml
@@ -0,0 +1,5 @@
+---
+title: Play all manual jobs in a stage
+merge_request: 27188
+author:
+type: added
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 61eb136f65b..892bacc6af2 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -200,6 +200,7 @@
           get :builds
           get :failures
           get :status
+          post :play_all_manual, path: 'stages/:stage/play_all_manual'
         end
       end
 
diff --git a/lib/gitlab/ci/status/stage/common.rb b/lib/gitlab/ci/status/stage/common.rb
index f12daaa9676..f2fe6a94acb 100644
--- a/lib/gitlab/ci/status/stage/common.rb
+++ b/lib/gitlab/ci/status/stage/common.rb
@@ -18,6 +18,10 @@ def details_path
           def has_action?
             false
           end
+
+          def has_manual_builds?
+            false
+          end
         end
       end
     end
diff --git a/lib/gitlab/ci/status/stage/factory.rb b/lib/gitlab/ci/status/stage/factory.rb
index 58f4642510b..e50b0853725 100644
--- a/lib/gitlab/ci/status/stage/factory.rb
+++ b/lib/gitlab/ci/status/stage/factory.rb
@@ -6,7 +6,8 @@ module Status
       module Stage
         class Factory < Status::Factory
           def self.extended_statuses
-            [Status::SuccessWarning]
+            [[Status::SuccessWarning],
+             [Status::Stage::PlayManual]]
           end
 
           def self.common_helpers
diff --git a/lib/gitlab/ci/status/stage/play_manual.rb b/lib/gitlab/ci/status/stage/play_manual.rb
new file mode 100644
index 00000000000..332e4761981
--- /dev/null
+++ b/lib/gitlab/ci/status/stage/play_manual.rb
@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module Gitlab
+  module Ci
+    module Status
+      module Stage
+        class PlayManual < Status::Extended
+          include GitlabRoutingHelper
+
+          def label
+            'play all manual'
+          end
+
+          def action_icon
+            'play'
+          end
+
+          def action_button_title
+            _('Play all manual')
+          end
+
+          def action_title
+            'Play all manual'
+          end
+
+          def action_path
+            play_all_project_stage_path(subject.pipeline, subject.name)
+          end
+
+          def action_method
+            :post
+          end
+
+          def self.matches?(stage, user)
+            stage.blocked_or_skipped? ||
+              (stage.manual_playable? && stage.builds.manual.exists?)
+          end
+
+          def has_manual_builds?
+            true
+          end
+        end
+      end
+    end
+  end
+end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 3d56efa9834..a2f9cd22ae0 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -6628,6 +6628,9 @@ msgstr ""
 msgid "Play"
 msgstr ""
 
+msgid "Play all manual"
+msgstr ""
+
 msgid "Please %{link_to_register} or %{link_to_sign_in} to comment"
 msgstr ""
 
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index 9a50ea79f5e..65eedfc6bb1 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -393,4 +393,47 @@ def get_stage_ajax(name)
       end
     end
   end
+
+  describe 'POST #play_all_manual.json' do
+    let(:pipeline) { create(:ci_pipeline, project: project) }
+    let(:stage_name) { 'test' }
+
+    before do
+      create_manual_build(pipeline, 'test', 'rspec 1/3')
+      create_manual_build(pipeline, 'test', 'rspec 2/3')
+      create_manual_build(pipeline, 'test', 'rspec 3/3')
+
+      pipeline.reload
+
+      post :play_all_manual, params: {
+        namespace_id: project.namespace,
+        project_id: project,
+        id: pipeline.id,
+        stage: stage_name
+      }, format: :json
+    end
+
+    context 'when the stage does not exists' do
+      let(:stage_name) { 'deploy' }
+
+      it 'fails to play all manual' do
+        expect(response).to have_gitlab_http_status(:not_found)
+      end
+    end
+
+    context 'when the stage exists' do
+      it 'starts all manual jobs' do
+        expect(response).to have_gitlab_http_status(:ok)
+
+        expect(pipeline.builds.manual.count).to eq(0)
+      end
+    end
+
+    def create_manual_build(pipeline, stage, name)
+      create(:ci_build, :manual,
+             pipeline: pipeline,
+             stage: stage,
+             name: name)
+    end
+  end
 end
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 4ec44cb05b3..afa0062ccd3 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -225,6 +225,12 @@
 
           expect(page).not_to have_content('Play job')
         end
+
+        it 'is possible to play the stage with manual job' do
+          find('.js-stage-action').click
+
+          expect(page).not_to have_content('Play job')
+        end
       end
 
       context 'when pipeline has external job' do
diff --git a/spec/javascripts/pipelines/graph/stage_column_component_spec.js b/spec/javascripts/pipelines/graph/stage_column_component_spec.js
index 3240e8e4c1b..5183f8dd2d6 100644
--- a/spec/javascripts/pipelines/graph/stage_column_component_spec.js
+++ b/spec/javascripts/pipelines/graph/stage_column_component_spec.js
@@ -70,4 +70,53 @@ describe('stage column component', () => {
       );
     });
   });
+
+  describe('with action', () => {
+    it('renders action button', () => {
+      component = mountComponent(StageColumnComponent, {
+        groups: [
+          {
+            id: 4259,
+            name: '<img src=x onerror=alert(document.domain)>',
+            status: {
+              icon: 'status_success',
+              label: 'success',
+              tooltip: '<img src=x onerror=alert(document.domain)>',
+            },
+          },
+        ],
+        title: 'test',
+        hasTriggeredBy: false,
+        action: {
+          icon: 'play',
+          title: 'Play all',
+          path: 'action',
+        },
+      });
+
+      expect(component.$el.querySelector('.js-stage-action')).not.toBeNull();
+    });
+  });
+
+  describe('without action', () => {
+    it('does not render action button', () => {
+      component = mountComponent(StageColumnComponent, {
+        groups: [
+          {
+            id: 4259,
+            name: '<img src=x onerror=alert(document.domain)>',
+            status: {
+              icon: 'status_success',
+              label: 'success',
+              tooltip: '<img src=x onerror=alert(document.domain)>',
+            },
+          },
+        ],
+        title: 'test',
+        hasTriggeredBy: false,
+      });
+
+      expect(component.$el.querySelector('.js-stage-action')).toBeNull();
+    });
+  });
 });
diff --git a/spec/lib/gitlab/ci/status/stage/factory_spec.rb b/spec/lib/gitlab/ci/status/stage/factory_spec.rb
index dee4f4efd1b..5078665c471 100644
--- a/spec/lib/gitlab/ci/status/stage/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/stage/factory_spec.rb
@@ -23,6 +23,8 @@
 
   context 'when stage has a core status' do
     HasStatus::AVAILABLE_STATUSES.each do |core_status|
+      next if %w(manual skipped scheduled).include?(core_status)
+
       context "when core status is #{core_status}" do
         before do
           create(:ci_build, pipeline: pipeline, stage: 'test', status: core_status)
@@ -64,4 +66,20 @@
       expect(status.details_path).to include "pipelines/#{pipeline.id}##{stage.name}"
     end
   end
+
+  context 'when stage has manual builds' do
+    (HasStatus::BLOCKED_STATUS + ['skipped']).each do |core_status|
+      context "when status is #{core_status}" do
+        before do
+          create(:ci_build, pipeline: pipeline, stage: 'test', status: core_status)
+          create(:commit_status, pipeline: pipeline, stage: 'test', status: core_status)
+          create(:ci_build, pipeline: pipeline, stage: 'build', status: :manual)
+        end
+
+        it 'fabricates a play manual status' do
+          expect(status).to be_a(Gitlab::Ci::Status::Stage::PlayManual)
+        end
+      end
+    end
+  end
 end
diff --git a/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
new file mode 100644
index 00000000000..132a34d5703
--- /dev/null
+++ b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
@@ -0,0 +1,95 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Gitlab::Ci::Status::Stage::PlayManual do
+  let(:stage) { double('stage') }
+  let(:play_manual) { described_class.new(stage) }
+
+  describe '#label' do
+    subject { play_manual.label }
+
+    it { is_expected.to eq('play all manual') }
+  end
+
+  describe '#action_icon' do
+    subject { play_manual.action_icon }
+
+    it { is_expected.to eq('play') }
+  end
+
+  describe '#action_button_title' do
+    subject { play_manual.action_button_title }
+
+    it { is_expected.to eq('Play all manual') }
+  end
+
+  describe '#action_title' do
+    subject { play_manual.action_title }
+
+    it { is_expected.to eq('Play all manual') }
+  end
+
+  describe '#action_path' do
+    let(:stage) { create(:ci_stage_entity, status: 'manual') }
+    let(:pipeline) { stage.pipeline }
+    let(:project) { pipeline.project }
+    let(:status) { Gitlab::Ci::Status::Core.new(stage, create(:user)) }
+
+    subject { described_class.new(status).action_path }
+
+    it { is_expected.to eq("/#{project.full_path}/pipelines/#{pipeline.id}/stages/#{stage.name}/play_all_manual") }
+  end
+
+  describe '#action_method' do
+    subject { play_manual.action_method }
+
+    it { is_expected.to eq(:post) }
+  end
+
+  describe '.matches?' do
+    let(:user) { double('user') }
+
+    subject { described_class.matches?(stage, user) }
+
+    context 'when stage is skipped' do
+      let(:stage) { create(:ci_stage_entity, status: :skipped) }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when stage is manual' do
+      let(:stage) { create(:ci_stage_entity, status: :manual) }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when stage is scheduled' do
+      let(:stage) { create(:ci_stage_entity, status: :scheduled) }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when stage is success' do
+      let(:stage) { create(:ci_stage_entity, status: :success, name: 'build') }
+
+      context 'and has manual builds' do
+        before do
+          create_list(:ci_build, 2, :manual, stage: 'build', stage_id: stage.id)
+        end
+
+        it { is_expected.to be_truthy }
+      end
+
+      context 'and does not have manual buidls' do
+        it { is_expected.to be_falsy }
+      end
+    end
+  end
+
+  describe '#has_manual_builds?' do
+    subject { play_manual.has_manual_builds? }
+
+    it { is_expected.to be_truthy }
+  end
+end
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 9d0cd654f13..7a353ebd92b 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -2942,4 +2942,32 @@ def create_build(name, stage_idx)
       end
     end
   end
+
+  describe '#find_stage_by_name' do
+    let(:pipeline) { create(:ci_pipeline) }
+    let(:stage_name) { 'test' }
+
+    let(:stage) do
+      create(:ci_stage_entity,
+             pipeline: pipeline,
+             project: pipeline.project,
+             name: 'test')
+    end
+
+    before do
+      create_list(:ci_build, 2, pipeline: pipeline, stage: stage.name)
+    end
+
+    subject { pipeline.find_stage_by_name(stage_name) }
+
+    context 'when stage exists' do
+      it { is_expected.to eq(stage) }
+    end
+
+    context 'when stage does not exist' do
+      let(:stage_name) { 'build' }
+
+      it { is_expected.to be_nil }
+    end
+  end
 end
diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb
index 661958390e2..4602838fa4e 100644
--- a/spec/models/ci/stage_spec.rb
+++ b/spec/models/ci/stage_spec.rb
@@ -152,7 +152,7 @@
       %w[created]         | :created
       %w[success]         | :passed
       %w[pending]         | :pending
-      %w[skipped]         | :skipped
+      %w[skipped]         | 'play all manual'
       %w[canceled]        | :canceled
       %w[success failed]  | :failed
       %w[running pending] | :running
@@ -190,6 +190,21 @@
         expect(subject.label).to eq 'passed with warnings'
       end
     end
+
+    context 'when stage has manual builds' do
+      before do
+        create(:ci_build, project: stage.project,
+                          pipeline: stage.pipeline,
+                          stage_id: stage.id,
+                          status: 'manual')
+
+        stage.update_status
+      end
+
+      it 'is passed with warnings' do
+        expect(subject.label).to eq 'play all manual'
+      end
+    end
   end
 
   describe '#groups' do
@@ -285,4 +300,18 @@
       end
     end
   end
+
+  describe '#manual_playable?' do
+    let(:success) { create(:ci_stage_entity, status: 'success') }
+    let(:failed) { create(:ci_stage_entity, status: 'failed') }
+    let(:running) { create(:ci_stage_entity, status: 'running') }
+
+    context 'when status is success, running, or failed' do
+      it 'returns true' do
+        [success, failed, running].each do |stage|
+          expect(stage.manual_playable?).to be_truthy
+        end
+      end
+    end
+  end
 end
diff --git a/spec/models/concerns/has_status_spec.rb b/spec/models/concerns/has_status_spec.rb
index a217dc42537..05480ad0285 100644
--- a/spec/models/concerns/has_status_spec.rb
+++ b/spec/models/concerns/has_status_spec.rb
@@ -367,4 +367,28 @@
       puts subject
     end
   end
+
+  describe '#blocked_or_skipped?' do
+    %w[ci_pipeline ci_stage ci_build generic_commit_status].each do |type|
+      let(:object) { build(type, status: status) }
+
+      context 'when status is scheduled' do
+        let(:status) { :scheduled }
+
+        it { is_expected.to be_truthy }
+      end
+
+      context 'when status is manual' do
+        let(:status) { :manual }
+
+        it { is_expected.to be_truthy }
+      end
+
+      context 'when status is skipped' do
+        let(:status) { :skipped }
+
+        it { is_expected.to be_truthy }
+      end
+    end
+  end
 end
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index d9023036534..ec5cc13fa9f 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -157,7 +157,7 @@
         it 'verifies number of queries', :request_store do
           recorded = ActiveRecord::QueryRecorder.new { subject }
 
-          expected_queries = Gitlab.ee? ? 38 : 31
+          expected_queries = Gitlab.ee? ? 51 : 45
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
         end
@@ -177,7 +177,7 @@ def ref
           # pipeline. With the same ref this check is cached but if refs are
           # different then there is an extra query per ref
           # https://gitlab.com/gitlab-org/gitlab-ce/issues/46368
-          expected_queries = Gitlab.ee? ? 44 : 38
+          expected_queries = Gitlab.ee? ? 57 : 51
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
         end
diff --git a/spec/serializers/stage_entity_spec.rb b/spec/serializers/stage_entity_spec.rb
index 2034c7891ef..b62f5f76b52 100644
--- a/spec/serializers/stage_entity_spec.rb
+++ b/spec/serializers/stage_entity_spec.rb
@@ -48,6 +48,10 @@
       expect(subject[:title]).to eq 'test: passed'
     end
 
+    it 'does not contain play_all_manual info' do
+      expect(subject[:play_manual_details]).not_to be_present
+    end
+
     context 'when the jobs should be grouped' do
       let(:entity) { described_class.new(stage, request: request, grouped: true) }
 
@@ -66,5 +70,17 @@
         end
       end
     end
+
+    context 'when stage contains manual jobs' do
+      let(:stage) { create(:ci_stage_entity, status: 'skipped', name: 'test') }
+
+      before do
+        create_list(:ci_build, 3, :manual, stage: 'test', stage_id: stage.id)
+      end
+
+      it 'contains play_all_manual' do
+        expect(subject[:play_manual_details]).to be_present
+      end
+    end
   end
 end
diff --git a/spec/services/ci/play_stage_manual_builds_service_spec.rb b/spec/services/ci/play_stage_manual_builds_service_spec.rb
new file mode 100644
index 00000000000..7bf75f62730
--- /dev/null
+++ b/spec/services/ci/play_stage_manual_builds_service_spec.rb
@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::PlayStageManualBuildsService, '#execute' do
+  let(:pipeline) { create(:ci_pipeline) }
+  let(:project) { pipeline.project }
+  let(:stage) { create(:ci_stage_entity, pipeline: pipeline, project: project, name: 'test') }
+  let(:current_user) { create(:user) }
+
+  let(:service) do
+    described_class.new(project, current_user)
+  end
+
+  before do
+    project.add_maintainer(current_user)
+  end
+
+  context 'when pipeline has manual builds' do
+    before do
+      create_list(:ci_build, 3, :manual,
+                  pipeline: pipeline,
+                  stage: 'test',
+                  stage_id: stage.id)
+
+      service.execute(stage)
+      pipeline.reload
+    end
+
+    it 'starts manual builds from pipeline' do
+      expect(pipeline.builds.manual.count).to eq(0)
+    end
+  end
+
+  context 'when pipeline has no manual builds' do
+    before do
+      create_list(:ci_build, 2, :failed,
+                pipeline: pipeline,
+                stage: 'build')
+
+      service.execute(pipeline)
+      pipeline.reload
+    end
+
+    it 'does not update the builds' do
+      expect(pipeline.builds.failed.count).to eq(2)
+    end
+  end
+end
-- 
GitLab


From 98593803fbf45a98fe7067e5b290ccf1f371330f Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Mon, 22 Apr 2019 10:25:55 -0500
Subject: [PATCH 2/6] Addresses backend comments

- Moves manual builds query into model
- Removes unneeded methods from new Entity, and gitlab routing helper
- Removes extra file commited by accident
- Adds and memoize manual_builds into Stage
---
 .../projects/pipelines_controller.rb          |  6 +-
 app/helpers/gitlab_routing_helper.rb          |  6 --
 app/models/ci/legacy_stage.rb                 | 33 ++++++--
 app/models/ci/stage.rb                        | 21 ++++-
 .../stages/detailed_status_entity.rb          |  9 ---
 .../ci/play_stage_manual_builds_service.rb    | 22 ++---
 lib/gitlab/ci/status/stage/play_manual.rb     | 13 ++-
 .../projects/pipelines_controller_spec.rb     | 27 ++++---
 .../projects/pipelines/pipeline_spec.rb       | 20 +++--
 .../gitlab/ci/status/stage/factory_spec.rb    |  4 +-
 .../ci/status/stage/play_manual_spec.rb       | 15 +---
 spec/models/ci/legacy_stage_spec.rb           | 12 +++
 spec/models/ci/stage_spec.rb                  | 35 +++-----
 spec/serializers/pipeline_serializer_spec.rb  |  5 +-
 spec/serializers/stage_entity_spec.rb         |  2 +-
 .../play_stage_manual_builds_service_spec.rb  | 80 +++++++++++++------
 .../models/ci/stage_shared_examples.rb        | 37 +++++++++
 17 files changed, 216 insertions(+), 131 deletions(-)
 delete mode 100644 app/serializers/stages/detailed_status_entity.rb
 create mode 100644 spec/support/shared_examples/models/ci/stage_shared_examples.rb

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 147b50d8b76..063526d7e8b 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -150,8 +150,10 @@ def charts
   def play_all_manual
     return not_found unless pipeline_stage
 
-    ::Ci::PlayStageManualBuildsService.new(@project, current_user)
-      .execute(pipeline_stage)
+    options = { pipeline: pipeline, stage: pipeline_stage }
+
+    ::Ci::PlayStageManualBuildsService.new(@project, current_user, options)
+      .execute
 
     render json: StageSerializer
       .new(project: @project, current_user: @current_user)
diff --git a/app/helpers/gitlab_routing_helper.rb b/app/helpers/gitlab_routing_helper.rb
index 78bcd4a8919..04cf43be452 100644
--- a/app/helpers/gitlab_routing_helper.rb
+++ b/app/helpers/gitlab_routing_helper.rb
@@ -193,10 +193,4 @@ def take_ownership_pipeline_schedule_path(schedule, *args)
     project = schedule.project
     take_ownership_project_pipeline_schedule_path(project, schedule, *args)
   end
-
-  # Stages
-  def play_all_project_stage_path(pipeline, stage_name)
-    project = pipeline.project
-    play_all_manual_namespace_project_pipeline_path(project.namespace, project, pipeline, stage: stage_name) # rubocop:disable Cop/ProjectPathHelper
-  end
 end
diff --git a/app/models/ci/legacy_stage.rb b/app/models/ci/legacy_stage.rb
index 26fe18c4d3e..eaaadb5f87e 100644
--- a/app/models/ci/legacy_stage.rb
+++ b/app/models/ci/legacy_stage.rb
@@ -5,6 +5,7 @@ module Ci
   # We should migrate this object to actual database record in the future
   class LegacyStage
     include StaticModel
+    include Gitlab::Utils::StrongMemoize
 
     attr_reader :pipeline, :name
 
@@ -51,19 +52,37 @@ def success?
       status.to_s == 'success'
     end
 
-    def manual_playable?
-      %w[success running failed].include?(status.to_s)
+    def has_warnings?
+      if @warnings.is_a?(Integer)
+        @warnings > 0
+      else
+        statuses.latest.failed_but_allowed.any?
+      end
     end
 
     def blocked_or_skipped?
       %[manual scheduled skipped].include?(status.to_s)
     end
 
-    def has_warnings?
-      if @warnings.is_a?(Integer)
-        @warnings > 0
-      else
-        statuses.latest.failed_but_allowed.any?
+    def manual_playable?
+      manual_playable_statuses.include?(status.to_s) && has_manual_builds?
+    end
+
+    def manual_builds
+      strong_memoize(:manual_builds) do
+        builds.manual
+      end
+    end
+
+    private
+
+    def manual_playable_statuses
+      %w[success failed created]
+    end
+
+    def has_manual_builds?
+      strong_memoize(:has_manual_builds) do
+        manual_builds.exists?
       end
     end
   end
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index b58af5fe1e0..6d5a3a64d61 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -6,6 +6,7 @@ class Stage < ApplicationRecord
     include Importable
     include HasStatus
     include Gitlab::OptimisticLocking
+    include Gitlab::Utils::StrongMemoize
 
     enum status: HasStatus::STATUSES_ENUM
 
@@ -101,7 +102,7 @@ def groups
     end
 
     def manual_playable?
-      %w[success running failed].include?(status)
+      manual_playable_statuses.include?(status) && has_manual_builds?
     end
 
     def has_warnings?
@@ -124,5 +125,23 @@ def detailed_status(current_user)
         .new(self, current_user)
         .fabricate!
     end
+
+    def manual_builds
+      strong_memoize(:manual_builds) do
+        builds.manual
+      end
+    end
+
+    private
+
+    def manual_playable_statuses
+      %w[success failed created]
+    end
+
+    def has_manual_builds?
+      strong_memoize(:has_manual_builds) do
+        manual_builds.exists?
+      end
+    end
   end
 end
diff --git a/app/serializers/stages/detailed_status_entity.rb b/app/serializers/stages/detailed_status_entity.rb
deleted file mode 100644
index 4cd63b3f094..00000000000
--- a/app/serializers/stages/detailed_status_entity.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Stages
-  class DetailedStatusEntity < DetailedStatusEntity
-    expose :manual_builds_details,
-      if: -> (status, _) { status.has_manual_builds? },
-      with: Stages::PlayManualEntity
-  end
-end
diff --git a/app/services/ci/play_stage_manual_builds_service.rb b/app/services/ci/play_stage_manual_builds_service.rb
index 1c62a58c104..df93d090fc5 100644
--- a/app/services/ci/play_stage_manual_builds_service.rb
+++ b/app/services/ci/play_stage_manual_builds_service.rb
@@ -2,24 +2,26 @@
 
 module Ci
   class PlayStageManualBuildsService < BaseService
-    include Gitlab::Utils::StrongMemoize
+    def initialize(project, current_user, params)
+      super
 
-    def execute(stage)
-      @stage = stage
+      @pipeline = params[:pipeline]
+      @stage = params[:stage]
+    end
+
+    def execute
+      raise Gitlab::Access::AccessDeniedError unless can?(current_user, :update_pipeline, pipeline)
 
-      manual_builds.each do |build|
-        build.play(current_user)
-      end
+      manual_builds.map(&:enqueue)
+      manual_builds.update_all(user_id: current_user.id, updated_at: Time.now)
     end
 
     private
 
-    attr_reader :stage
+    attr_reader :pipeline, :stage
 
     def manual_builds
-      strong_memoize(:manual_builds) do
-        stage.builds.manual
-      end
+      stage.manual_builds
     end
   end
 end
diff --git a/lib/gitlab/ci/status/stage/play_manual.rb b/lib/gitlab/ci/status/stage/play_manual.rb
index 332e4761981..1f13d8a226c 100644
--- a/lib/gitlab/ci/status/stage/play_manual.rb
+++ b/lib/gitlab/ci/status/stage/play_manual.rb
@@ -5,11 +5,7 @@ module Ci
     module Status
       module Stage
         class PlayManual < Status::Extended
-          include GitlabRoutingHelper
-
-          def label
-            'play all manual'
-          end
+          include Gitlab::Routing
 
           def action_icon
             'play'
@@ -24,7 +20,9 @@ def action_title
           end
 
           def action_path
-            play_all_project_stage_path(subject.pipeline, subject.name)
+            pipeline = subject.pipeline
+
+            play_all_manual_project_pipeline_path(pipeline.project, pipeline, subject.name)
           end
 
           def action_method
@@ -32,8 +30,7 @@ def action_method
           end
 
           def self.matches?(stage, user)
-            stage.blocked_or_skipped? ||
-              (stage.manual_playable? && stage.builds.manual.exists?)
+            stage.blocked_or_skipped? || stage.manual_playable?
           end
 
           def has_manual_builds?
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index 65eedfc6bb1..51a46916f40 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -404,36 +404,39 @@ def get_stage_ajax(name)
       create_manual_build(pipeline, 'test', 'rspec 3/3')
 
       pipeline.reload
-
-      post :play_all_manual, params: {
-        namespace_id: project.namespace,
-        project_id: project,
-        id: pipeline.id,
-        stage: stage_name
-      }, format: :json
     end
 
     context 'when the stage does not exists' do
       let(:stage_name) { 'deploy' }
 
       it 'fails to play all manual' do
+        play_all_manual!
+
         expect(response).to have_gitlab_http_status(:not_found)
       end
     end
 
     context 'when the stage exists' do
       it 'starts all manual jobs' do
-        expect(response).to have_gitlab_http_status(:ok)
+        expect(pipeline.builds.manual.count).to eq(3)
+        play_all_manual!
 
+        expect(response).to have_gitlab_http_status(:ok)
         expect(pipeline.builds.manual.count).to eq(0)
       end
     end
 
+    def play_all_manual!
+      post :play_all_manual, params: {
+        namespace_id: project.namespace,
+        project_id: project,
+        id: pipeline.id,
+        stage: stage_name
+      }, format: :json
+    end
+
     def create_manual_build(pipeline, stage, name)
-      create(:ci_build, :manual,
-             pipeline: pipeline,
-             stage: stage,
-             name: name)
+      create(:ci_build, :manual, pipeline: pipeline, stage: stage, name: name)
     end
   end
 end
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index afa0062ccd3..4cd19e64ec7 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -225,12 +225,6 @@
 
           expect(page).not_to have_content('Play job')
         end
-
-        it 'is possible to play the stage with manual job' do
-          find('.js-stage-action').click
-
-          expect(page).not_to have_content('Play job')
-        end
       end
 
       context 'when pipeline has external job' do
@@ -242,6 +236,20 @@
       end
     end
 
+    context 'when the pipeline has manual stage' do
+      before do
+        create(:ci_build, :manual, pipeline: pipeline, stage: 'publish', name: 'CentOS')
+        create(:ci_build, :manual, pipeline: pipeline, stage: 'publish', name: 'Debian')
+        create(:ci_build, :manual, pipeline: pipeline, stage: 'publish', name: 'OpenSUDE')
+
+        visit_pipeline
+      end
+
+      it 'displays play all button' do
+        expect(page).to have_selector('.js-stage-action')
+      end
+    end
+
     context 'page tabs' do
       before do
         visit_pipeline
diff --git a/spec/lib/gitlab/ci/status/stage/factory_spec.rb b/spec/lib/gitlab/ci/status/stage/factory_spec.rb
index 5078665c471..4b299170c87 100644
--- a/spec/lib/gitlab/ci/status/stage/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/stage/factory_spec.rb
@@ -22,9 +22,7 @@
   end
 
   context 'when stage has a core status' do
-    HasStatus::AVAILABLE_STATUSES.each do |core_status|
-      next if %w(manual skipped scheduled).include?(core_status)
-
+    (HasStatus::AVAILABLE_STATUSES - %w(manual skipped scheduled)).each do |core_status|
       context "when core status is #{core_status}" do
         before do
           create(:ci_build, pipeline: pipeline, stage: 'test', status: core_status)
diff --git a/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
index 132a34d5703..7ac3cf74dad 100644
--- a/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
+++ b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
@@ -6,12 +6,6 @@
   let(:stage) { double('stage') }
   let(:play_manual) { described_class.new(stage) }
 
-  describe '#label' do
-    subject { play_manual.label }
-
-    it { is_expected.to eq('play all manual') }
-  end
-
   describe '#action_icon' do
     subject { play_manual.action_icon }
 
@@ -33,12 +27,11 @@
   describe '#action_path' do
     let(:stage) { create(:ci_stage_entity, status: 'manual') }
     let(:pipeline) { stage.pipeline }
-    let(:project) { pipeline.project }
-    let(:status) { Gitlab::Ci::Status::Core.new(stage, create(:user)) }
+    let(:play_manual) { stage.detailed_status(create(:user)) }
 
-    subject { described_class.new(status).action_path }
+    subject { play_manual.action_path }
 
-    it { is_expected.to eq("/#{project.full_path}/pipelines/#{pipeline.id}/stages/#{stage.name}/play_all_manual") }
+    it { is_expected.to eq("/#{pipeline.project.full_path}/pipelines/#{pipeline.id}/stages/#{stage.name}/play_all_manual") }
   end
 
   describe '#action_method' do
@@ -81,7 +74,7 @@
         it { is_expected.to be_truthy }
       end
 
-      context 'and does not have manual buidls' do
+      context 'and does not have manual builds' do
         it { is_expected.to be_falsy }
       end
     end
diff --git a/spec/models/ci/legacy_stage_spec.rb b/spec/models/ci/legacy_stage_spec.rb
index be0307518eb..38ebec37f5f 100644
--- a/spec/models/ci/legacy_stage_spec.rb
+++ b/spec/models/ci/legacy_stage_spec.rb
@@ -272,4 +272,16 @@
   def create_job(type, status: 'success', stage: stage_name, **opts)
     create(type, pipeline: pipeline, stage: stage, status: status, **opts)
   end
+
+  describe '#manual_builds' do
+    it_behaves_like 'manual builds', :ci_stage
+  end
+
+  describe '#manual_playable?' do
+    def create_manual_builds(stage)
+      create_list(:ci_build, 2, :manual, stage: stage.name, pipeline: stage.pipeline)
+    end
+
+    it_behaves_like 'manual playable', :ci_stage
+  end
 end
diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb
index 4602838fa4e..cec8392914b 100644
--- a/spec/models/ci/stage_spec.rb
+++ b/spec/models/ci/stage_spec.rb
@@ -152,7 +152,7 @@
       %w[created]         | :created
       %w[success]         | :passed
       %w[pending]         | :pending
-      %w[skipped]         | 'play all manual'
+      %w[skipped]         | :skipped
       %w[canceled]        | :canceled
       %w[success failed]  | :failed
       %w[running pending] | :running
@@ -190,21 +190,6 @@
         expect(subject.label).to eq 'passed with warnings'
       end
     end
-
-    context 'when stage has manual builds' do
-      before do
-        create(:ci_build, project: stage.project,
-                          pipeline: stage.pipeline,
-                          stage_id: stage.id,
-                          status: 'manual')
-
-        stage.update_status
-      end
-
-      it 'is passed with warnings' do
-        expect(subject.label).to eq 'play all manual'
-      end
-    end
   end
 
   describe '#groups' do
@@ -301,17 +286,15 @@
     end
   end
 
-  describe '#manual_playable?' do
-    let(:success) { create(:ci_stage_entity, status: 'success') }
-    let(:failed) { create(:ci_stage_entity, status: 'failed') }
-    let(:running) { create(:ci_stage_entity, status: 'running') }
+  describe '#manual_builds' do
+    it_behaves_like 'manual builds', :ci_stage_entity
+  end
 
-    context 'when status is success, running, or failed' do
-      it 'returns true' do
-        [success, failed, running].each do |stage|
-          expect(stage.manual_playable?).to be_truthy
-        end
-      end
+  describe '#manual_playable?' do
+    def create_manual_builds(stage)
+      create_list(:ci_build, 2, :manual, stage: stage.name, stage_id: stage.id)
     end
+
+    it_behaves_like 'manual playable', :ci_stage_entity
   end
 end
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index ec5cc13fa9f..92df7f077cd 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -156,8 +156,7 @@
 
         it 'verifies number of queries', :request_store do
           recorded = ActiveRecord::QueryRecorder.new { subject }
-
-          expected_queries = Gitlab.ee? ? 51 : 45
+          expected_queries = Gitlab.ee? ? 50 : 43
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
         end
@@ -177,7 +176,7 @@ def ref
           # pipeline. With the same ref this check is cached but if refs are
           # different then there is an extra query per ref
           # https://gitlab.com/gitlab-org/gitlab-ce/issues/46368
-          expected_queries = Gitlab.ee? ? 57 : 51
+          expected_queries = Gitlab.ee? ? 55 : 49
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
         end
diff --git a/spec/serializers/stage_entity_spec.rb b/spec/serializers/stage_entity_spec.rb
index b62f5f76b52..e27f5e34ae0 100644
--- a/spec/serializers/stage_entity_spec.rb
+++ b/spec/serializers/stage_entity_spec.rb
@@ -48,7 +48,7 @@
       expect(subject[:title]).to eq 'test: passed'
     end
 
-    it 'does not contain play_all_manual info' do
+    it 'does not contain play_manual_details info' do
       expect(subject[:play_manual_details]).not_to be_present
     end
 
diff --git a/spec/services/ci/play_stage_manual_builds_service_spec.rb b/spec/services/ci/play_stage_manual_builds_service_spec.rb
index 7bf75f62730..8ffb33d82c7 100644
--- a/spec/services/ci/play_stage_manual_builds_service_spec.rb
+++ b/spec/services/ci/play_stage_manual_builds_service_spec.rb
@@ -3,47 +3,75 @@
 require 'spec_helper'
 
 describe Ci::PlayStageManualBuildsService, '#execute' do
-  let(:pipeline) { create(:ci_pipeline) }
-  let(:project) { pipeline.project }
-  let(:stage) { create(:ci_stage_entity, pipeline: pipeline, project: project, name: 'test') }
   let(:current_user) { create(:user) }
+  let(:pipeline) { create(:ci_pipeline, user: current_user) }
+  let(:project) { pipeline.project }
 
-  let(:service) do
-    described_class.new(project, current_user)
+  let(:stage) do
+    create(:ci_stage_entity,
+           pipeline: pipeline,
+           project: project,
+           name: 'test')
   end
 
-  before do
-    project.add_maintainer(current_user)
+  let(:options) do
+    {
+      pipeline: stage.pipeline,
+      stage: stage
+    }
   end
 
-  context 'when pipeline has manual builds' do
-    before do
-      create_list(:ci_build, 3, :manual,
-                  pipeline: pipeline,
-                  stage: 'test',
-                  stage_id: stage.id)
+  let(:service) do
+    described_class.new(project, current_user, options)
+  end
 
-      service.execute(stage)
-      pipeline.reload
-    end
+  context 'when user does not have access' do
+    it 'throws an exception' do
+      project.add_reporter(current_user)
 
-    it 'starts manual builds from pipeline' do
-      expect(pipeline.builds.manual.count).to eq(0)
+      expect do
+        service.execute
+      end.to raise_error(Gitlab::Access::AccessDeniedError)
     end
   end
 
-  context 'when pipeline has no manual builds' do
+  context 'when user has access' do
     before do
-      create_list(:ci_build, 2, :failed,
-                pipeline: pipeline,
-                stage: 'build')
+      project.add_maintainer(current_user)
+    end
+
+    context 'when pipeline has manual builds' do
+      before do
+        create_builds_for_stage('manual')
+        service.execute
+        pipeline.reload
+      end
+
+      it 'starts manual builds from pipeline' do
+        expect(pipeline.builds.manual.count).to eq(0)
+      end
 
-      service.execute(pipeline)
-      pipeline.reload
+      it 'updates manual builds' do
+        pipeline.builds.each do |build|
+          expect(build.user).to eq(current_user)
+        end
+      end
     end
 
-    it 'does not update the builds' do
-      expect(pipeline.builds.failed.count).to eq(2)
+    context 'when pipeline has no manual builds' do
+      before do
+        create_builds_for_stage('failed')
+        service.execute
+        pipeline.reload
+      end
+
+      it 'does not update the builds' do
+        expect(pipeline.builds.failed.count).to eq(3)
+      end
     end
   end
+
+  def create_builds_for_stage(status)
+    create_list(:ci_build, 3, status: status, pipeline: pipeline, stage: stage.name, stage_id: stage.id, user: pipeline.user)
+  end
 end
diff --git a/spec/support/shared_examples/models/ci/stage_shared_examples.rb b/spec/support/shared_examples/models/ci/stage_shared_examples.rb
new file mode 100644
index 00000000000..505c9bdc44d
--- /dev/null
+++ b/spec/support/shared_examples/models/ci/stage_shared_examples.rb
@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+shared_examples 'manual builds' do |stage_factory|
+  it 'returns manual builds relationship' do
+    stage = create(stage_factory, name: 'test')
+    create_list(:ci_build, 2, status: 'success', stage: stage.name, pipeline: stage.pipeline)
+    manual_builds = create_list(:ci_build, 2, :manual, stage: stage.name, pipeline: stage.pipeline)
+
+    expect(stage.manual_builds).to match_array(manual_builds)
+  end
+end
+
+shared_examples 'manual playable' do |stage_factory|
+  subject { stage.manual_playable? }
+
+  context 'when it has a manual playable status' do
+    let(:stage) { create(stage_factory, status: 'success') }
+
+    context 'and manual builds' do
+      before do
+        create_manual_builds(stage)
+      end
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'and no manual builds' do
+      it { is_expected.to be_falsy }
+    end
+  end
+
+  context 'when it has any other status' do
+    let(:stage) { create(stage_factory, status: 'canceled') }
+
+    it { is_expected.to be_falsy }
+  end
+end
-- 
GitLab


From b88aa1ffee081c1eb9778ad15fa5921b0387dbe2 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Thu, 25 Apr 2019 11:38:34 -0500
Subject: [PATCH 3/6] Simplify structure by relying on stages statuses

- 'Play all' button will be shown depending on the stage status. That
means the play all button will assume stages that are scheduled, manual
or skipped will contain manual jobs. Otherwise by adding a query, we're
increasing by 1 per stage the number of queries the pipelines needs to
be serialized
---
 .../projects/pipelines_controller.rb          |  2 +-
 app/models/ci/legacy_stage.rb                 | 23 --------
 app/models/ci/stage.rb                        | 23 --------
 app/serializers/stage_entity.rb               |  6 +-
 .../ci/play_stage_manual_builds_service.rb    |  2 +-
 lib/gitlab/ci/status/stage/play_manual.rb     |  2 +-
 .../ci/status/stage/play_manual_spec.rb       | 10 +---
 spec/models/ci/legacy_stage_spec.rb           | 12 ----
 spec/models/ci/stage_spec.rb                  | 12 ----
 spec/serializers/pipeline_serializer_spec.rb  |  4 +-
 spec/serializers/stage_entity_spec.rb         | 20 +++++--
 spec/serializers/stage_serializer_spec.rb     | 58 +++++++++++++++++++
 .../models/ci/stage_shared_examples.rb        | 37 ------------
 13 files changed, 85 insertions(+), 126 deletions(-)
 create mode 100644 spec/serializers/stage_serializer_spec.rb
 delete mode 100644 spec/support/shared_examples/models/ci/stage_shared_examples.rb

diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 063526d7e8b..64b440ba23b 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -157,7 +157,7 @@ def play_all_manual
 
     render json: StageSerializer
       .new(project: @project, current_user: @current_user)
-      .represent(pipeline_stage, details: true)
+      .represent(pipeline_stage, play_all: false)
   end
 
   private
diff --git a/app/models/ci/legacy_stage.rb b/app/models/ci/legacy_stage.rb
index eaaadb5f87e..a15875773ba 100644
--- a/app/models/ci/legacy_stage.rb
+++ b/app/models/ci/legacy_stage.rb
@@ -5,7 +5,6 @@ module Ci
   # We should migrate this object to actual database record in the future
   class LegacyStage
     include StaticModel
-    include Gitlab::Utils::StrongMemoize
 
     attr_reader :pipeline, :name
 
@@ -63,27 +62,5 @@ def has_warnings?
     def blocked_or_skipped?
       %[manual scheduled skipped].include?(status.to_s)
     end
-
-    def manual_playable?
-      manual_playable_statuses.include?(status.to_s) && has_manual_builds?
-    end
-
-    def manual_builds
-      strong_memoize(:manual_builds) do
-        builds.manual
-      end
-    end
-
-    private
-
-    def manual_playable_statuses
-      %w[success failed created]
-    end
-
-    def has_manual_builds?
-      strong_memoize(:has_manual_builds) do
-        manual_builds.exists?
-      end
-    end
   end
 end
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index 6d5a3a64d61..b25b0369666 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -6,7 +6,6 @@ class Stage < ApplicationRecord
     include Importable
     include HasStatus
     include Gitlab::OptimisticLocking
-    include Gitlab::Utils::StrongMemoize
 
     enum status: HasStatus::STATUSES_ENUM
 
@@ -101,10 +100,6 @@ def groups
       @groups ||= Ci::Group.fabricate(self)
     end
 
-    def manual_playable?
-      manual_playable_statuses.include?(status) && has_manual_builds?
-    end
-
     def has_warnings?
       number_of_warnings.positive?
     end
@@ -125,23 +120,5 @@ def detailed_status(current_user)
         .new(self, current_user)
         .fabricate!
     end
-
-    def manual_builds
-      strong_memoize(:manual_builds) do
-        builds.manual
-      end
-    end
-
-    private
-
-    def manual_playable_statuses
-      %w[success failed created]
-    end
-
-    def has_manual_builds?
-      strong_memoize(:has_manual_builds) do
-        manual_builds.exists?
-      end
-    end
   end
 end
diff --git a/app/serializers/stage_entity.rb b/app/serializers/stage_entity.rb
index 54b892b1652..07b0fd46567 100644
--- a/app/serializers/stage_entity.rb
+++ b/app/serializers/stage_entity.rb
@@ -43,7 +43,7 @@ class StageEntity < Grape::Entity
   end
 
   expose :play_manual_details,
-    if: -> (status, _) { detailed_status.has_manual_builds? },
+    if: -> (status, opts) { show_play_manual_details?(opts) },
     with: Stages::PlayManualEntity
 
   private
@@ -75,4 +75,8 @@ def retried_statuses
       grouped_retried_statuses.fetch(ordered_status, [])
     end.flatten
   end
+
+  def show_play_manual_details?(opts)
+    opts.fetch(:play_all, true) && detailed_status.has_manual_builds?
+  end
 end
diff --git a/app/services/ci/play_stage_manual_builds_service.rb b/app/services/ci/play_stage_manual_builds_service.rb
index df93d090fc5..2512c5310ef 100644
--- a/app/services/ci/play_stage_manual_builds_service.rb
+++ b/app/services/ci/play_stage_manual_builds_service.rb
@@ -21,7 +21,7 @@ def execute
     attr_reader :pipeline, :stage
 
     def manual_builds
-      stage.manual_builds
+      @manual_builds ||= stage.builds.manual
     end
   end
 end
diff --git a/lib/gitlab/ci/status/stage/play_manual.rb b/lib/gitlab/ci/status/stage/play_manual.rb
index 1f13d8a226c..554b650b0aa 100644
--- a/lib/gitlab/ci/status/stage/play_manual.rb
+++ b/lib/gitlab/ci/status/stage/play_manual.rb
@@ -30,7 +30,7 @@ def action_method
           end
 
           def self.matches?(stage, user)
-            stage.blocked_or_skipped? || stage.manual_playable?
+            stage.blocked_or_skipped?
           end
 
           def has_manual_builds?
diff --git a/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
index 7ac3cf74dad..a357881103d 100644
--- a/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
+++ b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
@@ -64,15 +64,7 @@
     end
 
     context 'when stage is success' do
-      let(:stage) { create(:ci_stage_entity, status: :success, name: 'build') }
-
-      context 'and has manual builds' do
-        before do
-          create_list(:ci_build, 2, :manual, stage: 'build', stage_id: stage.id)
-        end
-
-        it { is_expected.to be_truthy }
-      end
+      let(:stage) { create(:ci_stage_entity, status: :success) }
 
       context 'and does not have manual builds' do
         it { is_expected.to be_falsy }
diff --git a/spec/models/ci/legacy_stage_spec.rb b/spec/models/ci/legacy_stage_spec.rb
index 38ebec37f5f..be0307518eb 100644
--- a/spec/models/ci/legacy_stage_spec.rb
+++ b/spec/models/ci/legacy_stage_spec.rb
@@ -272,16 +272,4 @@
   def create_job(type, status: 'success', stage: stage_name, **opts)
     create(type, pipeline: pipeline, stage: stage, status: status, **opts)
   end
-
-  describe '#manual_builds' do
-    it_behaves_like 'manual builds', :ci_stage
-  end
-
-  describe '#manual_playable?' do
-    def create_manual_builds(stage)
-      create_list(:ci_build, 2, :manual, stage: stage.name, pipeline: stage.pipeline)
-    end
-
-    it_behaves_like 'manual playable', :ci_stage
-  end
 end
diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb
index cec8392914b..661958390e2 100644
--- a/spec/models/ci/stage_spec.rb
+++ b/spec/models/ci/stage_spec.rb
@@ -285,16 +285,4 @@
       end
     end
   end
-
-  describe '#manual_builds' do
-    it_behaves_like 'manual builds', :ci_stage_entity
-  end
-
-  describe '#manual_playable?' do
-    def create_manual_builds(stage)
-      create_list(:ci_build, 2, :manual, stage: stage.name, stage_id: stage.id)
-    end
-
-    it_behaves_like 'manual playable', :ci_stage_entity
-  end
 end
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index 92df7f077cd..88f18209dce 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -156,7 +156,7 @@
 
         it 'verifies number of queries', :request_store do
           recorded = ActiveRecord::QueryRecorder.new { subject }
-          expected_queries = Gitlab.ee? ? 50 : 43
+          expected_queries = Gitlab.ee? ? 38 : 31
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
         end
@@ -176,7 +176,7 @@ def ref
           # pipeline. With the same ref this check is cached but if refs are
           # different then there is an extra query per ref
           # https://gitlab.com/gitlab-org/gitlab-ce/issues/46368
-          expected_queries = Gitlab.ee? ? 55 : 49
+          expected_queries = Gitlab.ee? ? 44 : 38
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
         end
diff --git a/spec/serializers/stage_entity_spec.rb b/spec/serializers/stage_entity_spec.rb
index e27f5e34ae0..114a1593d72 100644
--- a/spec/serializers/stage_entity_spec.rb
+++ b/spec/serializers/stage_entity_spec.rb
@@ -71,12 +71,24 @@
       end
     end
 
-    context 'when stage contains manual jobs' do
-      let(:stage) { create(:ci_stage_entity, status: 'skipped', name: 'test') }
+    context 'with a skipped stage ' do
+      let(:stage) { create(:ci_stage_entity, status: 'skipped') }
 
-      before do
-        create_list(:ci_build, 3, :manual, stage: 'test', stage_id: stage.id)
+      it 'contains play_all_manual' do
+        expect(subject[:play_manual_details]).to be_present
+      end
+    end
+
+    context 'with a scheduled stage ' do
+      let(:stage) { create(:ci_stage_entity, status: 'scheduled') }
+
+      it 'contains play_all_manual' do
+        expect(subject[:play_manual_details]).to be_present
       end
+    end
+
+    context 'with a manual stage ' do
+      let(:stage) { create(:ci_stage_entity, status: 'manual') }
 
       it 'contains play_all_manual' do
         expect(subject[:play_manual_details]).to be_present
diff --git a/spec/serializers/stage_serializer_spec.rb b/spec/serializers/stage_serializer_spec.rb
new file mode 100644
index 00000000000..94d72910b32
--- /dev/null
+++ b/spec/serializers/stage_serializer_spec.rb
@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe StageSerializer do
+  let(:project) { create(:project, :repository) }
+  let(:user) { create(:user) }
+  let(:resource) { create(:ci_stage_entity) }
+
+  let(:serializer) do
+    described_class.new(current_user: user, project: project)
+  end
+
+  subject { serializer.represent(resource) }
+
+  describe '#represent' do
+    context 'with a single entity' do
+      it 'serializes the stage object' do
+        expect(subject[:name]).to eq(resource.name)
+      end
+    end
+
+    context 'with an array of entities' do
+      let(:resource) { create_list(:ci_stage_entity, 2) }
+
+      it 'serializes the array of pipelines' do
+        expect(subject).not_to be_empty
+      end
+    end
+
+    context 'with manual builds' do
+      let(:resource) { create(:ci_stage_entity, status: 'manual') }
+
+      subject { serializer.represent(resource, { play_all: play_all }) }
+
+      before do
+        create_list(:ci_build, 3, :manual,
+                    stage: resource.name, stage_id: resource.id)
+      end
+
+      context 'with play all option' do
+        let(:play_all) { true }
+
+        it 'returns play manual details' do
+          expect(subject[:play_manual_details]).to be_present
+        end
+      end
+
+      context 'without play all option' do
+        let(:play_all) { false }
+
+        it 'does not return play manual details' do
+          expect(subject[:play_manual_details]).not_to be_present
+        end
+      end
+    end
+  end
+end
diff --git a/spec/support/shared_examples/models/ci/stage_shared_examples.rb b/spec/support/shared_examples/models/ci/stage_shared_examples.rb
deleted file mode 100644
index 505c9bdc44d..00000000000
--- a/spec/support/shared_examples/models/ci/stage_shared_examples.rb
+++ /dev/null
@@ -1,37 +0,0 @@
-# frozen_string_literal: true
-
-shared_examples 'manual builds' do |stage_factory|
-  it 'returns manual builds relationship' do
-    stage = create(stage_factory, name: 'test')
-    create_list(:ci_build, 2, status: 'success', stage: stage.name, pipeline: stage.pipeline)
-    manual_builds = create_list(:ci_build, 2, :manual, stage: stage.name, pipeline: stage.pipeline)
-
-    expect(stage.manual_builds).to match_array(manual_builds)
-  end
-end
-
-shared_examples 'manual playable' do |stage_factory|
-  subject { stage.manual_playable? }
-
-  context 'when it has a manual playable status' do
-    let(:stage) { create(stage_factory, status: 'success') }
-
-    context 'and manual builds' do
-      before do
-        create_manual_builds(stage)
-      end
-
-      it { is_expected.to be_truthy }
-    end
-
-    context 'and no manual builds' do
-      it { is_expected.to be_falsy }
-    end
-  end
-
-  context 'when it has any other status' do
-    let(:stage) { create(stage_factory, status: 'canceled') }
-
-    it { is_expected.to be_falsy }
-  end
-end
-- 
GitLab


From 3d682824349bb8f969c82ab726039a572119770f Mon Sep 17 00:00:00 2001
From: Filipa Lacerda <filipa@gitlab.com>
Date: Fri, 26 Apr 2019 11:58:28 +0100
Subject: [PATCH 4/6] Adds spinner icon when user clicks on action button

---
 .../components/graph/action_component.vue          | 14 ++++++++++----
 .../pipelines/graph/action_component_spec.js       | 11 +++++++++++
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/app/assets/javascripts/pipelines/components/graph/action_component.vue b/app/assets/javascripts/pipelines/components/graph/action_component.vue
index 8ca539351a7..3c85bb61ce8 100644
--- a/app/assets/javascripts/pipelines/components/graph/action_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/action_component.vue
@@ -1,5 +1,5 @@
 <script>
-import { GlTooltipDirective, GlButton } from '@gitlab/ui';
+import { GlTooltipDirective, GlButton, GlLoadingIcon } from '@gitlab/ui';
 import axios from '~/lib/utils/axios_utils';
 import { dasherize } from '~/lib/utils/text_utility';
 import { __ } from '~/locale';
@@ -20,6 +20,7 @@ export default {
   components: {
     Icon,
     GlButton,
+    GlLoadingIcon,
   },
   directives: {
     GlTooltip: GlTooltipDirective,
@@ -41,6 +42,7 @@ export default {
   data() {
     return {
       isDisabled: false,
+      isLoading: false,
     };
   },
   computed: {
@@ -59,15 +61,19 @@ export default {
     onClickAction() {
       this.$root.$emit('bv::hide::tooltip', `js-ci-action-${this.link}`);
       this.isDisabled = true;
+      this.isLoading = true;
 
       axios
         .post(`${this.link}.json`)
         .then(() => {
           this.isDisabled = false;
+          this.isLoading = false;
+
           this.$emit('pipelineActionRequestComplete');
         })
         .catch(() => {
           this.isDisabled = false;
+          this.isLoading = false;
 
           createFlash(__('An error occurred while making the request.'));
         });
@@ -82,10 +88,10 @@ export default {
     :title="tooltipText"
     :class="cssClass"
     :disabled="isDisabled"
-    class="js-ci-action btn btn-blank
-btn-transparent ci-action-icon-container ci-action-icon-wrapper"
+    class="js-ci-action btn btn-blank btn-transparent ci-action-icon-container ci-action-icon-wrapper"
     @click="onClickAction"
   >
-    <icon :name="actionIcon" />
+    <gl-loading-icon v-if="isLoading" class="js-action-icon-loading" />
+    <icon v-else :name="actionIcon" />
   </gl-button>
 </template>
diff --git a/spec/javascripts/pipelines/graph/action_component_spec.js b/spec/javascripts/pipelines/graph/action_component_spec.js
index 95717d659b8..d93f83e792c 100644
--- a/spec/javascripts/pipelines/graph/action_component_spec.js
+++ b/spec/javascripts/pipelines/graph/action_component_spec.js
@@ -66,5 +66,16 @@ describe('pipeline graph action component', () => {
         done();
       }, 0);
     });
+
+    fit('renders a loading icon while waiting for request', done => {
+      component.$el.click();
+
+      component.$nextTick(() => {
+        expect(component.$el.querySelector('.js-action-icon-loading')).not.toBeNull();
+        setTimeout(() => {
+          done();
+        });
+      });
+    });
   });
 });
-- 
GitLab


From 6469d4cc8d8e6ddae4183855d41fe4dffc13d143 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Fri, 26 Apr 2019 08:54:12 -0500
Subject: [PATCH 5/6] Fixes static analysis failure

There was a typo on action component spec
---
 spec/javascripts/pipelines/graph/action_component_spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/javascripts/pipelines/graph/action_component_spec.js b/spec/javascripts/pipelines/graph/action_component_spec.js
index d93f83e792c..321497b35b5 100644
--- a/spec/javascripts/pipelines/graph/action_component_spec.js
+++ b/spec/javascripts/pipelines/graph/action_component_spec.js
@@ -67,7 +67,7 @@ describe('pipeline graph action component', () => {
       }, 0);
     });
 
-    fit('renders a loading icon while waiting for request', done => {
+    it('renders a loading icon while waiting for request', done => {
       component.$el.click();
 
       component.$nextTick(() => {
-- 
GitLab


From 98c4f3ac2dd728892bba57e668c83e4b9f16a276 Mon Sep 17 00:00:00 2001
From: Mayra Cabrera <mcabrera@gitlab.com>
Date: Fri, 26 Apr 2019 14:17:26 -0500
Subject: [PATCH 6/6] Addresses backend comments

- Creates a stages_controller with a play_manual action
- Renames blocked_or_skipped to playable
- Make new service re-use the Ci::Build#play method.
- Rename playable? to manual_playable? so the action is more descriptive
- Log an error in case the user does not have access to one of the
instances
---
 .../components/graph/graph_component.vue      |  2 +-
 .../projects/pipelines_controller.rb          | 19 +----
 app/controllers/projects/stages_controller.rb | 25 ++++++
 app/models/ci/legacy_stage.rb                 |  2 +-
 app/models/ci/pipeline.rb                     |  4 +-
 app/models/ci/stage.rb                        |  4 +
 app/models/concerns/has_status.rb             |  4 -
 app/serializers/stage_entity.rb               | 12 +--
 app/serializers/stages/play_manual_entity.rb  |  9 ---
 app/services/ci/play_manual_stage_service.rb  | 29 +++++++
 .../ci/play_stage_manual_builds_service.rb    | 27 -------
 config/routes/project.rb                      |  7 +-
 lib/gitlab/ci/status/stage/common.rb          |  4 -
 lib/gitlab/ci/status/stage/play_manual.rb     | 14 ++--
 .../projects/pipelines_controller_spec.rb     | 46 -----------
 .../projects/stages_controller_spec.rb        | 72 +++++++++++++++++
 .../ci/status/stage/play_manual_spec.rb       |  8 +-
 spec/models/ci/legacy_stage_spec.rb           |  2 +
 spec/models/ci/pipeline_spec.rb               |  8 +-
 spec/models/ci/stage_spec.rb                  |  2 +
 spec/models/concerns/has_status_spec.rb       | 24 ------
 spec/serializers/pipeline_serializer_spec.rb  |  1 +
 spec/serializers/stage_entity_spec.rb         | 10 +--
 spec/serializers/stage_serializer_spec.rb     | 27 -------
 .../ci/play_manual_stage_service_spec.rb      | 79 +++++++++++++++++++
 .../play_stage_manual_builds_service_spec.rb  | 77 ------------------
 .../ci/stage_shared_examples.rb               | 27 +++++++
 27 files changed, 272 insertions(+), 273 deletions(-)
 create mode 100644 app/controllers/projects/stages_controller.rb
 delete mode 100644 app/serializers/stages/play_manual_entity.rb
 create mode 100644 app/services/ci/play_manual_stage_service.rb
 delete mode 100644 app/services/ci/play_stage_manual_builds_service.rb
 create mode 100644 spec/controllers/projects/stages_controller_spec.rb
 create mode 100644 spec/services/ci/play_manual_stage_service_spec.rb
 delete mode 100644 spec/services/ci/play_stage_manual_builds_service_spec.rb
 create mode 100644 spec/support/shared_examples/ci/stage_shared_examples.rb

diff --git a/app/assets/javascripts/pipelines/components/graph/graph_component.vue b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
index 62b81d8d937..ba0dea626dc 100644
--- a/app/assets/javascripts/pipelines/components/graph/graph_component.vue
+++ b/app/assets/javascripts/pipelines/components/graph/graph_component.vue
@@ -24,7 +24,7 @@ export default {
           :groups="stage.groups"
           :stage-connector-class="stageConnectorClass(index, stage)"
           :is-first-column="isFirstColumn(index)"
-          :action="stage.play_manual_details"
+          :action="stage.status.action"
           @refreshPipelineGraph="refreshPipelineGraph"
         />
       </ul>
diff --git a/app/controllers/projects/pipelines_controller.rb b/app/controllers/projects/pipelines_controller.rb
index 64b440ba23b..22c4b8eef1f 100644
--- a/app/controllers/projects/pipelines_controller.rb
+++ b/app/controllers/projects/pipelines_controller.rb
@@ -6,7 +6,7 @@ class Projects::PipelinesController < Projects::ApplicationController
   before_action :authorize_read_pipeline!
   before_action :authorize_read_build!, only: [:index]
   before_action :authorize_create_pipeline!, only: [:new, :create]
-  before_action :authorize_update_pipeline!, only: [:retry, :cancel, :play_all_manual]
+  before_action :authorize_update_pipeline!, only: [:retry, :cancel]
 
   around_action :allow_gitaly_ref_name_caching, only: [:index, :show]
 
@@ -147,19 +147,6 @@ def charts
     @counts[:failed] = @project.all_pipelines.failed.count(:all)
   end
 
-  def play_all_manual
-    return not_found unless pipeline_stage
-
-    options = { pipeline: pipeline, stage: pipeline_stage }
-
-    ::Ci::PlayStageManualBuildsService.new(@project, current_user, options)
-      .execute
-
-    render json: StageSerializer
-      .new(project: @project, current_user: @current_user)
-      .represent(pipeline_stage, play_all: false)
-  end
-
   private
 
   def serialize_pipelines
@@ -209,8 +196,4 @@ def limited_pipelines_count(project, scope = nil)
 
     view_context.limited_counter_with_delimiter(finder.execute)
   end
-
-  def pipeline_stage
-    @pipeline_stage ||= pipeline.find_stage_by_name(params[:stage])
-  end
 end
diff --git a/app/controllers/projects/stages_controller.rb b/app/controllers/projects/stages_controller.rb
new file mode 100644
index 00000000000..c8db5b1277f
--- /dev/null
+++ b/app/controllers/projects/stages_controller.rb
@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+class Projects::StagesController < Projects::PipelinesController
+  before_action :authorize_update_pipeline!
+
+  def play_manual
+    ::Ci::PlayManualStageService
+      .new(@project, current_user, pipeline: pipeline)
+      .execute(stage)
+
+    respond_to do |format|
+      format.json do
+        render json: StageSerializer
+          .new(project: @project, current_user: @current_user)
+          .represent(stage)
+      end
+    end
+  end
+
+  private
+
+  def stage
+    @pipeline_stage ||= pipeline.find_stage_by_name!(params[:stage_name])
+  end
+end
diff --git a/app/models/ci/legacy_stage.rb b/app/models/ci/legacy_stage.rb
index a15875773ba..930c8a71453 100644
--- a/app/models/ci/legacy_stage.rb
+++ b/app/models/ci/legacy_stage.rb
@@ -59,7 +59,7 @@ def has_warnings?
       end
     end
 
-    def blocked_or_skipped?
+    def manual_playable?
       %[manual scheduled skipped].include?(status.to_s)
     end
   end
diff --git a/app/models/ci/pipeline.rb b/app/models/ci/pipeline.rb
index 20c0088fd10..80401ca0a1e 100644
--- a/app/models/ci/pipeline.rb
+++ b/app/models/ci/pipeline.rb
@@ -771,8 +771,8 @@ def source_ref_slug
       Gitlab::Utils.slugify(source_ref.to_s)
     end
 
-    def find_stage_by_name(name)
-      stages.find_by(name: name)
+    def find_stage_by_name!(name)
+      stages.find_by!(name: name)
     end
 
     private
diff --git a/app/models/ci/stage.rb b/app/models/ci/stage.rb
index b25b0369666..d90339d90dc 100644
--- a/app/models/ci/stage.rb
+++ b/app/models/ci/stage.rb
@@ -120,5 +120,9 @@ def detailed_status(current_user)
         .new(self, current_user)
         .fabricate!
     end
+
+    def manual_playable?
+      blocked? || skipped?
+    end
   end
 end
diff --git a/app/models/concerns/has_status.rb b/app/models/concerns/has_status.rb
index 921d3cbef19..8882f48c281 100644
--- a/app/models/concerns/has_status.rb
+++ b/app/models/concerns/has_status.rb
@@ -122,10 +122,6 @@ def blocked?
     BLOCKED_STATUS.include?(status)
   end
 
-  def blocked_or_skipped?
-    blocked? || status == 'skipped'
-  end
-
   private
 
   def calculate_duration
diff --git a/app/serializers/stage_entity.rb b/app/serializers/stage_entity.rb
index 07b0fd46567..029dd3d0684 100644
--- a/app/serializers/stage_entity.rb
+++ b/app/serializers/stage_entity.rb
@@ -42,20 +42,14 @@ class StageEntity < Grape::Entity
       format: :json)
   end
 
-  expose :play_manual_details,
-    if: -> (status, opts) { show_play_manual_details?(opts) },
-    with: Stages::PlayManualEntity
-
   private
 
   alias_method :stage, :object
 
   def detailed_status
-    @detailed_status ||= stage.detailed_status(request.current_user)
+    stage.detailed_status(request.current_user)
   end
 
-  alias_method :play_manual_details, :detailed_status
-
   def grouped_statuses
     @grouped_statuses ||= stage.statuses.latest_ordered.group_by(&:status)
   end
@@ -75,8 +69,4 @@ def retried_statuses
       grouped_retried_statuses.fetch(ordered_status, [])
     end.flatten
   end
-
-  def show_play_manual_details?(opts)
-    opts.fetch(:play_all, true) && detailed_status.has_manual_builds?
-  end
 end
diff --git a/app/serializers/stages/play_manual_entity.rb b/app/serializers/stages/play_manual_entity.rb
deleted file mode 100644
index 618b38c9743..00000000000
--- a/app/serializers/stages/play_manual_entity.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-class Stages::PlayManualEntity < Grape::Entity
-  expose :action_icon, as: :icon
-  expose :action_button_title, as: :button_title
-  expose :action_title, as: :title
-  expose :action_path, as: :path
-  expose :action_method, as: :method
-end
diff --git a/app/services/ci/play_manual_stage_service.rb b/app/services/ci/play_manual_stage_service.rb
new file mode 100644
index 00000000000..2497fc52e6b
--- /dev/null
+++ b/app/services/ci/play_manual_stage_service.rb
@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module Ci
+  class PlayManualStageService < BaseService
+    def initialize(project, current_user, params)
+      super
+
+      @pipeline = params[:pipeline]
+    end
+
+    def execute(stage)
+      stage.builds.manual.each do |build|
+        next unless build.playable?
+
+        build.play(current_user)
+      rescue Gitlab::Access::AccessDeniedError
+        logger.error(message: 'Unable to play manual action', build_id: build.id)
+      end
+    end
+
+    private
+
+    attr_reader :pipeline, :current_user
+
+    def logger
+      Gitlab::AppLogger
+    end
+  end
+end
diff --git a/app/services/ci/play_stage_manual_builds_service.rb b/app/services/ci/play_stage_manual_builds_service.rb
deleted file mode 100644
index 2512c5310ef..00000000000
--- a/app/services/ci/play_stage_manual_builds_service.rb
+++ /dev/null
@@ -1,27 +0,0 @@
-# frozen_string_literal: true
-
-module Ci
-  class PlayStageManualBuildsService < BaseService
-    def initialize(project, current_user, params)
-      super
-
-      @pipeline = params[:pipeline]
-      @stage = params[:stage]
-    end
-
-    def execute
-      raise Gitlab::Access::AccessDeniedError unless can?(current_user, :update_pipeline, pipeline)
-
-      manual_builds.map(&:enqueue)
-      manual_builds.update_all(user_id: current_user.id, updated_at: Time.now)
-    end
-
-    private
-
-    attr_reader :pipeline, :stage
-
-    def manual_builds
-      @manual_builds ||= stage.builds.manual
-    end
-  end
-end
diff --git a/config/routes/project.rb b/config/routes/project.rb
index 892bacc6af2..93d746f3282 100644
--- a/config/routes/project.rb
+++ b/config/routes/project.rb
@@ -200,7 +200,12 @@
           get :builds
           get :failures
           get :status
-          post :play_all_manual, path: 'stages/:stage/play_all_manual'
+        end
+
+        member do
+          resources :stages, only: [], param: :name do
+            post :play_manual
+          end
         end
       end
 
diff --git a/lib/gitlab/ci/status/stage/common.rb b/lib/gitlab/ci/status/stage/common.rb
index f2fe6a94acb..f12daaa9676 100644
--- a/lib/gitlab/ci/status/stage/common.rb
+++ b/lib/gitlab/ci/status/stage/common.rb
@@ -18,10 +18,6 @@ def details_path
           def has_action?
             false
           end
-
-          def has_manual_builds?
-            false
-          end
         end
       end
     end
diff --git a/lib/gitlab/ci/status/stage/play_manual.rb b/lib/gitlab/ci/status/stage/play_manual.rb
index 554b650b0aa..ac3fc0912fa 100644
--- a/lib/gitlab/ci/status/stage/play_manual.rb
+++ b/lib/gitlab/ci/status/stage/play_manual.rb
@@ -11,10 +11,6 @@ def action_icon
             'play'
           end
 
-          def action_button_title
-            _('Play all manual')
-          end
-
           def action_title
             'Play all manual'
           end
@@ -22,18 +18,22 @@ def action_title
           def action_path
             pipeline = subject.pipeline
 
-            play_all_manual_project_pipeline_path(pipeline.project, pipeline, subject.name)
+            project_stage_play_manual_path(pipeline.project, pipeline, subject.name)
           end
 
           def action_method
             :post
           end
 
+          def action_button_title
+            _('Play all manual')
+          end
+
           def self.matches?(stage, user)
-            stage.blocked_or_skipped?
+            stage.manual_playable?
           end
 
-          def has_manual_builds?
+          def has_action?
             true
           end
         end
diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index 51a46916f40..9a50ea79f5e 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -393,50 +393,4 @@ def get_stage_ajax(name)
       end
     end
   end
-
-  describe 'POST #play_all_manual.json' do
-    let(:pipeline) { create(:ci_pipeline, project: project) }
-    let(:stage_name) { 'test' }
-
-    before do
-      create_manual_build(pipeline, 'test', 'rspec 1/3')
-      create_manual_build(pipeline, 'test', 'rspec 2/3')
-      create_manual_build(pipeline, 'test', 'rspec 3/3')
-
-      pipeline.reload
-    end
-
-    context 'when the stage does not exists' do
-      let(:stage_name) { 'deploy' }
-
-      it 'fails to play all manual' do
-        play_all_manual!
-
-        expect(response).to have_gitlab_http_status(:not_found)
-      end
-    end
-
-    context 'when the stage exists' do
-      it 'starts all manual jobs' do
-        expect(pipeline.builds.manual.count).to eq(3)
-        play_all_manual!
-
-        expect(response).to have_gitlab_http_status(:ok)
-        expect(pipeline.builds.manual.count).to eq(0)
-      end
-    end
-
-    def play_all_manual!
-      post :play_all_manual, params: {
-        namespace_id: project.namespace,
-        project_id: project,
-        id: pipeline.id,
-        stage: stage_name
-      }, format: :json
-    end
-
-    def create_manual_build(pipeline, stage, name)
-      create(:ci_build, :manual, pipeline: pipeline, stage: stage, name: name)
-    end
-  end
 end
diff --git a/spec/controllers/projects/stages_controller_spec.rb b/spec/controllers/projects/stages_controller_spec.rb
new file mode 100644
index 00000000000..a91e3523fd7
--- /dev/null
+++ b/spec/controllers/projects/stages_controller_spec.rb
@@ -0,0 +1,72 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Projects::StagesController do
+  let(:user) { create(:user) }
+  let(:project) { create(:project, :repository) }
+
+  before do
+    sign_in(user)
+  end
+
+  describe 'POST #play_manual.json' do
+    let(:pipeline) { create(:ci_pipeline, project: project) }
+    let(:stage_name) { 'test' }
+
+    before do
+      create_manual_build(pipeline, 'test', 'rspec 1/2')
+      create_manual_build(pipeline, 'test', 'rspec 2/2')
+
+      pipeline.reload
+    end
+
+    context 'when user does not have access' do
+      it 'returns not authorized' do
+        play_manual_stage!
+
+        expect(response).to have_gitlab_http_status(404)
+      end
+    end
+
+    context 'when user has access' do
+      before do
+        project.add_maintainer(user)
+      end
+
+      context 'when the stage does not exists' do
+        let(:stage_name) { 'deploy' }
+
+        it 'fails to play all manual' do
+          play_manual_stage!
+
+          expect(response).to have_gitlab_http_status(:not_found)
+        end
+      end
+
+      context 'when the stage exists' do
+        it 'starts all manual jobs' do
+          expect(pipeline.builds.manual.count).to eq(2)
+
+          play_manual_stage!
+
+          expect(response).to have_gitlab_http_status(:ok)
+          expect(pipeline.builds.manual.count).to eq(0)
+        end
+      end
+    end
+
+    def play_manual_stage!
+      post :play_manual, params: {
+        namespace_id: project.namespace,
+        project_id: project,
+        id: pipeline.id,
+        stage_name: stage_name
+      }, format: :json
+    end
+
+    def create_manual_build(pipeline, stage, name)
+      create(:ci_build, :manual, pipeline: pipeline, stage: stage, name: name)
+    end
+  end
+end
diff --git a/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
index a357881103d..b0113b00ef0 100644
--- a/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
+++ b/spec/lib/gitlab/ci/status/stage/play_manual_spec.rb
@@ -31,7 +31,7 @@
 
     subject { play_manual.action_path }
 
-    it { is_expected.to eq("/#{pipeline.project.full_path}/pipelines/#{pipeline.id}/stages/#{stage.name}/play_all_manual") }
+    it { is_expected.to eq("/#{pipeline.project.full_path}/pipelines/#{pipeline.id}/stages/#{stage.name}/play_manual") }
   end
 
   describe '#action_method' do
@@ -71,10 +71,4 @@
       end
     end
   end
-
-  describe '#has_manual_builds?' do
-    subject { play_manual.has_manual_builds? }
-
-    it { is_expected.to be_truthy }
-  end
 end
diff --git a/spec/models/ci/legacy_stage_spec.rb b/spec/models/ci/legacy_stage_spec.rb
index be0307518eb..bb812cc0533 100644
--- a/spec/models/ci/legacy_stage_spec.rb
+++ b/spec/models/ci/legacy_stage_spec.rb
@@ -272,4 +272,6 @@
   def create_job(type, status: 'success', stage: stage_name, **opts)
     create(type, pipeline: pipeline, stage: stage, status: status, **opts)
   end
+
+  it_behaves_like 'manual playable stage', :ci_stage
 end
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 7a353ebd92b..af455a72f50 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -2958,7 +2958,7 @@ def create_build(name, stage_idx)
       create_list(:ci_build, 2, pipeline: pipeline, stage: stage.name)
     end
 
-    subject { pipeline.find_stage_by_name(stage_name) }
+    subject { pipeline.find_stage_by_name!(stage_name) }
 
     context 'when stage exists' do
       it { is_expected.to eq(stage) }
@@ -2967,7 +2967,11 @@ def create_build(name, stage_idx)
     context 'when stage does not exist' do
       let(:stage_name) { 'build' }
 
-      it { is_expected.to be_nil }
+      it 'raises an ActiveRecord exception' do
+        expect do
+          subject
+        end.to raise_exception(ActiveRecord::RecordNotFound)
+      end
     end
   end
 end
diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb
index 661958390e2..85cd32fb03a 100644
--- a/spec/models/ci/stage_spec.rb
+++ b/spec/models/ci/stage_spec.rb
@@ -285,4 +285,6 @@
       end
     end
   end
+
+  it_behaves_like 'manual playable stage', :ci_stage_entity
 end
diff --git a/spec/models/concerns/has_status_spec.rb b/spec/models/concerns/has_status_spec.rb
index 05480ad0285..a217dc42537 100644
--- a/spec/models/concerns/has_status_spec.rb
+++ b/spec/models/concerns/has_status_spec.rb
@@ -367,28 +367,4 @@
       puts subject
     end
   end
-
-  describe '#blocked_or_skipped?' do
-    %w[ci_pipeline ci_stage ci_build generic_commit_status].each do |type|
-      let(:object) { build(type, status: status) }
-
-      context 'when status is scheduled' do
-        let(:status) { :scheduled }
-
-        it { is_expected.to be_truthy }
-      end
-
-      context 'when status is manual' do
-        let(:status) { :manual }
-
-        it { is_expected.to be_truthy }
-      end
-
-      context 'when status is skipped' do
-        let(:status) { :skipped }
-
-        it { is_expected.to be_truthy }
-      end
-    end
-  end
 end
diff --git a/spec/serializers/pipeline_serializer_spec.rb b/spec/serializers/pipeline_serializer_spec.rb
index 88f18209dce..54e6abc2d3a 100644
--- a/spec/serializers/pipeline_serializer_spec.rb
+++ b/spec/serializers/pipeline_serializer_spec.rb
@@ -157,6 +157,7 @@
         it 'verifies number of queries', :request_store do
           recorded = ActiveRecord::QueryRecorder.new { subject }
           expected_queries = Gitlab.ee? ? 38 : 31
+
           expect(recorded.count).to be_within(2).of(expected_queries)
           expect(recorded.cached_count).to eq(0)
         end
diff --git a/spec/serializers/stage_entity_spec.rb b/spec/serializers/stage_entity_spec.rb
index 114a1593d72..6b1185d1283 100644
--- a/spec/serializers/stage_entity_spec.rb
+++ b/spec/serializers/stage_entity_spec.rb
@@ -48,8 +48,8 @@
       expect(subject[:title]).to eq 'test: passed'
     end
 
-    it 'does not contain play_manual_details info' do
-      expect(subject[:play_manual_details]).not_to be_present
+    it 'does not contain play_details info' do
+      expect(subject[:status][:action]).not_to be_present
     end
 
     context 'when the jobs should be grouped' do
@@ -75,7 +75,7 @@
       let(:stage) { create(:ci_stage_entity, status: 'skipped') }
 
       it 'contains play_all_manual' do
-        expect(subject[:play_manual_details]).to be_present
+        expect(subject[:status][:action]).to be_present
       end
     end
 
@@ -83,7 +83,7 @@
       let(:stage) { create(:ci_stage_entity, status: 'scheduled') }
 
       it 'contains play_all_manual' do
-        expect(subject[:play_manual_details]).to be_present
+        expect(subject[:status][:action]).to be_present
       end
     end
 
@@ -91,7 +91,7 @@
       let(:stage) { create(:ci_stage_entity, status: 'manual') }
 
       it 'contains play_all_manual' do
-        expect(subject[:play_manual_details]).to be_present
+        expect(subject[:status][:action]).to be_present
       end
     end
   end
diff --git a/spec/serializers/stage_serializer_spec.rb b/spec/serializers/stage_serializer_spec.rb
index 94d72910b32..aae17cfbcb9 100644
--- a/spec/serializers/stage_serializer_spec.rb
+++ b/spec/serializers/stage_serializer_spec.rb
@@ -27,32 +27,5 @@
         expect(subject).not_to be_empty
       end
     end
-
-    context 'with manual builds' do
-      let(:resource) { create(:ci_stage_entity, status: 'manual') }
-
-      subject { serializer.represent(resource, { play_all: play_all }) }
-
-      before do
-        create_list(:ci_build, 3, :manual,
-                    stage: resource.name, stage_id: resource.id)
-      end
-
-      context 'with play all option' do
-        let(:play_all) { true }
-
-        it 'returns play manual details' do
-          expect(subject[:play_manual_details]).to be_present
-        end
-      end
-
-      context 'without play all option' do
-        let(:play_all) { false }
-
-        it 'does not return play manual details' do
-          expect(subject[:play_manual_details]).not_to be_present
-        end
-      end
-    end
   end
 end
diff --git a/spec/services/ci/play_manual_stage_service_spec.rb b/spec/services/ci/play_manual_stage_service_spec.rb
new file mode 100644
index 00000000000..5d812745c7f
--- /dev/null
+++ b/spec/services/ci/play_manual_stage_service_spec.rb
@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+require 'spec_helper'
+
+describe Ci::PlayManualStageService, '#execute' do
+  let(:current_user) { create(:user) }
+  let(:pipeline) { create(:ci_pipeline, user: current_user) }
+  let(:project) { pipeline.project }
+  let(:service) { described_class.new(project, current_user, pipeline: pipeline) }
+  let(:stage_status) { 'manual' }
+
+  let(:stage) do
+    create(:ci_stage_entity,
+           pipeline: pipeline,
+           project: project,
+           name: 'test')
+  end
+
+  before do
+    project.add_maintainer(current_user)
+    create_builds_for_stage(status: stage_status)
+  end
+
+  context 'when pipeline has manual builds' do
+    before do
+      service.execute(stage)
+    end
+
+    it 'starts manual builds from pipeline' do
+      expect(pipeline.builds.manual.count).to eq(0)
+    end
+
+    it 'updates manual builds' do
+      pipeline.builds.each do |build|
+        expect(build.user).to eq(current_user)
+      end
+    end
+  end
+
+  context 'when pipeline has no manual builds' do
+    let(:stage_status) { 'failed' }
+
+    before do
+      service.execute(stage)
+    end
+
+    it 'does not update the builds' do
+      expect(pipeline.builds.failed.count).to eq(3)
+    end
+  end
+
+  context 'when user does not have permission on a specific build' do
+    before do
+      allow_any_instance_of(Ci::Build).to receive(:play)
+        .and_raise(Gitlab::Access::AccessDeniedError)
+
+      service.execute(stage)
+    end
+
+    it 'logs the error' do
+      expect(Gitlab::AppLogger).to receive(:error)
+        .exactly(stage.builds.manual.count)
+
+      service.execute(stage)
+    end
+  end
+
+  def create_builds_for_stage(options)
+    options.merge!({
+      when: 'manual',
+      pipeline: pipeline,
+      stage: stage.name,
+      stage_id: stage.id,
+      user: pipeline.user
+    })
+
+    create_list(:ci_build, 3, options)
+  end
+end
diff --git a/spec/services/ci/play_stage_manual_builds_service_spec.rb b/spec/services/ci/play_stage_manual_builds_service_spec.rb
deleted file mode 100644
index 8ffb33d82c7..00000000000
--- a/spec/services/ci/play_stage_manual_builds_service_spec.rb
+++ /dev/null
@@ -1,77 +0,0 @@
-# frozen_string_literal: true
-
-require 'spec_helper'
-
-describe Ci::PlayStageManualBuildsService, '#execute' do
-  let(:current_user) { create(:user) }
-  let(:pipeline) { create(:ci_pipeline, user: current_user) }
-  let(:project) { pipeline.project }
-
-  let(:stage) do
-    create(:ci_stage_entity,
-           pipeline: pipeline,
-           project: project,
-           name: 'test')
-  end
-
-  let(:options) do
-    {
-      pipeline: stage.pipeline,
-      stage: stage
-    }
-  end
-
-  let(:service) do
-    described_class.new(project, current_user, options)
-  end
-
-  context 'when user does not have access' do
-    it 'throws an exception' do
-      project.add_reporter(current_user)
-
-      expect do
-        service.execute
-      end.to raise_error(Gitlab::Access::AccessDeniedError)
-    end
-  end
-
-  context 'when user has access' do
-    before do
-      project.add_maintainer(current_user)
-    end
-
-    context 'when pipeline has manual builds' do
-      before do
-        create_builds_for_stage('manual')
-        service.execute
-        pipeline.reload
-      end
-
-      it 'starts manual builds from pipeline' do
-        expect(pipeline.builds.manual.count).to eq(0)
-      end
-
-      it 'updates manual builds' do
-        pipeline.builds.each do |build|
-          expect(build.user).to eq(current_user)
-        end
-      end
-    end
-
-    context 'when pipeline has no manual builds' do
-      before do
-        create_builds_for_stage('failed')
-        service.execute
-        pipeline.reload
-      end
-
-      it 'does not update the builds' do
-        expect(pipeline.builds.failed.count).to eq(3)
-      end
-    end
-  end
-
-  def create_builds_for_stage(status)
-    create_list(:ci_build, 3, status: status, pipeline: pipeline, stage: stage.name, stage_id: stage.id, user: pipeline.user)
-  end
-end
diff --git a/spec/support/shared_examples/ci/stage_shared_examples.rb b/spec/support/shared_examples/ci/stage_shared_examples.rb
new file mode 100644
index 00000000000..925974ed11e
--- /dev/null
+++ b/spec/support/shared_examples/ci/stage_shared_examples.rb
@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+shared_examples 'manual playable stage' do |stage_type|
+  let(:stage) { build(stage_type, status: status) }
+
+  describe '#manual_playable?' do
+    subject { stage.manual_playable? }
+
+    context 'when is manual' do
+      let(:status) { 'manual' }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when is scheduled' do
+      let(:status) { 'scheduled' }
+
+      it { is_expected.to be_truthy }
+    end
+
+    context 'when is skipped' do
+      let(:status) { 'skipped' }
+
+      it { is_expected.to be_truthy }
+    end
+  end
+end
-- 
GitLab