[WIP] Remove _listConnected on _test property & fix tests to use module (#406)

* remove _listConnected on test

* add tests from isConnected

* remove old test

* move test to main folder

Author: Lukas Oppermann

__tests__/helpers.ts

@@ -1,7 +1,7 @@
 /* eslint-env jest */
 
 export const mockInnerHTML: string = `
-<ul class="sortable">
+<ul class="sortable all-sortables">
   <li class="li-first">
     <span class="handle"></span>
       item
@@ -14,4 +14,5 @@ export const mockInnerHTML: string = `
     <span class="handle"></span>
     item 3
   </li>
-</ul>`
+</ul>
+<ul class="second-sortable all-sortables"></ul>`

__tests__/isConnected.test.ts

@@ -0,0 +1,112 @@
+/* global describe,test,expect */
+import { mockInnerHTML } from './helpers'
+import isConnected from '../src/isConnected'
+import sortable from '../src/html5sortable'
+/* eslint-env jest */
+
+describe('Testing isConnected modules', () => {
+  let sortableElement, secondSortable
+  // setup
+  beforeEach(() => {
+    document.body.innerHTML = mockInnerHTML
+    sortableElement = document.body.querySelector('.sortable')
+    secondSortable = document.body.querySelector('.second-sortable')
+  })
+
+  test('each sortable ul should connect with itself by default', () => {
+    sortable(sortableElement, {})
+    // test if sortable is connected to itself (should be true)
+    expect(isConnected(sortableElement, sortableElement)).toEqual(true)
+  })
+
+  test('acceptFrom fails when invalid selector is given', () => {
+    sortable(sortableElement, {
+      acceptFrom: secondSortable
+    })
+    sortable(secondSortable, {
+      acceptFrom: true
+    })
+    // assert
+    expect(() => { isConnected(sortableElement, sortableElement) }).toThrowError('HTML5Sortable: Wrong argument, "acceptFrom" must be "null", "false", or a valid selector string.')
+    expect(() => { isConnected(secondSortable, sortableElement) }).toThrowError('HTML5Sortable: Wrong argument, "acceptFrom" must be "null", "false", or a valid selector string.')
+  })
+
+  test('acceptFrom does not accept when empty selector is given', () => {
+    sortable(sortableElement, {
+      acceptFrom: ''
+    })
+    expect(isConnected(sortableElement, secondSortable)).toEqual(false)
+    expect(isConnected(sortableElement, sortableElement)).toEqual(false)
+  })
+
+  test('acceptFrom is disconnected to itself if set to false', () => {
+    sortable(sortableElement, {
+      acceptFrom: false
+    })
+    // assert
+    expect(isConnected(sortableElement, secondSortable)).toEqual(false)
+    expect(isConnected(sortableElement, sortableElement)).toEqual(false)
+  })
+
+  test('acceptFrom is connected to itself if set to null & disconnecte from other sortables', () => {
+    sortable(sortableElement, {
+      acceptFrom: null
+    })
+    // assert
+    expect(isConnected(sortableElement, secondSortable)).toEqual(false)
+    expect(isConnected(sortableElement, sortableElement)).toEqual(true)
+  })
+
+  test('acceptFrom is connected to other sortables if set to selector & disconnected from itself', () => {
+    sortable(sortableElement, {
+      acceptFrom: '.second-sortable'
+    })
+    // assert
+    expect(isConnected(sortableElement, secondSortable)).toEqual(true)
+    expect(isConnected(sortableElement, sortableElement)).toEqual(false)
+    // one direction connected only
+    expect(isConnected(secondSortable, sortableElement)).toEqual(false)
+  })
+
+  test('acceptFrom is connected to other sortables including itself if selector matches', () => {
+    sortable(sortableElement, {
+      acceptFrom: '.all-sortables'
+    })
+    // assert
+    expect(isConnected(sortableElement, secondSortable)).toEqual(true)
+    expect(isConnected(sortableElement, sortableElement)).toEqual(true)
+    // one direction connected only
+    expect(isConnected(secondSortable, sortableElement)).toEqual(false)
+  })
+
+  test('⚠️  [deprecated] connectWith: sortables are connected in all way', () => {
+    // disable warnings in console
+    global.console.warn = (input) => {}
+    // setup
+    sortable(sortableElement, {
+      connectWith: 'someValue'
+    })
+    sortable(secondSortable, {
+      connectWith: 'someValue'
+    })
+    // because ul was never instantiated with connectWith: '.sortable' they are not connected, so all should be false
+    expect(isConnected(sortableElement, secondSortable)).toEqual(true)
+    expect(isConnected(sortableElement, sortableElement)).toEqual(true)
+    expect(isConnected(secondSortable, secondSortable)).toEqual(true)
+    expect(isConnected(secondSortable, sortableElement)).toEqual(true)
+  })
+
+  test('⚠️  [deprecated] connectWith: if one sortable misses value, they are not connected', () => {
+    // disable warnings in console
+    global.console.warn = (input) => {}
+    sortable(sortableElement, {
+      connectWith: 'someValue'
+    })
+    sortable(secondSortable, {})
+    // because ul was never instantiated with connectWith: '.sortable' they are not connected, so all should be false
+    expect(isConnected(sortableElement, secondSortable)).toEqual(false)
+    expect(isConnected(sortableElement, sortableElement)).toEqual(true)
+    expect(isConnected(secondSortable, secondSortable)).toEqual(true)
+    expect(isConnected(secondSortable, sortableElement)).toEqual(false)
+  })
+})

__tests__/sortableMethodsTests/_listsConnected.test.ts

@@ -585,7 +585,6 @@ sortable.__testing = {
   _data: _data,
   _removeItemEvents: _removeItemEvents,
   _removeItemData: _removeItemData,
-  _removeSortableData: _removeSortableData,
-  _listsConnected: _listsConnected
+  _removeSortableData: _removeSortableData
 }
 /* END.TESTS_ONLY */

src/html5sortable.ts

@@ -1,26 +1,30 @@
 import store from './store'
 /**
- * Check if two lists are connected
- * @param {HTMLElement} curList
- * @param {HTMLElement} destList
+ * Check if curList accepts items from destList
+ * @param {sortable} destination the container an item is move to
+ * @param {sortable} origin the container an item comes from
  */
-export default (curList: sortable, destList: sortable) => {
+export default (destination: sortable, origin: sortable) => {
   // check if valid sortable
-  if (curList.isSortable === true) {
-    const acceptFrom = store(curList).getConfig('acceptFrom')
+  if (destination.isSortable === true) {
+    const acceptFrom = store(destination).getConfig('acceptFrom')
+    // check if acceptFrom is valid
+    if (acceptFrom !== null && acceptFrom !== false && typeof acceptFrom !== 'string') {
+      throw new Error('HTML5Sortable: Wrong argument, "acceptFrom" must be "null", "false", or a valid selector string.')
+    }
 
     if (acceptFrom !== null) {
       return acceptFrom !== false && acceptFrom.split(',').filter(function (sel) {
-        return sel.length > 0 && destList.matches(sel)
+        return sel.length > 0 && origin.matches(sel)
       }).length > 0
     }
     // drop in same list
-    if (curList === destList) {
+    if (destination === origin) {
       return true
     }
     // check if lists are connected with connectWith
-    if (store(curList).getConfig('connectWith') !== undefined && store(curList).getConfig('connectWith') !== null) {
-      return store(curList).getConfig('connectWith') === store(destList).getConfig('connectWith')
+    if (store(destination).getConfig('connectWith') !== undefined && store(destination).getConfig('connectWith') !== null) {
+      return store(destination).getConfig('connectWith') === store(origin).getConfig('connectWith')
     }
   }
   return false