Adding tests+ configuting vscode tests

SortableJS · Mar 6, 2019 · 9a5d454 · 9a5d454
1 parent 6c2d0d6
commit 9a5d454
Show file tree

Hide file tree

Showing 6 changed files with 162 additions and 45 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -0,0 +1,51 @@
+{
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Jest All",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": ["--runInBand"],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "windows": {
+        "program": "${workspaceFolder}/node_modules/jest/bin/jest",
+      }
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Jest Current File",
+      "program": "${workspaceFolder}/node_modules/.bin/jest",
+      "args": [
+        "${relativeFile}",
+        "--config",
+        "jest.config.js"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "windows": {
+        "program": "${workspaceFolder}/node_modules/jest/bin/jest",
+      }
+    },
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Jest Vue Current File",
+      "program": "${workspaceFolder}/node_modules/@vue/cli-service/bin/vue-cli-service",
+      "args": [
+        "test:unit",
+        "${relativeFile}",
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "disableOptimisticBPs": true,
+      "windows": {
+        "program": "${workspaceFolder}/node_modules/@vue/cli-service/bin/vue-cli-service",
+      }
+    }
+  ]
+}
diff --git a/jest.config.js b/jest.config.js
@@ -0,0 +1,31 @@
+module.exports = {
+  moduleFileExtensions: [
+    "js",
+    "jsx",
+    "json",
+    "vue"
+  ],
+  transform: {
+    "^.+\\.vue$": "vue-jest",
+    ".+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$": "jest-transform-stub",
+    "^.+\\.jsx?$": "babel-jest"
+  },
+  moduleNameMapper: {
+    "^@/(.*)$": "<rootDir>/src/$1"
+  },
+  snapshotSerializers: [
+    "jest-serializer-vue"
+  ],
+  testMatch: [
+    "**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"
+  ],
+  testURL: "http://localhost/",
+  collectCoverageFrom: [
+    "<rootDir>/src/vuedraggable.js",
+    "<rootDir>/src/util/helper.js"
+  ],
+ // testEnvironment: "node",
+  transformIgnorePatterns: [
+    "node_modules/(?!(babel-jest|jest-vue-preprocessor)/)"
+  ],
+};
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -74,33 +74,6 @@
     "last 2 versions",
     "not ie <= 8"
   ],
-  "jest": {
-    "moduleFileExtensions": [
-      "js",
-      "jsx",
-      "json",
-      "vue"
-    ],
-    "transform": {
-      "^.+\\.vue$": "vue-jest",
-      ".+\\.(css|styl|less|sass|scss|svg|png|jpg|ttf|woff|woff2)$": "jest-transform-stub",
-      "^.+\\.jsx?$": "babel-jest"
-    },
-    "moduleNameMapper": {
-      "^@/(.*)$": "<rootDir>/src/$1"
-    },
-    "snapshotSerializers": [
-      "jest-serializer-vue"
-    ],
-    "testMatch": [
-      "**/tests/unit/**/*.spec.(js|jsx|ts|tsx)|**/__tests__/*.(js|jsx|ts|tsx)"
-    ],
-    "testURL": "http://localhost/",
-    "collectCoverageFrom": [
-      "<rootDir>/src/vuedraggable.js",
-      "<rootDir>/src/util/helper.js"
-    ]
-  },
   "files": [
     "dist/*.css",
     "dist/*.map",

diff --git a/src/vuedraggable.js b/src/vuedraggable.js
@@ -459,8 +459,8 @@ const draggableComponent = {
       const draggedContext = this.context;
       const futureIndex = this.computeFutureIndex(relatedContext, evt);
       Object.assign(draggedContext, { futureIndex });
-      Object.assign(evt, { relatedContext, draggedContext });
-      return onMove(evt, originalEvent);
+      const sendEvt = Object.assign({}, evt, { relatedContext, draggedContext });
+      return onMove(sendEvt, originalEvent);
     },
 
     onDragEnd() {

diff --git a/tests/unit/vuedraggable.spec.js b/tests/unit/vuedraggable.spec.js
@@ -302,19 +302,19 @@ describe("draggable.vue when initialized with list", () => {
     })
 
     describe("when calling onMove", () => {
-      let evt;
       let originalEvt;
       let move;
       let doMove;
 
       beforeEach(() => {
-        //item = element.children[2];
         evt = {
           to: element,
-          related: element,
+          related: element.children[1],
           willInsertAfter: false
         };
-        originalEvt = {};
+        originalEvt = {
+          domInfo: true
+        };
         move = getEvent("onMove");
         doMove = () => move(evt, originalEvt);
       });
@@ -329,7 +329,69 @@ describe("draggable.vue when initialized with list", () => {
         beforeEach(() => {
           move = jest.fn();
           wrapper.setProps({ move });
-        })
+        });
+
+        it("calls move with list information", () => {
+          const expectedEvt = {
+            draggedContext: {
+              element: "b",
+              futureIndex: 0,
+              index: 1
+            },
+            relatedContext: {
+              component: vm,
+              element: "a",
+              index: 0,
+              list: ["a", "b", "c"]
+            },
+            to: element,
+            related: element.children[1],
+            willInsertAfter: false
+          };
+          doMove();
+          expect(move.mock.calls.length).toBe(1);
+          expect(move).toHaveBeenCalledWith(expectedEvt, originalEvt);
+        });
+
+
+        test.each([
+          [1, false, 0, { element: "a", index: 0 }],
+          [2, false, 1, { element: "b", index: 1 }],
+          [3, false, 2, { element: "c", index: 2 }],
+
+          // Will insert after is not taken into account if the dragging
+          // element is in the target list
+          [1, true, 0, { element: "a", index: 0 }],
+          [2, true, 1, { element: "b", index: 1 }],
+          [3, true, 2, { element: "c", index: 2 }],
+        ])(
+          "when context is of index %n with insert after %o has futureIndex: %n and context: %o",
+          (index, willInsertAfter, futureIndex, context) => {
+            evt.willInsertAfter = willInsertAfter;
+            evt.related = element.children[index];
+
+            const expectedEvt = {
+              draggedContext: {
+                element: "b",
+                futureIndex,
+                index: 1
+              },
+              relatedContext: {
+                component: vm,
+                element: context.element,
+                index: context.index,
+                list: ["a", "b", "c"]
+              },
+              to: element,
+              related: element.children[index],
+              willInsertAfter
+            };
+
+            doMove();
+            expect(move.mock.calls.length).toBe(1);
+            expect(move).toHaveBeenCalledWith(expectedEvt, originalEvt);
+          }
+        )
 
         test.each([
           true,
@@ -437,16 +499,6 @@ describe("draggable.vue when initialized with list", () => {
     })
   });
 
-  it("does calls Sortable destroy when mounted", () => {
-    expect(SortableFake.destroy.mock.calls.length).toBe(0);
-  });
-
-  it("calls Sortable destroy when destroyed", () => {
-    wrapper.destroy();
-    expect(SortableFake.destroy).toHaveBeenCalled();
-    expect(SortableFake.destroy.mock.calls.length).toBe(1);
-  });
-
   describe("when attribute changes:", () => {
     const { error } = console;
     beforeEach(() => {
@@ -478,6 +530,16 @@ describe("draggable.vue when initialized with list", () => {
       expect(SortableFake.option).toHaveBeenCalledWith(sortableAttribute, value);
     }
   );
+
+  it("does calls Sortable destroy when mounted", () => {
+    expect(SortableFake.destroy.mock.calls.length).toBe(0);
+  });
+
+  it("calls Sortable destroy when destroyed", () => {
+    wrapper.destroy();
+    expect(SortableFake.destroy).toHaveBeenCalled();
+    expect(SortableFake.destroy.mock.calls.length).toBe(1);
+  });
 })
 
 describe("draggable.vue when initialized with value", () => {