diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-02-08 05:08:22 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-02-08 05:08:22 +0000 |
commit | 6d7df4f8b12ca892cb9cbc5223f1ee69b2558bd5 (patch) | |
tree | 443e0c766b2824722a37c9fb6e732c9492149f8e /spec/features | |
parent | 66695ce23735281beeef8a4de889e97d117a6526 (diff) | |
parent | 97f08c651e0c95e33dee4a529ff80472e7d3bbe4 (diff) | |
download | gitlab-ce-6d7df4f8b12ca892cb9cbc5223f1ee69b2558bd5.tar.gz |
Merge branch '41297-new-design-for-cancel-stop-pipeline-confirmation' into 'master'
Resolve "New design for cancel / stop pipeline confirmation"
Closes #41297
See merge request gitlab-org/gitlab-ce!16813
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/projects/pipelines/pipelines_spec.rb | 7 |
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 |