Commit e2d2bbcc authored by Allison Browne's avatar Allison Browne

Fix delete pipeline feature spec

parent 060d64bf
...@@ -9,7 +9,7 @@ module Ci ...@@ -9,7 +9,7 @@ module Ci
pipeline.cancel_running if pipeline.cancelable? && ::Feature.enabled?(:cancel_pipelines_prior_to_destroy, default_enabled: :yaml) pipeline.cancel_running if pipeline.cancelable? && ::Feature.enabled?(:cancel_pipelines_prior_to_destroy, default_enabled: :yaml)
pipeline.destroy! pipeline.reset.destroy!
ServiceResponse.success(message: 'Pipeline not found') ServiceResponse.success(message: 'Pipeline not found')
rescue ActiveRecord::RecordNotFound rescue ActiveRecord::RecordNotFound
......
...@@ -434,6 +434,7 @@ RSpec.describe 'Pipeline', :js do ...@@ -434,6 +434,7 @@ RSpec.describe 'Pipeline', :js do
end end
end end
shared_context 'delete pipeline' do
context 'deleting pipeline' do context 'deleting pipeline' do
context 'when user can not delete' do context 'when user can not delete' do
before do before do
...@@ -453,12 +454,25 @@ RSpec.describe 'Pipeline', :js do ...@@ -453,12 +454,25 @@ RSpec.describe 'Pipeline', :js do
click_button 'Delete pipeline' click_button 'Delete pipeline'
end end
it 'redirects to pipeline overview page', :sidekiq_might_not_need_inline do it 'redirects to pipeline overview page', :sidekiq_inline do
expect(page).to have_content('The pipeline has been deleted') expect(page).to have_content('The pipeline has been deleted')
expect(current_path).to eq(project_pipelines_path(project)) expect(current_path).to eq(project_pipelines_path(project))
end end
end end
end end
end
context 'when cancel_pipelines_prior_to_destroy is enabled' do
include_context 'delete pipeline'
end
context 'when cancel_pipelines_prior_to_destroy is disabled' do
before do
stub_feature_flags(cancel_pipelines_prior_to_destroy: false)
end
include_context 'delete pipeline'
end
context 'when pipeline ref does not exist in repository anymore' do context 'when pipeline ref does not exist in repository anymore' do
let(:pipeline) do let(:pipeline) do
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment