validate step has tests && tests before solution

Signed-off-by: shmck <[email protected]>
coderoad · ShMcK · Jun 24, 2020 · Jun 21, 2020 · Jun 21, 2020 · Jun 21, 2020
commit 0765174b98476ea5ab672b6696246f895e0ec9e8
diff --git a/src/utils/validateCommits.ts b/src/utils/validateCommits.ts
@@ -3,21 +3,21 @@
 export function validateCommitOrder(positions: string[]): boolean {
   // loop over positions
   const errors: number[] = [];
-  let previous = { level: 0, step: 0 };
-  let current = { level: 0, step: 0 };
+  let previous = { level: 0, step: 0, type: "" };
+  let current = { level: 0, step: 0, type: "" };
   positions.forEach((position: string, index: number) => {
     if (position === "INIT") {
       if (previous.level !== 0 && previous.step !== 0) {
         errors.push(index);
       }
-      current = { level: 0, step: 0 };
+      current = { level: 0, step: 0, type: "" };
       return;
     } else {
       // @deprecate - remove L|Q
       const levelMatch = position.match(/^(?<level>[0-9]+)$/);
       // @deprecate - remove S|Q|A
       const stepMatch = position.match(
-        /^(?<level>[0-9]+)\.(?<step>[0-9]+):[T|S]$/
+        /^(?<level>[0-9]+)\.(?<step>[0-9]+):(?<stepType>[T|S])$/
       );
       if (levelMatch) {
         // allows next level or step
@@ -27,7 +27,7 @@ export function validateCommitOrder(positions: string[]): boolean {
           return;
         }
         const level = Number(levelString);
-        current = { level, step: 0 };
+        current = { level, step: 0, type: "" };
       } else if (stepMatch) {
         // allows next level or step
         if (!stepMatch?.groups?.level || !stepMatch?.groups.step) {
@@ -38,13 +38,26 @@ export function validateCommitOrder(positions: string[]): boolean {
 
         const level = Number(levelString);
         const step = Number(stepString);
-        current = { level, step };
+        const type = stepMatch?.groups.stepType;
+
+        const sameStep = previous.level === level && previous.step === step;
+
+        if (
+          // tests should come before the solution
+          (sameStep && type === "T" && previous.type === "S") ||
+          // step should have tests
+          (!sameStep && type === "S")
+        ) {
+          errors.push(index);
+        }
+        current = { level, step, type };
       } else {
         // error
         console.warn(`Invalid commit position: ${position}`);
         return;
       }
       if (
+        // levels or steps are out of order
         current.level < previous.level ||
         (current.level === previous.level && current.step < previous.step)
       ) {

diff --git a/tests/commitOrder.test.ts b/tests/commitOrder.test.ts
@@ -14,6 +14,8 @@ describe("commitOrder", () => {
         "1",
         "1",
         "1.1:T",
+        "1.1:T",
+        "1.1:S",
         "1.1:S",
         "1.2:T",
         "1.2:S",
@@ -45,5 +47,15 @@ describe("commitOrder", () => {
       const result = validateCommitOrder(positions);
       expect(result).toBe(false);
     });
+    it("should return false if solution is before step", () => {
+      const positions = ["INIT", "1", "1.1:S", "1.1:T", "1.2:T"];
+      const result = validateCommitOrder(positions);
+      expect(result).toBe(false);
+    });
+    it("should return false if solution but no test step", () => {
+      const positions = ["INIT", "1", "1.1:S", "1.2:T"];
+      const result = validateCommitOrder(positions);
+      expect(result).toBe(false);
+    });
   });
 });