Add latest changes from gitlab-org/gitlab@master

14 files changed, 48 insertions, 48 deletions

diff --git a/spec/features/projects/badges/pipeline_badge_spec.rb b/spec/features/projects/badges/pipeline_badge_spec.rb
index f2c57d702a5..af936c80886 100644
--- a/spec/features/projects/badges/pipeline_badge_spec.rb
+++ b/spec/features/projects/badges/pipeline_badge_spec.rb
@@ -22,7 +22,7 @@ describe 'Pipeline Badge' do
     let!(:job) { create(:ci_build, pipeline: pipeline) }
 
     context 'when the pipeline was successful' do
-      it 'displays so on the badge' do
+      it 'displays so on the badge', :sidekiq_might_not_need_inline do
         job.success
 
         visit pipeline_project_badges_path(project, ref: ref, format: :svg)
@@ -33,7 +33,7 @@ describe 'Pipeline Badge' do
     end
 
     context 'when the pipeline failed' do
-      it 'shows displays so on the badge' do
+      it 'shows displays so on the badge', :sidekiq_might_not_need_inline do
         job.drop
 
         visit pipeline_project_badges_path(project, ref: ref, format: :svg)
@@ -52,7 +52,7 @@ describe 'Pipeline Badge' do
         allow(job).to receive(:prerequisites).and_return([double])
       end
 
-      it 'displays the preparing badge' do
+      it 'displays the preparing badge', :sidekiq_might_not_need_inline do
         job.enqueue
 
         visit pipeline_project_badges_path(project, ref: ref, format: :svg)
@@ -63,7 +63,7 @@ describe 'Pipeline Badge' do
     end
 
     context 'when the pipeline is running' do
-      it 'shows displays so on the badge' do
+      it 'shows displays so on the badge', :sidekiq_might_not_need_inline do
         create(:ci_build, pipeline: pipeline, name: 'second build', status_event: 'run')
 
         visit pipeline_project_badges_path(project, ref: ref, format: :svg)
diff --git a/spec/features/projects/files/user_creates_directory_spec.rb b/spec/features/projects/files/user_creates_directory_spec.rb
index 19d95c87c6c..f828ee63cd7 100644
--- a/spec/features/projects/files/user_creates_directory_spec.rb
+++ b/spec/features/projects/files/user_creates_directory_spec.rb
@@ -71,7 +71,7 @@ describe 'Projects > Files > User creates a directory', :js do
       visit(project2_tree_path_root_ref)
     end
 
-    it 'creates a directory in a forked project' do
+    it 'creates a directory in a forked project', :sidekiq_might_not_need_inline do
       find('.add-to-tree').click
       click_link('New directory')
 
diff --git a/spec/features/projects/files/user_creates_files_spec.rb b/spec/features/projects/files/user_creates_files_spec.rb
index 74c037641cd..23663aeaef0 100644
--- a/spec/features/projects/files/user_creates_files_spec.rb
+++ b/spec/features/projects/files/user_creates_files_spec.rb
@@ -42,7 +42,7 @@ describe 'Projects > Files > User creates files' do
         visit(project2_tree_path_root_ref)
       end
 
-      it 'opens new file page on a forked project' do
+      it 'opens new file page on a forked project', :sidekiq_might_not_need_inline do
         find('.add-to-tree').click
         click_link('New file')
 
@@ -159,7 +159,7 @@ describe 'Projects > Files > User creates files' do
       end
     end
 
-    context 'when an user does not have write access' do
+    context 'when an user does not have write access', :sidekiq_might_not_need_inline do
       before do
         project2.add_reporter(user)
         visit(project2_tree_path_root_ref)
diff --git a/spec/features/projects/files/user_deletes_files_spec.rb b/spec/features/projects/files/user_deletes_files_spec.rb
index fd4783cfb6b..570813ce085 100644
--- a/spec/features/projects/files/user_deletes_files_spec.rb
+++ b/spec/features/projects/files/user_deletes_files_spec.rb
@@ -47,7 +47,7 @@ describe 'Projects > Files > User deletes files', :js do
       wait_for_requests
     end
 
-    it 'deletes the file in a forked project', :js do
+    it 'deletes the file in a forked project', :js, :sidekiq_might_not_need_inline do
       click_link('.gitignore')
 
       expect(page).to have_content('.gitignore')
diff --git a/spec/features/projects/files/user_edits_files_spec.rb b/spec/features/projects/files/user_edits_files_spec.rb
index 56430721ed6..c0312f5bb62 100644
--- a/spec/features/projects/files/user_edits_files_spec.rb
+++ b/spec/features/projects/files/user_edits_files_spec.rb
@@ -136,7 +136,7 @@ describe 'Projects > Files > User edits files', :js do
       )
     end
 
-    it 'inserts a content of a file in a forked project' do
+    it 'inserts a content of a file in a forked project', :sidekiq_might_not_need_inline do
       click_link('.gitignore')
       click_button('Edit')
 
@@ -154,7 +154,7 @@ describe 'Projects > Files > User edits files', :js do
       expect(evaluate_script('ace.edit("editor").getValue()')).to eq('*.rbca')
     end
 
-    it 'opens the Web IDE in a forked project' do
+    it 'opens the Web IDE in a forked project', :sidekiq_might_not_need_inline do
       click_link('.gitignore')
       click_button('Web IDE')
 
@@ -168,7 +168,7 @@ describe 'Projects > Files > User edits files', :js do
       expect(page).to have_css('.ide .multi-file-tab', text: '.gitignore')
     end
 
-    it 'commits an edited file in a forked project' do
+    it 'commits an edited file in a forked project', :sidekiq_might_not_need_inline do
       click_link('.gitignore')
       find('.js-edit-blob').click
 
@@ -199,7 +199,7 @@ describe 'Projects > Files > User edits files', :js do
         wait_for_requests
       end
 
-      it 'links to the forked project for editing' do
+      it 'links to the forked project for editing', :sidekiq_might_not_need_inline do
         click_link('.gitignore')
         find('.js-edit-blob').click
 
diff --git a/spec/features/projects/files/user_replaces_files_spec.rb b/spec/features/projects/files/user_replaces_files_spec.rb
index d50bc0a7d18..bdef40690a2 100644
--- a/spec/features/projects/files/user_replaces_files_spec.rb
+++ b/spec/features/projects/files/user_replaces_files_spec.rb
@@ -55,7 +55,7 @@ describe 'Projects > Files > User replaces files', :js do
       wait_for_requests
     end
 
-    it 'replaces an existed file with a new one in a forked project' do
+    it 'replaces an existed file with a new one in a forked project', :sidekiq_might_not_need_inline do
       click_link('.gitignore')
 
       expect(page).to have_content('.gitignore')
diff --git a/spec/features/projects/files/user_uploads_files_spec.rb b/spec/features/projects/files/user_uploads_files_spec.rb
index 74b5d7c5041..284f891731c 100644
--- a/spec/features/projects/files/user_uploads_files_spec.rb
+++ b/spec/features/projects/files/user_uploads_files_spec.rb
@@ -76,7 +76,7 @@ describe 'Projects > Files > User uploads files' do
       visit(project2_tree_path_root_ref)
     end
 
-    it 'uploads and commit a new file to a forked project', :js do
+    it 'uploads and commit a new file to a forked project', :js, :sidekiq_might_not_need_inline do
       find('.add-to-tree').click
       click_link('Upload file')
 
diff --git a/spec/features/projects/fork_spec.rb b/spec/features/projects/fork_spec.rb
index 6792a6e2af0..0f97032eefa 100644
--- a/spec/features/projects/fork_spec.rb
+++ b/spec/features/projects/fork_spec.rb
@@ -27,7 +27,7 @@ describe 'Project fork' do
     expect(page).to have_css('a.disabled', text: 'Fork')
   end
 
-  it 'forks the project' do
+  it 'forks the project', :sidekiq_might_not_need_inline do
     visit project_path(project)
 
     click_link 'Fork'
@@ -174,7 +174,7 @@ describe 'Project fork' do
       expect(page).to have_css('.fork-thumbnail.disabled')
     end
 
-    it 'links to the fork if the project was already forked within that namespace' do
+    it 'links to the fork if the project was already forked within that namespace', :sidekiq_might_not_need_inline do
       forked_project = fork_project(project, user, namespace: group, repository: true)
 
       visit new_project_fork_path(project)
diff --git a/spec/features/projects/forks/fork_list_spec.rb b/spec/features/projects/forks/fork_list_spec.rb
index 2dbe3d90bad..3b63d9a4c2d 100644
--- a/spec/features/projects/forks/fork_list_spec.rb
+++ b/spec/features/projects/forks/fork_list_spec.rb
@@ -15,7 +15,7 @@ describe 'listing forks of a project' do
     sign_in(user)
   end
 
-  it 'shows the forked project in the list with commit as description' do
+  it 'shows the forked project in the list with commit as description', :sidekiq_might_not_need_inline do
     visit project_forks_path(source)
 
     page.within('li.project-row') do
diff --git a/spec/features/projects/import_export/export_file_spec.rb b/spec/features/projects/import_export/export_file_spec.rb
index 7618a2bdea3..b3ed550f45e 100644
--- a/spec/features/projects/import_export/export_file_spec.rb
+++ b/spec/features/projects/import_export/export_file_spec.rb
@@ -38,7 +38,7 @@ describe 'Import/Export - project export integration test', :js do
       sign_in(user)
     end
 
-    it 'exports a project successfully' do
+    it 'exports a project successfully', :sidekiq_might_not_need_inline do
       visit edit_project_path(project)
 
       expect(page).to have_content('Export project')
diff --git a/spec/features/projects/import_export/import_file_spec.rb b/spec/features/projects/import_export/import_file_spec.rb
index 6f96da60a31..904c5390415 100644
--- a/spec/features/projects/import_export/import_file_spec.rb
+++ b/spec/features/projects/import_export/import_file_spec.rb
@@ -27,7 +27,7 @@ describe 'Import/Export - project import integration test', :js do
     let(:project_path) { 'test-project-name' + randomHex }
 
     context 'prefilled the path' do
-      it 'user imports an exported project successfully' do
+      it 'user imports an exported project successfully', :sidekiq_might_not_need_inline do
         visit new_project_path
 
         fill_in :project_name, with: project_name, visible: true
@@ -53,7 +53,7 @@ describe 'Import/Export - project import integration test', :js do
     end
 
     context 'path is not prefilled' do
-      it 'user imports an exported project successfully' do
+      it 'user imports an exported project successfully', :sidekiq_might_not_need_inline do
         visit new_project_path
         click_import_project_tab
         click_link 'GitLab export'
diff --git a/spec/features/projects/jobs_spec.rb b/spec/features/projects/jobs_spec.rb
index f5d5bc7f5b9..c9568dbb7ce 100644
--- a/spec/features/projects/jobs_spec.rb
+++ b/spec/features/projects/jobs_spec.rb
@@ -166,7 +166,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
           let(:source_project) { fork_project(project, user, repository: true) }
           let(:target_project) { project }
 
-          it 'shows merge request iid and source branch' do
+          it 'shows merge request iid and source branch', :sidekiq_might_not_need_inline do
             visit project_job_path(source_project, job)
 
             within '.js-pipeline-info' do
@@ -214,7 +214,7 @@ describe 'Jobs', :clean_gitlab_redis_shared_state do
           let(:source_project) { fork_project(project, user, repository: true) }
           let(:target_project) { project }
 
-          it 'shows merge request iid and source branch' do
+          it 'shows merge request iid and source branch', :sidekiq_might_not_need_inline do
             visit project_job_path(source_project, job)
 
             within '.js-pipeline-info' do
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