diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 12:07:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-03-03 12:07:54 +0300 |
| commit | 87ef501eacd66d7166183d20d84e33de022f7002 (patch) | |
| tree | fa4e0f41e00a4b6aeb035530be4b5473f51b7a3d /spec/features/merge_request | |
| parent | f321e51f46bcb628c3e96a44b5ebf3bb1c4033ab (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'spec/features/merge_request')
| -rw-r--r-- | spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb index a37fc120b86..5cc61333bb4 100644 --- a/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb +++ b/spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb @@ -64,6 +64,10 @@ describe 'Merge request > User merges when pipeline succeeds', :js do before do click_button "Merge when pipeline succeeds" click_link "Cancel automatic merge" + + wait_for_requests + + expect(page).to have_content 'Merge when pipeline succeeds', wait: 0 end it_behaves_like 'Merge when pipeline succeeds activator' |