diff options
author | Phil Hughes <me@iamphill.com> | 2019-06-04 08:34:35 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2019-06-04 08:34:35 +0100 |
commit | cc4b9a377a4150265d9efc869601e9675e82ec11 (patch) | |
tree | 1774876d9fafade9832e4558509f1a8219206853 /spec/features | |
parent | 6d3ab5d8f676962fea5edd7a88b9cfb4ef45d2b5 (diff) | |
download | gitlab-ce-cc4b9a377a4150265d9efc869601e9675e82ec11.tar.gz |
Update rendering of merge request in merge request widget
Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/40246
Diffstat (limited to 'spec/features')
-rw-r--r-- | spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | 8 | ||||
-rw-r--r-- | spec/features/merge_request/user_sees_merge_widget_spec.rb | 8 |
2 files changed, 8 insertions, 8 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 d4ad11b3585..16662afb6e7 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 @@ -158,8 +158,8 @@ describe 'Merge request > User merges when pipeline succeeds', :js do # Wait for the `ci_status` and `merge_check` requests wait_for_requests - page.within('.mr-widget-body') do - expect(page).to have_content('Something went wrong') + page.within('.mr-section-container') do + expect(page).to have_content('Merge failed: Something went wrong') end end end @@ -177,8 +177,8 @@ describe 'Merge request > User merges when pipeline succeeds', :js do # Wait for the `ci_status` and `merge_check` requests wait_for_requests - page.within('.mr-widget-body') do - expect(page).to have_content('Something went wrong') + page.within('.mr-section-container') do + expect(page).to have_content('Merge failed: Something went wrong') end end end diff --git a/spec/features/merge_request/user_sees_merge_widget_spec.rb b/spec/features/merge_request/user_sees_merge_widget_spec.rb index 93ddde623fe..6f802c3d072 100644 --- a/spec/features/merge_request/user_sees_merge_widget_spec.rb +++ b/spec/features/merge_request/user_sees_merge_widget_spec.rb @@ -326,8 +326,8 @@ describe 'Merge request > User sees merge widget', :js do # Wait for the `ci_status` and `merge_check` requests wait_for_requests - page.within('.mr-widget-body') do - expect(page).to have_content('Something went wrong') + page.within('.mr-section-container') do + expect(page).to have_content('Merge failed: Something went wrong') end end end @@ -347,8 +347,8 @@ describe 'Merge request > User sees merge widget', :js do # Wait for the `ci_status` and `merge_check` requests wait_for_requests - page.within('.mr-widget-body') do - expect(page).to have_content('Something went wrong') + page.within('.mr-section-container') do + expect(page).to have_content('Merge failed: Something went wrong') end end end |