Setup testing for which columns are being clicked.

Author: kyle-wannacott

test/order-by-desc.test.js

@@ -3,82 +3,82 @@ const createTestTable = require("./table");
 test("Alpha - Capitalized: order-by-desc", () => {
   expect(
     createTestTable(
-      { col1: ["Echo", "Alpha", "Bravo", "Charlie", "Delta"] },
+      { col0: ["Echo", "Alpha", "Bravo", "Charlie", "Delta"] },
       {
         classTags: "order-by-desc",
       }
     )
-  ).toStrictEqual({ col1: ["Echo", "Delta", "Charlie", "Bravo", "Alpha"] });
+  ).toStrictEqual({ col0: ["Echo", "Delta", "Charlie", "Bravo", "Alpha"] });
 });
 
 test("Alpha - Lowercase: order-by-desc ", () => {
   expect(
     createTestTable(
-      { col1: ["echo", "alpha", "bravo", "charlie", "delta"] },
+      { col0: ["echo", "alpha", "bravo", "charlie", "delta"] },
       {
         classTags: "order-by-desc",
       }
     )
-  ).toStrictEqual({ col1: ["echo", "delta", "charlie", "bravo", "alpha"] });
+  ).toStrictEqual({ col0: ["echo", "delta", "charlie", "bravo", "alpha"] });
 });
 
 test("Numerical: order-by-desc", () => {
   expect(
-    createTestTable({ col1: [5, 3, 4, 1, 2] }, { classTags: "order-by-desc" })
-  ).toStrictEqual({ col1: ["5", "4", "3", "2", "1"] });
+    createTestTable({ col0: [5, 3, 4, 1, 2] }, { classTags: "order-by-desc" })
+  ).toStrictEqual({ col0: ["5", "4", "3", "2", "1"] });
 });
 
 test("Alphanumeric: order-by-desc", () => {
   expect(
     createTestTable(
-      { col1: ["Alpha1", "Echo5", "Bravo2", "Charlie3", "Delta4"] },
+      { col0: ["Alpha1", "Echo5", "Bravo2", "Charlie3", "Delta4"] },
       {
         classTags: "order-by-desc",
       }
     )
   ).toStrictEqual({
-    col1: ["Echo5", "Delta4", "Charlie3", "Bravo2", "Alpha1"],
+    col0: ["Echo5", "Delta4", "Charlie3", "Bravo2", "Alpha1"],
   });
 });
 
 test("Dates: order-by-desc", () => {
   expect(
     createTestTable(
-      { col1: ["1979/9/6", "2008/4/9", "1879/12/16", "1978/4/6", "1978/4/16"] },
+      { col0: ["1979/9/6", "2008/4/9", "1879/12/16", "1978/4/6", "1978/4/16"] },
       { classTags: "order-by-desc" }
     )
   ).toStrictEqual({
-    col1: ["2008/4/9", "1979/9/6", "1978/4/16", "1978/4/6", "1879/12/16"],
+    col0: ["2008/4/9", "1979/9/6", "1978/4/16", "1978/4/6", "1879/12/16"],
   });
 });
 
 test("Money: order-by-desc", () => {
   expect(
     createTestTable(
-      { col1: ["$29", "$93", "$84", "$20", "$58"] },
+      { col0: ["$29", "$93", "$84", "$20", "$58"] },
       {
         classTags: "order-by-desc",
       }
     )
-  ).toStrictEqual({ col1: ["$93", "$84", "$58", "$29", "$20"] });
+  ).toStrictEqual({ col0: ["$93", "$84", "$58", "$29", "$20"] });
 });
 
 test("Empty cells sort at the end: order-by-desc", () => {
   expect(
     createTestTable(
-      { col1: ["Echo", "", "Bravo", "", "Alpha"] },
+      { col0: ["Echo", "", "Bravo", "", "Alpha"] },
       {
         classTags: "order-by-desc",
       }
     )
-  ).toStrictEqual({ col1: ["", "", "Echo", "Bravo", "Alpha"] });
+  ).toStrictEqual({ col0: ["", "", "Echo", "Bravo", "Alpha"] });
 });
 
 test("Order by file-size: file-size order-by-desc", () => {
   expect(
     createTestTable(
       {
-        col1: [
+        col0: [
           "10MB",
           "10GB",
           "10TB",
@@ -93,7 +93,7 @@ test("Order by file-size: file-size order-by-desc", () => {
       { classTags: "order-by-desc file-size-sort" }
     )
   ).toStrictEqual({
-    col1: [
+    col0: [
       "10.00 TiB",
       "9.09 TiB",
       "10.00 GiB",
@@ -110,30 +110,30 @@ test("Order by file-size: file-size order-by-desc", () => {
 test("Floating point numbers: order-by-desc", () => {
   expect(
     createTestTable(
-      { col1: [6.23, 0.25, 3.15, 9.09, 0.35] },
+      { col0: [6.23, 0.25, 3.15, 9.09, 0.35] },
       {
         classTags: "order-by-desc",
       }
     )
-  ).toStrictEqual({ col1: ["9.09", "6.23", "3.15", "0.35", "0.25"] });
+  ).toStrictEqual({ col0: ["9.09", "6.23", "3.15", "0.35", "0.25"] });
 });
 
 test("Release Versions: order-by-desc", () => {
   expect(
     createTestTable(
-      { col1: ["4.0.1", "3.0.2", "4.1.0", "3.0.4", "4.2.0"] },
+      { col0: ["4.0.1", "3.0.2", "4.1.0", "3.0.4", "4.2.0"] },
       {
         classTags: "order-by-desc",
       }
     )
-  ).toStrictEqual({ col1: ["4.2.0", "4.1.0", "4.0.1", "3.0.4", "3.0.2"] });
+  ).toStrictEqual({ col0: ["4.2.0", "4.1.0", "4.0.1", "3.0.4", "3.0.2"] });
 });
 
 test("data-sort: example days of week  - reversed", () => {
   expect(
     createTestTable(
       {
-        col1: [
+        col0: [
           "Saturday",
           "Wednesday",
           "Sunday",
@@ -146,7 +146,7 @@ test("data-sort: example days of week  - reversed", () => {
       { classTags: "data-sort order-by-desc" }
     )
   ).toStrictEqual({
-    col1: [
+    col0: [
       "Monday",
       "Tuesday",
       "Thursday",
@@ -162,7 +162,7 @@ test("visible-tr-sort: example sort only visible trs", () => {
   expect(
     createTestTable(
       {
-        col1: [
+        col0: [
           "row1", // invisible
           "row2",
           "row3", // invisible
@@ -171,7 +171,7 @@ test("visible-tr-sort: example sort only visible trs", () => {
         ],
       },
       { classTags: "order-by-desc" },
-      [0, 2]
+      { invisibleIndex: [0, 2] }
     )
-  ).toStrictEqual({ col1: ["row5", "row4", "row2"] });
+  ).toStrictEqual({ col0: ["row5", "row4", "row2"] });
 });

test/table.js

@@ -6,13 +6,13 @@ const tableSortJs = require("../public/table-sort");
 
 function createTestTable(
   testTableData,
-  thAttributes = { classTags: "" },
-  invisibleIndex = []
+  thAttributes = { classTags: "", colspan: "" },
+  props = { colsToClick: [], invisibleIndex: [] }
 ) {
   const numberOfTableColumns = Object.keys(testTableData).length;
   let testTableHeaders = "";
   for (let i = 0; i < numberOfTableColumns; i++) {
-    testTableHeaders += `<th class="${thAttributes.classTags}">Testing Column</th>`;
+    testTableHeaders += `<th colspan="${thAttributes.colspan}" class="${thAttributes.classTags}">Testing Column</th>`;
   }
   testTableHeaders = `<tr> ${testTableHeaders} </tr>`;
 
@@ -31,14 +31,17 @@ function createTestTable(
   }
 
   let testTableTdRows = [];
-  for (let i = 0; i < testTableData["col1"].length; i++) {
+  for (let i = 0; i < testTableData["col0"].length; i++) {
     let testTableTdRow;
     if (thAttributes.classTags.includes("data-sort")) {
       testTableTdRow = `${getRowsOfTd(i, "data-sort")}`;
     } else {
       testTableTdRow = `${getRowsOfTd(i)}`;
     }
-    if (invisibleIndex.includes(i)) {
+    if (
+      props.invisibleIndex !== undefined &&
+      props.invisibleIndex.includes(i)
+    ) {
       testTableTdRows.push(`<tr style="display: none;">${testTableTdRow}</tr>`);
     } else {
       testTableTdRows.push(`<tr> ${testTableTdRow}</tr>`);
@@ -62,10 +65,21 @@ function createTestTable(
   </html>`);
 
   // Call tablesort and make table sortable and simulate clicks from a user.
-  tableSortJs((testing = true), dom.window.document);
+  tableSortJs(true, dom.window.document);
 
-  for (let i = 0; i < numberOfTableColumns; i++) {
-    dom.window.document.querySelectorAll("table th")[i].click();
+  if (
+    typeof props.colsToClick !== "undefined" &&
+    props.colsToClick.length > 0
+  ) {
+    for (let i = 0; i < props.colsToClick.length; i++) {
+      dom.window.document
+        .querySelectorAll("table th")
+        [props.colsToClick[i]].click();
+    }
+  } else {
+    for (let i = 0; i < numberOfTableColumns; i++) {
+      dom.window.document.querySelectorAll("table th")[i].click();
+    }
   }
 
   // Make an array from table contents to test if sorted correctly.
@@ -75,16 +89,15 @@ function createTestTable(
   const testIfSortedList = {};
 
   for (let i = 0; i < numberOfTableColumns; i++) {
-    testIfSortedList[`col${i + 1}`] = [];
+    testIfSortedList[`col${i}`] = [];
   }
 
   for (let [i, tr] of tableRows.entries()) {
     if (tr.style.display !== "none") {
       for (let i = 0; i < numberOfTableColumns; i++)
-        testIfSortedList[`col${i + 1}`].push(
+        testIfSortedList[`col${i}`].push(
           tr.querySelectorAll("td").item(i).innerHTML
         );
-      // console.log(tr.querySelectorAll("td").item(i).innerHTML)
     }
   }
   return testIfSortedList;