Add latest changes from gitlab-org/gitlab@master

2 files changed, 26 insertions, 26 deletions

diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 66807eb1c17..94fac9a2eb5 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -128,7 +128,7 @@ describe 'Pipeline', :js do
           end
         end
 
-        it 'cancels the running build and shows retry button' do
+        it 'cancels the running build and shows retry button', :sidekiq_might_not_need_inline do
           find('#ci-badge-deploy .ci-action-icon-container').click
 
           page.within('#ci-badge-deploy') do
@@ -146,7 +146,7 @@ describe 'Pipeline', :js do
           end
         end
 
-        it 'cancels the preparing build and shows retry button' do
+        it 'cancels the preparing build and shows retry button', :sidekiq_might_not_need_inline do
           find('#ci-badge-deploy .ci-action-icon-container').click
 
           page.within('#ci-badge-deploy') do
@@ -186,7 +186,7 @@ describe 'Pipeline', :js do
           end
         end
 
-        it 'unschedules the delayed job and shows play button as a manual job' do
+        it 'unschedules the delayed job and shows play button as a manual job', :sidekiq_might_not_need_inline do
           find('#ci-badge-delayed-job .ci-action-icon-container').click
 
           page.within('#ci-badge-delayed-job') do
@@ -305,7 +305,9 @@ describe 'Pipeline', :js do
           find('.js-retry-button').click
         end
 
-        it { expect(page).not_to have_content('Retry') }
+        it 'does not show a "Retry" button', :sidekiq_might_not_need_inline do
+          expect(page).not_to have_content('Retry')
+        end
       end
     end
 
@@ -321,7 +323,9 @@ describe 'Pipeline', :js do
           click_on 'Cancel running'
         end
 
-        it { expect(page).not_to have_content('Cancel running') }
+        it 'does not show a "Cancel running" button', :sidekiq_might_not_need_inline do
+          expect(page).not_to have_content('Cancel running')
+        end
       end
     end
 
@@ -400,7 +404,7 @@ describe 'Pipeline', :js do
           visit project_pipeline_path(source_project, pipeline)
         end
 
-        it 'shows the pipeline information' do
+        it 'shows the pipeline information', :sidekiq_might_not_need_inline do
           within '.pipeline-info' do
             expect(page).to have_content("#{pipeline.statuses.count} jobs " \
                                          "for !#{merge_request.iid} " \
@@ -473,7 +477,7 @@ describe 'Pipeline', :js do
           visit project_pipeline_path(source_project, pipeline)
         end
 
-        it 'shows the pipeline information' do
+        it 'shows the pipeline information', :sidekiq_might_not_need_inline do
           within '.pipeline-info' do
             expect(page).to have_content("#{pipeline.statuses.count} jobs " \
                                        "for !#{merge_request.iid} " \
@@ -651,7 +655,9 @@ describe 'Pipeline', :js do
           find('.js-retry-button').click
         end
 
-        it { expect(page).not_to have_content('Retry') }
+        it 'does not show a "Retry" button', :sidekiq_might_not_need_inline do
+          expect(page).not_to have_content('Retry')
+        end
       end
     end
 
@@ -663,7 +669,9 @@ describe 'Pipeline', :js do
           click_on 'Cancel running'
         end
 
-        it { expect(page).not_to have_content('Cancel running') }
+        it 'does not show a "Cancel running" button', :sidekiq_might_not_need_inline do
+          expect(page).not_to have_content('Cancel running')
+        end
       end
     end
 
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 4fb72eb8737..a9a127da56f 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -133,14 +133,14 @@ describe 'Pipelines', :js do
             wait_for_requests
           end
 
-          it 'indicated that pipelines was canceled' do
+          it 'indicated that pipelines was canceled', :sidekiq_might_not_need_inline do
             expect(page).not_to have_selector('.js-pipelines-cancel-button')
             expect(page).to have_selector('.ci-canceled')
           end
         end
       end
 
-      context 'when pipeline is retryable' do
+      context 'when pipeline is retryable', :sidekiq_might_not_need_inline do
         let!(:build) do
           create(:ci_build, pipeline: pipeline,
                             stage: 'test')
@@ -185,33 +185,29 @@ describe 'Pipelines', :js do
           visit project_pipelines_path(source_project)
         end
 
-        shared_examples_for 'showing detached merge request pipeline information' do
-          it 'shows detached tag for the pipeline' do
+        shared_examples_for 'detached merge request pipeline' do
+          it 'shows pipeline information without pipeline ref', :sidekiq_might_not_need_inline do
             within '.pipeline-tags' do
               expect(page).to have_content('detached')
             end
-          end
 
-          it 'shows the link of the merge request' do
             within '.branch-commit' do
               expect(page).to have_link(merge_request.iid,
                 href: project_merge_request_path(project, merge_request))
             end
-          end
 
-          it 'does not show the ref of the pipeline' do
             within '.branch-commit' do
               expect(page).not_to have_link(pipeline.ref)
             end
           end
         end
 
-        it_behaves_like 'showing detached merge request pipeline information'
+        it_behaves_like 'detached merge request pipeline'
 
         context 'when source project is a forked project' do
           let(:source_project) { fork_project(project, user, repository: true) }
 
-          it_behaves_like 'showing detached merge request pipeline information'
+          it_behaves_like 'detached merge request pipeline'
         end
       end
 
@@ -233,20 +229,16 @@ describe 'Pipelines', :js do
         end
 
         shared_examples_for 'Correct merge request pipeline information' do
-          it 'does not show detached tag for the pipeline' do
+          it 'does not show detached tag for the pipeline, and shows the link of the merge request, and does not show the ref of the pipeline', :sidekiq_might_not_need_inline do
             within '.pipeline-tags' do
               expect(page).not_to have_content('detached')
             end
-          end
 
-          it 'shows the link of the merge request' do
             within '.branch-commit' do
               expect(page).to have_link(merge_request.iid,
                 href: project_merge_request_path(project, merge_request))
             end
-          end
 
-          it 'does not show the ref of the pipeline' do
             within '.branch-commit' do
               expect(page).not_to have_link(pipeline.ref)
             end
@@ -429,7 +421,7 @@ describe 'Pipelines', :js do
               find('.js-modal-primary-action').click
             end
 
-            it 'indicates that pipeline was canceled' do
+            it 'indicates that pipeline was canceled', :sidekiq_might_not_need_inline do
               expect(page).not_to have_selector('.js-pipelines-cancel-button')
               expect(page).to have_selector('.ci-canceled')
             end
@@ -452,7 +444,7 @@ describe 'Pipelines', :js do
             expect(page).not_to have_selector('.js-pipelines-retry-button')
           end
 
-          it 'has failed pipeline' do
+          it 'has failed pipeline', :sidekiq_might_not_need_inline do
             expect(page).to have_selector('.ci-failed')
           end
         end