enable all events by default

boardgameio · Sep 25, 2019 · 2409729 · 2409729
1 parent 78345ed
commit 2409729
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 22 deletions.
diff --git a/src/client/client.test.js b/src/client/client.test.js
@@ -337,6 +337,9 @@ describe('event dispatchers', () => {
     const client = Client({ game });
     expect(Object.keys(client.events)).toEqual([
       'endTurn',
+      'endPhase',
+      'setPhase',
+      'endGame',
       'setActivePlayers',
       'endStage',
       'setStage',
@@ -371,10 +374,13 @@ describe('event dispatchers', () => {
   test('no events', () => {
     const game = {
       events: {
+        endGame: false,
         endPhase: false,
+        setPhase: false,
         endTurn: false,
         setActivePlayers: false,
         endStage: false,
+        setStage: false,
       },
     };
     const client = Client({ game });

diff --git a/src/core/flow.js b/src/core/flow.js
@@ -206,23 +206,6 @@ export function Flow({ moves, phases, endIf, turn, events, plugins }) {
   if (events === undefined) {
     events = {};
   }
-  if (events.setActivePlayers === undefined) {
-    events.setActivePlayers = true;
-  }
-  if (events.endStage === undefined) {
-    events.endStage = true;
-    events.setStage = true;
-  }
-  if (events.endPhase === undefined && phases) {
-    events.endPhase = true;
-    events.setPhase = true;
-  }
-  if (events.endTurn === undefined) {
-    events.endTurn = true;
-  }
-  if (events.endGame === undefined) {
-    events.endGame = false;
-  }
   if (plugins === undefined) {
     plugins = [];
   }
@@ -875,21 +858,25 @@ export function Flow({ moves, phases, endIf, turn, events, plugins }) {
   };
 
   let enabledEvents = {};
-  if (events.endTurn) {
+  if (events.endTurn !== false) {
     enabledEvents['endTurn'] = true;
   }
-  if (events.endPhase) {
+  if (events.endPhase !== false) {
     enabledEvents['endPhase'] = true;
+  }
+  if (events.setPhase !== false) {
     enabledEvents['setPhase'] = true;
   }
-  if (events.endGame) {
+  if (events.endGame !== false) {
     enabledEvents['endGame'] = true;
   }
-  if (events.setActivePlayers) {
+  if (events.setActivePlayers !== false) {
     enabledEvents['setActivePlayers'] = true;
   }
-  if (events.endStage) {
+  if (events.endStage !== false) {
     enabledEvents['endStage'] = true;
+  }
+  if (events.setStage !== false) {
     enabledEvents['setStage'] = true;
   }