diff options
author | Phil Hughes <me@iamphill.com> | 2016-08-16 09:39:58 +0100 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-08-17 17:17:39 +0100 |
commit | 8d0ddbdb366cce8e4a5709619064d8a48f5014f3 (patch) | |
tree | 41f1070432eee62a5790f94ade5ece353b763bd6 /app/assets/javascripts/boards | |
parent | dc73405d6e682452379366d9652a403c1be2a77a (diff) | |
download | gitlab-ce-8d0ddbdb366cce8e4a5709619064d8a48f5014f3.tar.gz |
Updated rspec to not use sleep when dragging
Fixed JS tests
Diffstat (limited to 'app/assets/javascripts/boards')
-rw-r--r-- | app/assets/javascripts/boards/stores/boards_store.js.es6 | 6 | ||||
-rwxr-xr-x | app/assets/javascripts/boards/test_utils/simulate_drag.js | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/app/assets/javascripts/boards/stores/boards_store.js.es6 b/app/assets/javascripts/boards/stores/boards_store.js.es6 index 9564f48fdbe..e55941cd5bd 100644 --- a/app/assets/javascripts/boards/stores/boards_store.js.es6 +++ b/app/assets/javascripts/boards/stores/boards_store.js.es6 @@ -71,8 +71,8 @@ welcomeIsHidden () { return $.cookie('issue_board_welcome_hidden') === 'true'; }, - removeList (id) { - const list = this.findList('id', id, 'blank'); + removeList (id, type = 'blank') { + const list = this.findList('id', id, type); if (!list) return; @@ -107,6 +107,8 @@ list.removeIssue(issue); } issue.removeLabels(listLabels); + } else { + listFrom.removeIssue(issue); } }, findList (key, val, type = 'label') { diff --git a/app/assets/javascripts/boards/test_utils/simulate_drag.js b/app/assets/javascripts/boards/test_utils/simulate_drag.js index 8c5196e7719..75f8b730195 100755 --- a/app/assets/javascripts/boards/test_utils/simulate_drag.js +++ b/app/assets/javascripts/boards/test_utils/simulate_drag.js @@ -84,6 +84,7 @@ var duration = options.duration || 1000; simulateEvent(fromEl, 'mousedown', {button: 0}); options.ontap && options.ontap(); + window.SIMULATE_DRAG_ACTIVE = 1; var dragInterval = setInterval(function loop() { var progress = (new Date().getTime() - startTime) / duration; @@ -100,6 +101,7 @@ options.ondragend && options.ondragend(); simulateEvent(toEl, 'mouseup'); clearInterval(dragInterval); + window.SIMULATE_DRAG_ACTIVE = 0; } }, 100); |