summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorShah El-Rahman <selrahman@gitlab.com>2018-02-06 21:05:54 -0600
committerShah El-Rahman <selrahman@gitlab.com>2018-02-07 19:28:18 -0600
commit97f08c651e0c95e33dee4a529ff80472e7d3bbe4 (patch)
treeddd00533a9879daca6a9ed7e449a47e99fb8cfef /spec/features
parentd2a2f22fe6b2e93630b32bc699d091720b01b6d3 (diff)
downloadgitlab-ce-97f08c651e0c95e33dee4a529ff80472e7d3bbe4.tar.gz
Add modal for stopping and retrying pipelines41297-new-design-for-cancel-stop-pipeline-confirmation
Fix tests Address code review feedback Fix tests
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/projects/pipelines/pipelines_spec.rb7
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index 592c99fc64a..37a06b65481 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -109,7 +109,8 @@ describe 'Pipelines', :js do
context 'when canceling' do
before do
- accept_confirm { find('.js-pipelines-cancel-button').click }
+ find('.js-pipelines-cancel-button').click
+ find('.js-primary-button').click
wait_for_requests
end
@@ -140,6 +141,7 @@ describe 'Pipelines', :js do
context 'when retrying' do
before do
find('.js-pipelines-retry-button').click
+ find('.js-primary-button').click
wait_for_requests
end
@@ -238,7 +240,8 @@ describe 'Pipelines', :js do
context 'when canceling' do
before do
- accept_alert { find('.js-pipelines-cancel-button').click }
+ find('.js-pipelines-cancel-button').click
+ find('.js-primary-button').click
end
it 'indicates that pipeline was canceled' do