diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2019-06-04 13:48:45 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2019-06-04 13:48:45 +0000 |
| commit | 280aa61eec7efa0b60501546b6e1efedf0b9dc85 (patch) | |
| tree | b7e7ec000f237ac8a07dadaa9d1d3202545be1c1 /spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | |
| parent | b3907962ae1ab8801dab1be2241d659c036e55ed (diff) | |
| parent | cc4b9a377a4150265d9efc869601e9675e82ec11 (diff) | |
| download | gitlab-ce-280aa61eec7efa0b60501546b6e1efedf0b9dc85.tar.gz | |
Merge branch 'mr-widget-merge-error' into 'master'
Update rendering of merge request in merge request widget
Closes #40246
See merge request gitlab-org/gitlab-ce!28238
Diffstat (limited to 'spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb')
| -rw-r--r-- | spec/features/merge_request/user_merges_when_pipeline_succeeds_spec.rb | 8 |
1 files changed, 4 insertions, 4 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 e7b92dc5535..586b3ba170d 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 @@ -159,8 +159,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 @@ -178,8 +178,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 |