diff options
author | Phil Hughes <me@iamphill.com> | 2018-06-01 10:33:39 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2018-06-01 10:33:39 +0300 |
commit | 1364dd12cce13769ab42cf664eca2f42d886aaec (patch) | |
tree | fc58b65255ee74f7f2f3fb33e80ce00de10f1ea3 /spec | |
parent | 50fda506e3bc93af47c8ebcbfc7d38c7ae55467d (diff) | |
parent | 6d2fedf74fcce537c8650e15867c80fee297ae43 (diff) |
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')
-rw-r--r-- | spec/features/boards/issue_ordering_spec.rb | 7 | ||||
-rw-r--r-- | spec/javascripts/boards/board_list_spec.js | 2 | ||||
-rw-r--r-- | spec/support/helpers/drag_to_helper.rb | 4 |
3 files changed, 7 insertions, 6 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 diff --git a/spec/javascripts/boards/board_list_spec.js b/spec/javascripts/boards/board_list_spec.js index a49b190d36a..de261d36c61 100644 --- a/spec/javascripts/boards/board_list_spec.js +++ b/spec/javascripts/boards/board_list_spec.js @@ -3,7 +3,7 @@ import Vue from 'vue'; import MockAdapter from 'axios-mock-adapter'; import axios from '~/lib/utils/axios_utils'; -import Sortable from 'vendor/Sortable'; +import Sortable from 'sortablejs'; import BoardList from '~/boards/components/board_list.vue'; import eventHub from '~/boards/eventhub'; import '~/boards/mixins/sortable_default_options'; diff --git a/spec/support/helpers/drag_to_helper.rb b/spec/support/helpers/drag_to_helper.rb index ae149631ed9..6d53ad0b602 100644 --- a/spec/support/helpers/drag_to_helper.rb +++ b/spec/support/helpers/drag_to_helper.rb @@ -1,6 +1,6 @@ module DragTo - def drag_to(list_from_index: 0, from_index: 0, to_index: 0, list_to_index: 0, selector: '', scrollable: 'body') - evaluate_script("simulateDrag({scrollable: $('#{scrollable}').get(0), from: {el: $('#{selector}').eq(#{list_from_index}).get(0), index: #{from_index}}, to: {el: $('#{selector}').eq(#{list_to_index}).get(0), index: #{to_index}}});") + def drag_to(list_from_index: 0, from_index: 0, to_index: 0, list_to_index: 0, selector: '', scrollable: 'body', duration: 1000) + evaluate_script("simulateDrag({scrollable: $('#{scrollable}').get(0), duration: #{duration}, from: {el: $('#{selector}').eq(#{list_from_index}).get(0), index: #{from_index}}, to: {el: $('#{selector}').eq(#{list_to_index}).get(0), index: #{to_index}}});") Timeout.timeout(Capybara.default_max_wait_time) do loop while drag_active? |