summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Ivan Vargas <jvargas@gitlab.com>2017-04-20 10:33:01 -0500
committerJose Ivan Vargas <jvargas@gitlab.com>2017-04-20 10:33:01 -0500
commit711da30b1bfa26df6baf6753665c22bbff8e2586 (patch)
treedbdb85e768a13af6b9c0c4fbd20f8ccdf6be0ccf
parent9cc8444a52fec03b38d82e9556ea8b9a6de5b1b3 (diff)
downloadgitlab-ce-fix-dropdown-spec-failure-pipeline.tar.gz
Fix dropdown spec failure for merge when pipeline succeedsfix-dropdown-spec-failure-pipeline
-rw-r--r--spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
index e4d605d11c9..7c2f13ef251 100644
--- a/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
+++ b/spec/features/merge_requests/merge_when_pipeline_succeeds_spec.rb
@@ -92,14 +92,14 @@ feature 'Merge When Pipeline Succeeds', :feature, :js do
describe 'enabling Merge when pipeline succeeds via dropdown' do
it 'activates the Merge when pipeline succeeds feature' do
- click_button 'Select merge moment'
+ click_button 'Select Merge Moment'
within('.js-merge-dropdown') do
- click_link 'Merge when pipeline succeeds'
+ click_link 'Merge When Pipeline Succeeds'
end
expect(page).to have_content "Set by #{user.name} to be merged automatically when the pipeline succeeds."
expect(page).to have_content "The source branch will not be removed."
- expect(page).to have_link "Cancel automatic merge"
+ expect(page).to have_link "Cancel Automatic Merge"
end
end
end