summaryrefslogtreecommitdiff
path: root/spec/features/merge_requests/create_new_mr_spec.rb
diff options
context:
space:
mode:
authorLuke "Jared" Bennett <lbennett@gitlab.com>2017-04-05 12:43:03 +0000
committerJacob Schatz <jschatz@gitlab.com>2017-04-05 12:43:03 +0000
commit7c5198219aacaf18bfc7e8c523dcfa15d013139a (patch)
tree275c5f2cedbd6eccc98c66feb59e310c903b9cb1 /spec/features/merge_requests/create_new_mr_spec.rb
parenta40e357f27ddcefa9ef70be84c7e7ee0f3b15e02 (diff)
downloadgitlab-ce-7c5198219aacaf18bfc7e8c523dcfa15d013139a.tar.gz
MR empty state
Diffstat (limited to 'spec/features/merge_requests/create_new_mr_spec.rb')
-rw-r--r--spec/features/merge_requests/create_new_mr_spec.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/spec/features/merge_requests/create_new_mr_spec.rb b/spec/features/merge_requests/create_new_mr_spec.rb
index f1ad4a55246..f36781167fb 100644
--- a/spec/features/merge_requests/create_new_mr_spec.rb
+++ b/spec/features/merge_requests/create_new_mr_spec.rb
@@ -15,7 +15,7 @@ feature 'Create New Merge Request', feature: true, js: true do
it 'selects the source branch sha when a tag with the same name exists' do
visit namespace_project_merge_requests_path(project.namespace, project)
- click_link 'New Merge Request'
+ click_link 'New merge request'
expect(page).to have_content('Source branch')
expect(page).to have_content('Target branch')
@@ -27,8 +27,8 @@ feature 'Create New Merge Request', feature: true, js: true do
it 'selects the target branch sha when a tag with the same name exists' do
visit namespace_project_merge_requests_path(project.namespace, project)
-
- click_link 'New Merge Request'
+
+ click_link 'New merge request'
expect(page).to have_content('Source branch')
expect(page).to have_content('Target branch')
@@ -42,7 +42,7 @@ feature 'Create New Merge Request', feature: true, js: true do
it 'generates a diff for an orphaned branch' do
visit namespace_project_merge_requests_path(project.namespace, project)
- click_link 'New Merge Request'
+ page.has_link?('New Merge Request') ? click_link("New Merge Request") : click_link('New merge request')
expect(page).to have_content('Source branch')
expect(page).to have_content('Target branch')