summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-29 10:37:13 +0000
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-12-29 10:37:13 +0000
commitf1a1058c8f85c1713d31aa4727969700775c1ca1 (patch)
treee4ffbecaba96382bca9d71185379a76c02020c40
parent27db8f72bf221be56648b4d63f153c28cb2b2ef8 (diff)
parentf7d6fbf641dd496c1748e8f9e56c968221435f71 (diff)
downloadgitlab-ce-f1a1058c8f85c1713d31aa4727969700775c1ca1.tar.gz
Merge branch 'dz-fix-milestones-spec' into 'master'
Fix RoutingError at ./spec/features/milestones/milestones_spec.rb See merge request !8361
-rw-r--r--spec/features/milestones/milestones_spec.rb6
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/features/milestones/milestones_spec.rb b/spec/features/milestones/milestones_spec.rb
index 8b603f51545..aadd72a9f8e 100644
--- a/spec/features/milestones/milestones_spec.rb
+++ b/spec/features/milestones/milestones_spec.rb
@@ -1,6 +1,8 @@
require 'rails_helper'
describe 'Milestone draggable', feature: true, js: true do
+ include WaitForAjax
+
let(:milestone) { create(:milestone, project: project, title: 8.14) }
let(:project) { create(:empty_project, :public) }
let(:user) { create(:user) }
@@ -74,6 +76,8 @@ describe 'Milestone draggable', feature: true, js: true do
visit namespace_project_milestone_path(project.namespace, project, milestone)
issue.drag_to(issue_target)
+
+ wait_for_ajax
end
def create_and_drag_merge_request(params = {})
@@ -82,5 +86,7 @@ describe 'Milestone draggable', feature: true, js: true do
visit namespace_project_milestone_path(project.namespace, project, milestone)
page.find("a[href='#tab-merge-requests']").click
merge_request.drag_to(merge_request_target)
+
+ wait_for_ajax
end
end