Fix broken tests

simonkellly · May 22, 2024 · f596601 · f596601
1 parent eb0a979
commit f596601
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 10 deletions.
diff --git a/src/components/timer/timerStore.ts b/src/components/timer/timerStore.ts
@@ -170,11 +170,11 @@ export const useCubeTimer = () => {
     console.log('Scramble:', TimerStore.state.originalScramble);
     let last = times.length > 0 ? times[0].cubeTimestamp : 0;
     console.table(
-      algs.map(([alg, idx]) => {
+      algs.map(([alg, comment, idx]) => {
         const ms = times[idx].cubeTimestamp - last;
         const time = (ms / 1000).toFixed(2);
         last = times[idx].cubeTimestamp;
-        return [alg, time];
+        return [alg + comment, time];
       })
     );
 

diff --git a/src/lib/solutionParser.ts b/src/lib/solutionParser.ts
@@ -348,7 +348,7 @@ export function simplify(alg: string) {
 // TODO: Handle AUF +2
 export async function extractAlgs(
   moveSet: string[]
-): Promise<[string, number][]> {
+): Promise<[string, string, number][]> {
   const comms: [
     alg: string,
     moveIdx: number,
@@ -425,7 +425,7 @@ export async function extractAlgs(
     let foundComm: string | undefined;
 
     if (is2E2C) {
-      return [simplifiedComm.toString() + comment, moveIdx] as [string, number];
+      return [simplifiedComm.toString(), comment, moveIdx];
     }
 
     if (isEdgeComm || isTwist) {
@@ -441,7 +441,7 @@ export async function extractAlgs(
     }
 
     if (!isAnyAlg) {
-      return [simplify(comm.trim()) + comment, moveIdx] as [string, number];
+      return [simplify(comm.trim()).toString(), comment, moveIdx];
     }
 
     if (!foundComm || foundComm.endsWith('.')) {
@@ -460,14 +460,16 @@ export async function extractAlgs(
 
     if (foundComm.endsWith('.')) {
       return [
-        simplify(comm.trim()) + comment + ' (comm not found)',
+        simplify(comm.trim()).toString(),
+        comment + ' (comm not found)',
         moveIdx,
-      ] as [string, number];
+      ];
     }
 
     return [
-      foundComm.replaceAll(',', ', ').replaceAll(':', ': ') + comment,
+      foundComm.replaceAll(',', ', ').replaceAll(':', ': '),
+      comment,
       moveIdx,
-    ] as [string, number];
+    ];
   });
 }
diff --git a/tests/parse.test.ts b/tests/parse.test.ts
@@ -57,7 +57,7 @@ describe('Extract Comms', () => {
   test('Extract invalid comm', async () => {
     const extracted = await extractAlgs("R U' R'".split(' '));
     expect(extracted.length).toBe(1);
-    expect(extracted[0][0]).toBe("R U' R' // not found");
+    expect(extracted[0][0]).toBe("R U' R'");
   });
 
   test('Extract slice alg (FK)', async () => {