summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRémy Coutable <remy@rymai.me>2017-07-28 18:19:25 +0200
committerRémy Coutable <remy@rymai.me>2017-07-28 18:19:25 +0200
commita2ba403e27183073ad9a4894cfe6c39f94e63964 (patch)
tree98bd3bd831c3d279e06ac7de21999be499eb6cc7
parent60797a42b419841e14f50f85bf8daa2a115a72f9 (diff)
downloadgitlab-ce-35599-fix-uncontrolled-default_url_options-overriding.tar.gz
Fix a spec that was assuming to be on the wrong page35599-fix-uncontrolled-default_url_options-overriding
Signed-off-by: Rémy Coutable <remy@rymai.me>
-rw-r--r--spec/features/issues/create_branch_merge_request_spec.rb10
1 files changed, 4 insertions, 6 deletions
diff --git a/spec/features/issues/create_branch_merge_request_spec.rb b/spec/features/issues/create_branch_merge_request_spec.rb
index c10b99a4386..f59f687cf51 100644
--- a/spec/features/issues/create_branch_merge_request_spec.rb
+++ b/spec/features/issues/create_branch_merge_request_spec.rb
@@ -15,16 +15,14 @@ feature 'Create Branch/Merge Request Dropdown on issue page', js: true do
visit project_issue_path(project, issue)
select_dropdown_option('create-mr')
+
+ expect(page).to have_content('WIP: Resolve "Cherry-Coloured Funk"')
+ expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
- wait_for_requests
+ visit project_issue_path(project, issue)
expect(page).to have_content("created branch 1-cherry-coloured-funk")
expect(page).to have_content("mentioned in merge request !1")
-
- visit project_merge_request_path(project, MergeRequest.first)
-
- expect(page).to have_content('WIP: Resolve "Cherry-Coloured Funk"')
- expect(current_path).to eq(project_merge_request_path(project, MergeRequest.first))
end
it 'allows creating a branch from the issue page' do