throw error on prime double turns

fixes #29
scottbedard · Aug 8, 2021 · 88ad0df · 88ad0df
1 parent e3058ba
commit 88ad0df
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/src/puzzles/cube/cube.ts b/src/puzzles/cube/cube.ts
@@ -170,7 +170,7 @@ export class Cube extends Puzzle<CubeOptions, CubeState, CubeSimpleState, CubeTu
    * @param {string} turn turn notation to parse
    */
   parse(turn: string): CubeTurn {
-    const parts = turn.match(/^(\d)*([ulfrbdxyzULFRBDXYZ]){1}(w)*(['-2])*$/);
+    const parts = turn.match(/^(\d)*([ulfrbdxyzULFRBDXYZ]){1}(w)*(['-2])?$/);
 
     if (!parts) {
       error(`Invalid turn: ${turn}`);

diff --git a/tests/puzzles/cube.spec.ts b/tests/puzzles/cube.spec.ts
@@ -73,18 +73,26 @@ describe('Cube', () => {
     const debug = '';
     const model = new Cube({ size: 3 });
 
-    Object.entries(cubeNotation).forEach(([turn, expected]) => {
-      if (!debug || debug === turn) {
-        it(turn, () => {
-          expect(model.parse(turn)).toEqual(expected);
-        });
-      } else {
-        it.todo(turn);
-      }
+    describe('valid', () => {
+      Object.entries(cubeNotation).forEach(([turn, expected]) => {
+        if (!debug || debug === turn) {
+          it(turn, () => {
+            expect(model.parse(turn)).toEqual(expected);
+          });
+        } else {
+          it.todo(turn);
+        }
+      });
     });
 
-    it('bad turn', () => {
-      expect(() => model.parse('bad turn')).toThrow();
+    describe('invalid', () => {
+      it('bad turn', () => {
+        expect(() => model.parse('bad turn')).toThrow();
+      });
+
+      it('R2-', () => {
+        expect(() => model.parse('R2-')).toThrow();
+      });
     });
   });