Change createTestTable() and associated tests to take in thAttributes object with classTags property on it.

Author: kyle-wannacott

test/table.js

@@ -1,17 +1,22 @@
 const jsdom = require("jsdom");
+
 const { JSDOM } = jsdom;
 require("iconv-lite").encodingExists("foo");
 const tableSortJs = require("../public/table-sort");
 
-function createTestTable(testTableData, classTags = "", invisibleIndex = []) {
+function createTestTable(
+  testTableData,
+  thAttributes = { classTags: "" },
+  invisibleIndex = []
+) {
   let getClassTagsForTH = [];
-  let testTableThRow = `<tr><th class="${classTags}">Testing Column</th></tr>`;
+  let testTableThRow = `<tr><th class="${thAttributes.classTags}">Testing Column</th></tr>`;
   getClassTagsForTH.push(testTableThRow);
 
   let testTableTdRows = [];
   for (let i = 0; i < testTableData.length; i++) {
     let testTableTdRow;
-    if (classTags.includes("data-sort")) {
+    if (thAttributes.classTags.includes("data-sort")) {
       testTableTdRow = `<tr><td data-sort="${i}">${testTableData[i]}</td></tr>`;
     } else if (invisibleIndex.includes(i)) {
       testTableTdRow = `<tr style="display: none;"><td>${testTableData[i]}</td></tr>`;

test/table.test.js

@@ -4,36 +4,38 @@ const createTestTable = require("./table");
 
 test("Alpha - Capitalized ", () => {
   expect(
-    createTestTable(["Echo", "Alpha", "Bravo", "Charlie", "Delta"])
+    createTestTable(["Echo", "Alpha", "Bravo", "Charlie", "Delta"], {
+      classTags: "",
+    })
   ).toStrictEqual(["Alpha", "Bravo", "Charlie", "Delta", "Echo"]);
 });
 
 test("Alpha - Capitalized: order-by-desc", () => {
   expect(
-    createTestTable(
-      ["Echo", "Alpha", "Bravo", "Charlie", "Delta"],
-      "order-by-desc"
-    )
+    createTestTable(["Echo", "Alpha", "Bravo", "Charlie", "Delta"], {
+      classTags: "order-by-desc",
+    })
   ).toStrictEqual(["Echo", "Delta", "Charlie", "Bravo", "Alpha"]);
 });
 
 test("Alpha - Lowercase", () => {
   expect(
-    createTestTable(["echo", "alpha", "bravo", "charlie", "delta"])
+    createTestTable(["echo", "alpha", "bravo", "charlie", "delta"], {
+      classTags: "",
+    })
   ).toStrictEqual(["alpha", "bravo", "charlie", "delta", "echo"]);
 });
 
 test("Alpha - Lowercase: order-by-desc ", () => {
   expect(
-    createTestTable(
-      ["echo", "alpha", "bravo", "charlie", "delta"],
-      "order-by-desc"
-    )
+    createTestTable(["echo", "alpha", "bravo", "charlie", "delta"], {
+      classTags: "order-by-desc",
+    })
   ).toStrictEqual(["echo", "delta", "charlie", "bravo", "alpha"]);
 });
 
 test("Numerical", () => {
-  expect(createTestTable([5, 3, 4, 1, 2])).toStrictEqual([
+  expect(createTestTable([5, 3, 4, 1, 2], { classTags: "" })).toStrictEqual([
     "1",
     "2",
     "3",
@@ -43,39 +45,33 @@ test("Numerical", () => {
 });
 
 test("Numerical: order-by-desc", () => {
-  expect(createTestTable([5, 3, 4, 1, 2], "order-by-desc")).toStrictEqual([
-    "5",
-    "4",
-    "3",
-    "2",
-    "1",
-  ]);
+  expect(
+    createTestTable([5, 3, 4, 1, 2], { classTags: "order-by-desc" })
+  ).toStrictEqual(["5", "4", "3", "2", "1"]);
 });
 
 test("Alphanumeric", () => {
   expect(
-    createTestTable(["Alpha1", "Echo5", "Bravo2", "Charlie3", "Delta4"])
+    createTestTable(["Alpha1", "Echo5", "Bravo2", "Charlie3", "Delta4"], {
+      classTags: "",
+    })
   ).toStrictEqual(["Alpha1", "Bravo2", "Charlie3", "Delta4", "Echo5"]);
 });
 
 test("Alphanumeric: order-by-desc", () => {
   expect(
-    createTestTable(
-      ["Alpha1", "Echo5", "Bravo2", "Charlie3", "Delta4"],
-      "order-by-desc"
-    )
+    createTestTable(["Alpha1", "Echo5", "Bravo2", "Charlie3", "Delta4"], {
+      classTags: "order-by-desc",
+    })
   ).toStrictEqual(["Echo5", "Delta4", "Charlie3", "Bravo2", "Alpha1"]);
 });
 
 test("Dates", () => {
   expect(
-    createTestTable([
-      "1979/9/6",
-      "2008/4/9",
-      "1879/12/16",
-      "1978/4/6",
-      "1978/4/16",
-    ])
+    createTestTable(
+      ["1979/9/6", "2008/4/9", "1879/12/16", "1978/4/6", "1978/4/16"],
+      { classTags: "" }
+    )
   ).toStrictEqual([
     "1879/12/16",
     "1978/4/6",
@@ -89,7 +85,7 @@ test("Dates: order-by-desc", () => {
   expect(
     createTestTable(
       ["1979/9/6", "2008/4/9", "1879/12/16", "1978/4/6", "1978/4/16"],
-      "order-by-desc"
+      { classTags: "order-by-desc" }
     )
   ).toStrictEqual([
     "2008/4/9",
@@ -101,34 +97,30 @@ test("Dates: order-by-desc", () => {
 });
 
 test("Money", () => {
-  expect(createTestTable(["$29", "$93", "$84", "$20", "$58"])).toStrictEqual([
-    "$20",
-    "$29",
-    "$58",
-    "$84",
-    "$93",
-  ]);
+  expect(
+    createTestTable(["$29", "$93", "$84", "$20", "$58"], { classTags: "" })
+  ).toStrictEqual(["$20", "$29", "$58", "$84", "$93"]);
 });
 
 test("Money: order-by-desc", () => {
   expect(
-    createTestTable(["$29", "$93", "$84", "$20", "$58"], "order-by-desc")
+    createTestTable(["$29", "$93", "$84", "$20", "$58"], {
+      classTags: "order-by-desc",
+    })
   ).toStrictEqual(["$93", "$84", "$58", "$29", "$20"]);
 });
 
 test("Empty cells sort at the end.", () => {
-  expect(createTestTable(["Echo", "", "Bravo", "", "Alpha"])).toStrictEqual([
-    "Alpha",
-    "Bravo",
-    "Echo",
-    "",
-    "",
-  ]);
+  expect(
+    createTestTable(["Echo", "", "Bravo", "", "Alpha"], { classTags: "" })
+  ).toStrictEqual(["Alpha", "Bravo", "Echo", "", ""]);
 });
 
 test("Empty cells sort at the end: order-by-desc", () => {
   expect(
-    createTestTable(["Echo", "", "Bravo", "", "Alpha"], "order-by-desc")
+    createTestTable(["Echo", "", "Bravo", "", "Alpha"], {
+      classTags: "order-by-desc",
+    })
   ).toStrictEqual(["", "", "Echo", "Bravo", "Alpha"]);
 });
 
@@ -147,7 +139,7 @@ test("Order by file-size: file-size", () => {
         "10KB",
         "10GiB",
       ],
-      ["file-size"]
+      { classTags: "file-size" }
     )
   ).toStrictEqual([
     "10.00 B",
@@ -176,7 +168,7 @@ test("Order by file-size: file-size order-by-desc", () => {
         "10KB",
         "10GiB",
       ],
-      "file-size order-by-desc"
+      { classTags: "order-by-desc file-size" }
     )
   ).toStrictEqual([
     "10.00 TiB",
@@ -195,38 +187,39 @@ test("Order by file-size: file-size order-by-desc", () => {
 
 test("Alpha - lower & upper", () => {
   expect(
-    createTestTable(["AlPhA", "bRaVo", "EcHo", "ChArLiE", "dElTa"])
+    createTestTable(["AlPhA", "bRaVo", "EcHo", "ChArLiE", "dElTa"], {
+      classTags: "",
+    })
   ).toStrictEqual(["AlPhA", "bRaVo", "ChArLiE", "dElTa", "EcHo"]);
 });
 
 test("Floating point numbers", () => {
-  expect(createTestTable([6.23, 0.25, 3.15, 9.09, 0.35])).toStrictEqual([
-    "0.25",
-    "0.35",
-    "3.15",
-    "6.23",
-    "9.09",
-  ]);
+  expect(
+    createTestTable([6.23, 0.25, 3.15, 9.09, 0.35], { classTags: "" })
+  ).toStrictEqual(["0.25", "0.35", "3.15", "6.23", "9.09"]);
 });
 
 test("Floating point numbers: order-by-desc", () => {
   expect(
-    createTestTable([6.23, 0.25, 3.15, 9.09, 0.35], "order-by-desc")
+    createTestTable([6.23, 0.25, 3.15, 9.09, 0.35], {
+      classTags: "order-by-desc",
+    })
   ).toStrictEqual(["9.09", "6.23", "3.15", "0.35", "0.25"]);
 });
 
 test("Release Versions", () => {
   expect(
-    createTestTable(["4.0.1", "3.0.2", "4.1.0", "3.0.4", "4.2.0"])
+    createTestTable(["4.0.1", "3.0.2", "4.1.0", "3.0.4", "4.2.0"], {
+      classTags: "",
+    })
   ).toStrictEqual(["3.0.2", "3.0.4", "4.0.1", "4.1.0", "4.2.0"]);
 });
 
 test("Release Versions: order-by-desc", () => {
   expect(
-    createTestTable(
-      ["4.0.1", "3.0.2", "4.1.0", "3.0.4", "4.2.0"],
-      "order-by-desc"
-    )
+    createTestTable(["4.0.1", "3.0.2", "4.1.0", "3.0.4", "4.2.0"], {
+      classTags: "order-by-desc",
+    })
   ).toStrictEqual(["4.2.0", "4.1.0", "4.0.1", "3.0.4", "3.0.2"]);
 });
 
@@ -242,7 +235,7 @@ test("data-sort: example days of week", () => {
         "Tuesday",
         "Monday",
       ],
-      "data-sort"
+      { classTags: "data-sort" }
     )
   ).toStrictEqual([
     "Saturday",
@@ -267,7 +260,7 @@ test("data-sort: example days of week  - reversed", () => {
         "Tuesday",
         "Monday",
       ],
-      "data-sort order-by-desc"
+      { classTags: "data-sort order-by-desc" }
     )
   ).toStrictEqual([
     "Monday",
@@ -290,23 +283,16 @@ test("visible-tr-sort: example sort only visible trs", () => {
         "row4",
         "row5",
       ],
-      "order-by-desc",
+      { classTags: "order-by-desc" },
       [0, 2]
     )
   ).toStrictEqual(["row5", "row4", "row2"]);
 });
 
 test("disable-sort: disable sorting on a column", () => {
   expect(
-    createTestTable(
-      [
-        "row2",
-        "row1",
-        "row4",
-        "row3",
-      ],
-      "disable-sort"
-    )
+    createTestTable(["row2", "row1", "row4", "row3"], {
+      classTags: "disable-sort",
+    })
   ).toStrictEqual(["row2", "row1", "row4", "row3"]);
 });
-