set phase to null instead of empty string

Author: nicolodavis

src/client/client.test.js

@@ -439,13 +439,13 @@ describe('log handling', () => {
       {
         action: makeMove('A', [], '0'),
         _stateID: 0,
-        phase: '',
+        phase: null,
         turn: 1,
       },
       {
         action: makeMove('A', [], '0'),
         _stateID: 1,
-        phase: '',
+        phase: null,
         turn: 1,
       },
     ]);

src/client/log/log.js

@@ -109,7 +109,7 @@ const PhaseMarker = props => {
 };
 
 PhaseMarker.propTypes = {
-  phase: PropTypes.string.isRequired,
+  phase: PropTypes.string,
   numEvents: PropTypes.number.isRequired,
 };
 

src/core/flow.js

@@ -226,7 +226,7 @@ export function Flow({ moves, phases, endIf, turn, events, plugins }) {
 
   let moveMap = {};
   let moveNames = new Set();
-  let startingPhase = '';
+  let startingPhase = null;
 
   Object.keys(moves).forEach(name => moveNames.add(name));
 
@@ -294,7 +294,7 @@ export function Flow({ moves, phases, endIf, turn, events, plugins }) {
   }
 
   function GetPhase(ctx) {
-    return phaseMap[ctx.phase];
+    return ctx.phase ? phaseMap[ctx.phase] : phaseMap[''];
   }
 
   function OnMove(s) {
@@ -555,21 +555,21 @@ export function Flow({ moves, phases, endIf, turn, events, plugins }) {
       return state;
     }
 
-    // If we aren't in a phase, there is nothing to do.
-    // if (ctx.phase === '') {
-    //   return state;
-    // }
+    if (next) {
+      next.push({ fn: UpdatePhase, arg, phase: ctx.phase });
+    }
+
+    // If we aren't in a phase, there is nothing else to do.
+    if (ctx.phase === null) {
+      return state;
+    }
 
     // Run any cleanup code for the phase that is about to end.
     const conf = GetPhase(ctx);
     G = conf.onEnd(G, ctx);
 
-    if (next) {
-      next.push({ fn: UpdatePhase, arg, phase: ctx.phase });
-    }
-
     // Reset the phase.
-    ctx = { ...ctx, phase: '', playOrderPos: 0 };
+    ctx = { ...ctx, phase: null, playOrderPos: 0 };
 
     // Add log entry.
     const action = gameEvent('endPhase', arg);

src/core/flow.test.js

@@ -269,8 +269,8 @@ test('init', () => {
   expect(state.G).toMatchObject({ done: true });
 });
 
-test('endIf', () => {
-  {
+describe('endIf', () => {
+  test('basic', () => {
     const flow = Flow({ endIf: G => G.win });
 
     let state = flow.init({ G: {}, ctx: flow.ctx(2) });
@@ -288,14 +288,18 @@ test('endIf', () => {
       const t = flow.processMove(state, makeMove('move').payload);
       expect(t.ctx.gameover).toBe('A');
     }
-  }
+  });
 
-  // Test that the phase automatically ends.
-  {
+  test('phase automatically ends', () => {
     const game = {
-      moves: {
-        A: () => ({ win: 'A' }),
-        B: G => G,
+      phases: {
+        A: {
+          start: true,
+          moves: {
+            A: () => ({ win: 'A' }),
+            B: G => G,
+          },
+        },
       },
       endIf: G => G.win,
     };
@@ -312,7 +316,7 @@ test('endIf', () => {
       client.getState().deltalog[client.getState().deltalog.length - 1].action
         .payload.type
     ).toBe('endPhase');
-  }
+  });
 });
 
 describe('turn.endIf', () => {
@@ -448,7 +452,7 @@ describe('endTurn / endPhase args', () => {
     let t = state;
     t = flow.processGameEvent(t, gameEvent('endPhase', 'C'));
     expect(error).toBeCalledWith(`invalid argument to endPhase: C`);
-    expect(t.ctx.phase).toBe('');
+    expect(t.ctx.phase).toBe(null);
   });
 
   test('invalid arg to endTurn', () => {

src/core/reducer.test.js

@@ -208,7 +208,7 @@ test('deltalog', () => {
     {
       action: actionA,
       _stateID: 0,
-      phase: '',
+      phase: null,
       turn: 1,
     },
   ]);
@@ -217,7 +217,7 @@ test('deltalog', () => {
     {
       action: actionB,
       _stateID: 1,
-      phase: '',
+      phase: null,
       turn: 1,
     },
   ]);
@@ -226,7 +226,7 @@ test('deltalog', () => {
     {
       action: actionC,
       _stateID: 2,
-      phase: '',
+      phase: null,
       turn: 1,
     },
   ]);

src/master/master.test.js

@@ -117,7 +117,7 @@ describe('update', () => {
           currentPlayer: '0',
           currentPlayerMoves: 0,
           numPlayers: 2,
-          phase: '',
+          phase: null,
           playOrder: ['0', '1'],
           playOrderPos: 0,
           turn: 1,
@@ -131,7 +131,7 @@ describe('update', () => {
         currentPlayer: '1',
         currentPlayerMoves: 0,
         numPlayers: 2,
-        phase: '',
+        phase: null,
         playOrder: ['0', '1'],
         playOrderPos: 1,
         turn: 2,