Add latest changes from gitlab-org/gitlab@master

1 files changed, 15 insertions, 31 deletions

diff --git a/spec/features/projects/pipelines/pipeline_spec.rb b/spec/features/projects/pipelines/pipeline_spec.rb
index ce2083b397a..ee1ff550697 100644
--- a/spec/features/projects/pipelines/pipeline_spec.rb
+++ b/spec/features/projects/pipelines/pipeline_spec.rb
@@ -437,44 +437,28 @@ RSpec.describe 'Pipeline', :js do
       end
     end
 
-    shared_context 'delete pipeline' do
-      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_inline do
-            expect(page).to have_content('The pipeline has been deleted')
-            expect(current_path).to eq(project_pipelines_path(project))
-          end
-        end
+    context 'when user can not delete' do
+      before do
+        visit_pipeline
       end
-    end
 
-    context 'when cancel_pipelines_prior_to_destroy is enabled' do
-      include_context 'delete pipeline'
+      it { expect(page).not_to have_button('Delete') }
     end
 
-    context 'when cancel_pipelines_prior_to_destroy is disabled' do
+    context 'when deleting' do
       before do
-        stub_feature_flags(cancel_pipelines_prior_to_destroy: false)
+        group.add_owner(user)
+
+        visit_pipeline
+
+        click_button 'Delete'
+        click_button 'Delete pipeline'
       end
 
-      include_context 'delete pipeline'
+      it 'redirects to pipeline overview page', :sidekiq_inline do
+        expect(page).to have_content('The pipeline has been deleted')
+        expect(current_path).to eq(project_pipelines_path(project))
+      end
     end
 
     context 'when pipeline ref does not exist in repository anymore' do