summaryrefslogtreecommitdiff
path: root/spec/features/issues/move_spec.rb
diff options
context:
space:
mode:
authorRobert Speicher <rspeicher@gmail.com>2017-07-06 12:43:51 -0400
committerRobert Speicher <rspeicher@gmail.com>2017-07-06 12:43:51 -0400
commiteef068754af7437baf327c5cb4e2b454ba40a617 (patch)
tree3583327140b2994432de317b4ac06d66b274b430 /spec/features/issues/move_spec.rb
parent9eeba8fb49c5da7cf0b2c22bc33cbd33a83918ed (diff)
parent9274c3c1598f3ff32339e681d5812feeb0f62605 (diff)
downloadgitlab-ce-eef068754af7437baf327c5cb4e2b454ba40a617.tar.gz
Merge branch 'master' into rs-sign_in
Diffstat (limited to 'spec/features/issues/move_spec.rb')
-rw-r--r--spec/features/issues/move_spec.rb9
1 files changed, 1 insertions, 8 deletions
diff --git a/spec/features/issues/move_spec.rb b/spec/features/issues/move_spec.rb
index 45858e9eead..833eb47efb2 100644
--- a/spec/features/issues/move_spec.rb
+++ b/spec/features/issues/move_spec.rb
@@ -41,13 +41,10 @@ feature 'issue move to another project' do
find('#issuable-move', visible: false).set(new_project.id)
click_button('Save changes')
- wait_for_requests
-
- expect(current_url).to include project_path(new_project)
-
expect(page).to have_content("Text with #{cross_reference}#{mr.to_reference}")
expect(page).to have_content("moved from #{cross_reference}#{issue.to_reference}")
expect(page).to have_content(issue.title)
+ expect(page.current_path).to include project_path(new_project)
end
scenario 'searching project dropdown', js: true do
@@ -100,8 +97,4 @@ feature 'issue move to another project' do
def issue_path(issue)
project_issue_path(issue.project, issue)
end
-
- def project_path(project)
- project_path(new_project)
- end
end