Merge branch 'master' into 31349-pipelines-vue31349-pipelines-vue

* master:
  Prevent vue.esm.js from being bundled into the primary JS bundle
  Robustify environment policy specs to pass on EE
  Fallback to default pattern when note does not belong to project
  Fix skipped manual actions issue in pipeline processing

2 files changed, 23 insertions, 1 deletions

diff --git a/spec/policies/environment_policy_spec.rb b/spec/policies/environment_policy_spec.rb
index 0e15beaa5e8..650432520bb 100644
--- a/spec/policies/environment_policy_spec.rb
+++ b/spec/policies/environment_policy_spec.rb
@@ -33,7 +33,7 @@ describe EnvironmentPolicy do
       let(:project) { create(:project, :public) }
 
       before do
-        project.add_master(user)
+        project.add_developer(user)
       end
 
       context 'when team member has ability to stop environment' do
diff --git a/spec/services/ci/process_pipeline_service_spec.rb b/spec/services/ci/process_pipeline_service_spec.rb
index cf773866a6f..1d0a28210fb 100644
--- a/spec/services/ci/process_pipeline_service_spec.rb
+++ b/spec/services/ci/process_pipeline_service_spec.rb
@@ -268,6 +268,24 @@ describe Ci::ProcessPipelineService, '#execute', :services do
     end
   end
 
+  context 'when there are only manual actions in stages' do
+    before do
+      create_build('image', stage_idx: 0, when: 'manual', allow_failure: true)
+      create_build('build', stage_idx: 1, when: 'manual', allow_failure: true)
+      create_build('deploy', stage_idx: 2, when: 'manual')
+      create_build('check', stage_idx: 3)
+
+      process_pipeline
+    end
+
+    it 'processes all jobs until blocking actions encountered' do
+      expect(all_builds_statuses).to eq(%w[manual manual manual created])
+      expect(all_builds_names).to eq(%w[image build deploy check])
+
+      expect(pipeline.reload).to be_blocked
+    end
+  end
+
   context 'when blocking manual actions are defined' do
     before do
       create_build('code:test', stage_idx: 0)
@@ -441,6 +459,10 @@ describe Ci::ProcessPipelineService, '#execute', :services do
     builds.pluck(:name)
   end
 
+  def all_builds_names
+    all_builds.pluck(:name)
+  end
+
   def builds_statuses
     builds.pluck(:status)
   end