[pull] master from gchq:master

src/core/operations/CSSSelector.mjs

@@ -77,7 +77,7 @@ class CSSSelector extends Operation {
                 case node.TEXT_NODE: return node.wholeText;
                 case node.COMMENT_NODE: return node.data;
                 case node.DOCUMENT_NODE: return node.outerHTML;
-                default: throw new Error("Unknown Node Type: " + node.nodeType);
+                default: throw new OperationError("Unknown Node Type: " + node.nodeType);
             }*/
         };
 

src/core/operations/LuhnChecksum.mjs

@@ -48,7 +48,7 @@ class LuhnChecksum extends Operation {
 
             // If element is not a valid number in the given radix.
             if (isNaN(temp)) {
-                throw new Error("Character: " + elem + " is not valid in radix " + radix + ".");
+                throw new OperationError("Character: " + elem + " is not valid in radix " + radix + ".");
             }
 
             // If element is in an even position

src/core/operations/MOD.mjs

@@ -4,6 +4,7 @@
 
 import BigNumber from "bignumber.js";
 import Operation from "../Operation.mjs";
+import OperationError from "../errors/OperationError.mjs";
 import { createNumArray } from "../lib/Arithmetic.mjs";
 import { ARITHMETIC_DELIM_OPTIONS } from "../lib/Delim.mjs";
 
@@ -48,7 +49,7 @@ class MOD extends Operation {
         const delimiter = args[1];
 
         if (modulus.isZero()) {
-            throw new Error("Modulus cannot be zero");
+            throw new OperationError("Modulus cannot be zero");
         }
 
         const numbers = createNumArray(input, delimiter);

tests/operations/tests/LuhnChecksum.mjs

@@ -433,4 +433,15 @@ TestRegister.addTests([
             },
         ],
     },
+    {
+        name: "Luhn Checksum: Invalid character for radix error",
+        input: "123G",
+        expectedOutput: "Character: G is not valid in radix 10.",
+        recipeConfig: [
+            {
+                op: "Luhn Checksum",
+                args: [10]
+            },
+        ],
+    },
 ]);

tests/operations/tests/MOD.mjs

@@ -163,8 +163,7 @@ TestRegister.addTests([
     {
         name: "MOD: Zero modulus error",
         input: "15 4 7",
-        expectedError: true,
-        expectedOutput: "MOD - Modulus cannot be zero",
+        expectedOutput: "Modulus cannot be zero",
         recipeConfig: [
             {
                 "op": "MOD",