Hide duplicate board list while dragging

2 files changed, 29 insertions, 4 deletions

diff --git a/spec/features/boards/boards_spec.rb b/spec/features/boards/boards_spec.rb
index 4e7b25115d7..902ecdcd3e8 100644
--- a/spec/features/boards/boards_spec.rb
+++ b/spec/features/boards/boards_spec.rb
@@ -236,6 +236,15 @@ describe 'Issue Boards', :js do
         expect(find('.board:nth-child(2)')).to have_content(planning.title)
       end
 
+      it 'dragging does not duplicate list' do
+        selector = '.board:not(.is-ghost) .board-header'
+        expect(page).to have_selector(selector, text: development.title, count: 1)
+
+        drag(list_from_index: 2, list_to_index: 1, selector: '.board-header', perform_drop: false)
+
+        expect(page).to have_selector(selector, text: development.title, count: 1)
+      end
+
       it 'issue moves between lists' do
         drag(list_from_index: 1, from_index: 1, list_to_index: 2)
 
@@ -576,7 +585,7 @@ describe 'Issue Boards', :js do
     end
   end
 
-  def drag(selector: '.board-list', list_from_index: 0, from_index: 0, to_index: 0, list_to_index: 0)
+  def drag(selector: '.board-list', list_from_index: 0, from_index: 0, to_index: 0, list_to_index: 0, perform_drop: true)
     # ensure there is enough horizontal space for four boards
     resize_window(2000, 800)
 
@@ -585,7 +594,8 @@ describe 'Issue Boards', :js do
             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,
+            perform_drop: perform_drop)
   end
 
   def wait_for_board_cards(board_number, expected_cards)
diff --git a/spec/support/helpers/drag_to_helper.rb b/spec/support/helpers/drag_to_helper.rb
index 6099f87323f..2e9932f2e8a 100644
--- a/spec/support/helpers/drag_to_helper.rb
+++ b/spec/support/helpers/drag_to_helper.rb
@@ -1,8 +1,23 @@
 # frozen_string_literal: true
 
 module DragTo
-  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}}});")
+  def drag_to(list_from_index: 0, from_index: 0, to_index: 0, list_to_index: 0, selector: '', scrollable: 'body', duration: 1000, perform_drop: true)
+    js = <<~JS
+      simulateDrag({
+        scrollable: document.querySelector('#{scrollable}'),
+        duration: #{duration},
+        from: {
+          el: document.querySelectorAll('#{selector}')[#{list_from_index}],
+          index: #{from_index}
+        },
+        to: {
+          el: document.querySelectorAll('#{selector}')[#{list_to_index}],
+          index: #{to_index}
+        },
+        performDrop: #{perform_drop}
+      });
+    JS
+    evaluate_script(js)
 
     Timeout.timeout(Capybara.default_max_wait_time) do
       loop while drag_active?