Increment score in checkForWin rather than endGame

caleb531 · Sep 5, 2021 · 89e647e · 89e647e
1 parent e9bf976
commit 89e647e
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 13 deletions.
diff --git a/app/scripts/models/game.js b/app/scripts/models/game.js
@@ -54,9 +54,6 @@ class Game extends Emitter {
 
   // End the game without resetting the grid
   endGame() {
-    if (this.winner) {
-      this.winner.score += 1;
-    }
     this.inProgress = false;
     this.currentPlayer = null;
     this.pendingChip = null;
@@ -189,6 +186,7 @@ class Game extends Emitter {
         chip.winning = true;
       });
       this.winner = this.grid.lastPlacedChip.player;
+      this.winner.score += 1;
       this.emit('game:declare-winner', this.winner);
       this.endGame();
     }

diff --git a/test/game/end-game.spec.js b/test/game/end-game.spec.js
@@ -36,14 +36,4 @@ describe('game', function () {
    expect(game.columnHistory).to.have.length(0);
   });
 
-  it('should increment winner\'s score when ending', function () {
-    const game = new Game();
-    game.setPlayers({ gameType: '2P' });
-    game.startGame();
-    game.winner = game.players[0];
-    expect(game.winner.score).to.equal(0);
-    game.endGame();
-    expect(game.winner.score).to.equal(1);
-  });
-
 });