summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-11-25 11:59:12 +0100
committerGrzegorz Bizon <grzesiek.bizon@gmail.com>2016-11-25 11:59:12 +0100
commitb8e10e327fa2b51a7f645f10576b26dca0b8341e (patch)
tree97a145214fa4971fae0dc51e3294643c5498234b
parent895d97af87c66f4763e8d1fc0ef6cae19924b18d (diff)
downloadgitlab-ce-b8e10e327fa2b51a7f645f10576b26dca0b8341e.tar.gz
Fix tests for allowing merged if pipeline succeeded
-rw-r--r--spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb b/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
index 1ec3103feef..7e2907cd26f 100644
--- a/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
+++ b/spec/features/merge_requests/only_allow_merge_if_build_succeeds_spec.rb
@@ -38,7 +38,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
it 'does not allow to merge immediately' do
visit_merge_request(merge_request)
- expect(page).to have_button 'Merge When Build Succeeds'
+ expect(page).to have_button 'Merge When Pipeline Succeeds'
expect(page).not_to have_button 'Select Merge Moment'
end
end
@@ -97,7 +97,7 @@ feature 'Only allow merge requests to be merged if the build succeeds', feature:
it 'allows MR to be merged immediately', js: true do
visit_merge_request(merge_request)
- expect(page).to have_button 'Merge When Build Succeeds'
+ expect(page).to have_button 'Merge When Pipeline Succeeds'
click_button 'Select Merge Moment'
expect(page).to have_content 'Merge Immediately'