diff options
Diffstat (limited to 'spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb')
-rw-r--r-- | spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb b/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb index acbc6429646..cf5a67f6096 100644 --- a/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb +++ b/spec/support/shared_examples/quick_actions/merge_request/merge_quick_action_shared_examples.rb @@ -41,7 +41,13 @@ RSpec.shared_examples 'merge quick action' do it 'schedules to merge the MR' do add_note("/merge") - expect(page).to have_content "Scheduled to merge this merge request (Merge when pipeline succeeds)." + if Gitlab.ee? + expect(page).to( + have_content("Scheduled to merge this merge request (Merge when checks pass).") + ) + else + expect(page).to have_content "Scheduled to merge this merge request (Merge when pipeline succeeds)." + end expect(merge_request.reload).to be_auto_merge_enabled expect(merge_request.reload).not_to be_merged |