summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2018-06-01 07:33:39 +0000
committerPhil Hughes <me@iamphill.com>2018-06-01 07:33:39 +0000
commit1364dd12cce13769ab42cf664eca2f42d886aaec (patch)
treefc58b65255ee74f7f2f3fb33e80ce00de10f1ea3 /spec/features
parent50fda506e3bc93af47c8ebcbfc7d38c7ae55467d (diff)
parent6d2fedf74fcce537c8650e15867c80fee297ae43 (diff)
downloadgitlab-ce-1364dd12cce13769ab42cf664eca2f42d886aaec.tar.gz
Merge branch '47046-use-sortable-from-npm' into 'master'
Use NPM provided version of SortableJS Closes #47046 See merge request gitlab-org/gitlab-ce!19274
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/boards/issue_ordering_spec.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/spec/features/boards/issue_ordering_spec.rb b/spec/features/boards/issue_ordering_spec.rb
index 193b1dfabbd..32bd7b88840 100644
--- a/spec/features/boards/issue_ordering_spec.rb
+++ b/spec/features/boards/issue_ordering_spec.rb
@@ -35,7 +35,7 @@ describe 'Issue Boards', :js do
end
it 'moves un-ordered issue to top of list' do
- drag(from_index: 3, to_index: 0)
+ drag(from_index: 3, to_index: 0, duration: 1180)
wait_for_requests
@@ -156,12 +156,13 @@ describe 'Issue Boards', :js do
end
end
- def drag(selector: '.board-list', list_from_index: 1, from_index: 0, to_index: 0, list_to_index: 1)
+ def drag(selector: '.board-list', list_from_index: 1, from_index: 0, to_index: 0, list_to_index: 1, duration: 1000)
drag_to(selector: selector,
scrollable: '#board-app',
list_from_index: list_from_index,
from_index: from_index,
to_index: to_index,
- list_to_index: list_to_index)
+ list_to_index: list_to_index,
+ duration: duration)
end
end