Add latest changes from gitlab-org/gitlab@master

2 files changed, 33 insertions, 6 deletions

diff --git a/spec/features/import/manifest_import_spec.rb b/spec/features/import/manifest_import_spec.rb
index 89bf69dea7d..36478128dd1 100644
--- a/spec/features/import/manifest_import_spec.rb
+++ b/spec/features/import/manifest_import_spec.rb
@@ -24,17 +24,17 @@ describe 'Import multiple repositories by uploading a manifest file', :js do
     expect(page).to have_content('https://android-review.googlesource.com/platform/build/blueprint')
   end
 
-  it 'imports successfully imports a project', :sidekiq_might_not_need_inline do
+  it 'imports successfully imports a project', :sidekiq_inline do
     visit new_import_manifest_path
 
     attach_file('manifest', Rails.root.join('spec/fixtures/aosp_manifest.xml'))
     click_on 'List available repositories'
 
-    page.within(first_row) do
+    page.within(second_row) do
       click_on 'Import'
 
       expect(page).to have_content 'Done'
-      expect(page).to have_content("#{group.full_path}/build/make")
+      expect(page).to have_content("#{group.full_path}/build/blueprint")
     end
   end
 
@@ -47,7 +47,7 @@ describe 'Import multiple repositories by uploading a manifest file', :js do
     expect(page).to have_content 'The uploaded file is not a valid XML file.'
   end
 
-  def first_row
-    page.all('table.import-jobs tbody tr')[0]
+  def second_row
+    page.all('table.import-jobs tbody tr')[1]
   end
 end
diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index 4b97c58d920..198af65c361 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -59,7 +59,8 @@ describe 'Pipeline', :js do
   describe 'GET /:project/pipelines/:id' do
     include_context 'pipeline builds'
 
-    let(:project) { create(:project, :repository) }
+    let(:group) { create(:group) }
+    let(:project) { create(:project, :repository, group: group) }
     let(:pipeline) { create(:ci_pipeline, project: project, ref: 'master', sha: project.commit.id, user: user) }
 
     subject(:visit_pipeline) { visit project_pipeline_path(project, pipeline) }
@@ -329,6 +330,32 @@ describe 'Pipeline', :js do
       end
     end
 
+    context 'deleting pipeline' do
+      context 'when user can not delete' do
+        before do
+          visit_pipeline
+        end
+
+        it { expect(page).not_to have_button('Delete') }
+      end
+
+      context 'when deleting' do
+        before do
+          group.add_owner(user)
+
+          visit_pipeline
+
+          click_button 'Delete'
+          click_button 'Delete pipeline'
+        end
+
+        it 'redirects to pipeline overview page', :sidekiq_might_not_need_inline do
+          expect(page).to have_content('The pipeline has been deleted')
+          expect(current_path).to eq(project_pipelines_path(project))
+        end
+      end
+    end
+
     context 'when pipeline ref does not exist in repository anymore' do
       let(:pipeline) do
         create(:ci_empty_pipeline, project: project,