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 /spec/features/boards/boards_spec.rb | |
| parent | dc73405d6e682452379366d9652a403c1be2a77a (diff) | |
| download | gitlab-ce-8d0ddbdb366cce8e4a5709619064d8a48f5014f3.tar.gz | |
Updated rspec to not use sleep when dragging
Fixed JS tests
Diffstat (limited to 'spec/features/boards/boards_spec.rb')
| -rw-r--r-- | spec/features/boards/boards_spec.rb | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb index 13bf440cc8f..8c101a251b3 100644 --- a/spec/features/boards/boards_spec.rb +++ b/spec/features/boards/boards_spec.rb @@ -508,6 +508,9 @@ describe 'Issue Boards', feature: true, js: true do def drag_to(list_from_index: 0, card_index: 0, to_index: 0, list_to_index: 0, selector: '.board-list') evaluate_script("simulateDrag({scrollable: document.getElementById('board-app'), from: {el: $('#{selector}').eq(#{list_from_index}).get(0), index: #{card_index}}, to: {el: $('.board-list').eq(#{list_to_index}).get(0), index: #{to_index}}});") - sleep 1 + + Timeout.timeout(Capybara.default_max_wait_time) do + loop until page.evaluate_script('window.SIMULATE_DRAG_ACTIVE').zero? + end end end |