From ad3484285b6f992b3d9f8e3bdd08f7f02a5608ea Mon Sep 17 00:00:00 2001
From: =?utf8?q?David=20N=C3=A9grier?= <d.negrier@thecodingmachine.com>
Date: Mon, 4 May 2020 18:38:04 +0200
Subject: [PATCH] Fixing Cypress tests

---
 front/src/Phaser/Game/GameScene.ts    | 9 +--------
 front/src/Phaser/Login/LogincScene.ts | 7 ++++++-
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/front/src/Phaser/Game/GameScene.ts b/front/src/Phaser/Game/GameScene.ts
index e09123e..b0ace1f 100644
--- a/front/src/Phaser/Game/GameScene.ts
+++ b/front/src/Phaser/Game/GameScene.ts
@@ -4,7 +4,6 @@ import {CurrentGamerInterface, GamerInterface, hasMovedEventName, Player} from "
 import {DEBUG_MODE, RESOLUTION, ROOM, ZOOM_LEVEL} from "../../Enum/EnvironmentVariable";
 import Tile = Phaser.Tilemaps.Tile;
 import {ITiledMap, ITiledTileSet} from "../Map/ITiledMap";
-import {cypressAsserter} from "../../Cypress/CypressAsserter";
 
 export const GameSceneName = "GameScene";
 export enum Textures {
@@ -41,7 +40,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
     //hook preload scene
     preload(): void {
         this.GameManager.setCurrentGameScene(this);
-        cypressAsserter.preloadStarted();
         let mapUrl = 'maps/map.json';
         this.load.on('filecomplete-tilemapJSON-'+Textures.Map, (key: string, type: string, data: any) => {
             // Triggered when the map is loaded
@@ -62,8 +60,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
             { frameWidth: 32, frameHeight: 32 }
         );
         this.load.bitmapFont('main_font', 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml');
-
-        cypressAsserter.preloadFinished();
     }
 
     //hook initialisation
@@ -72,8 +68,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
 
     //hook create scene
     create(): void {
-        cypressAsserter.initStarted();
-
         //initalise map
         this.Map = this.add.tilemap("map");
         this.map.tilesets.forEach((tileset: ITiledTileSet) => {
@@ -113,7 +107,6 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
 
         //initialise camera
         this.initCamera();
-        cypressAsserter.initFinished();
     }
 
     //todo: in a dedicated class/function?
@@ -174,7 +167,7 @@ export class GameScene extends Phaser.Scene implements GameSceneInterface{
         this.createCollisionObject();
         this.CurrentPlayer.on(hasMovedEventName, this.pushPlayerPosition.bind(this))
     }
-    
+
     pushPlayerPosition(event: HasMovedEvent) {
         this.GameManager.pushPlayerPosition(event);
     }
diff --git a/front/src/Phaser/Login/LogincScene.ts b/front/src/Phaser/Login/LogincScene.ts
index 1807ecb..10c7e5d 100644
--- a/front/src/Phaser/Login/LogincScene.ts
+++ b/front/src/Phaser/Login/LogincScene.ts
@@ -4,6 +4,7 @@ import {TextInput} from "../Components/TextInput";
 import {ClickButton} from "../Components/ClickButton";
 import {GameSceneName} from "../Game/GameScene";
 import Image = Phaser.GameObjects.Image;
+import {cypressAsserter} from "../../Cypress/CypressAsserter";
 
 //todo: put this constants in a dedicated file
 export const LoginSceneName = "LoginScene";
@@ -28,13 +29,17 @@ export class LogincScene extends Phaser.Scene {
     }
 
     preload() {
+        cypressAsserter.preloadStarted();
         //this.load.image(LoginTextures.playButton, "resources/objects/play_button.png");
         this.load.image(LoginTextures.icon, "resources/logos/tcm_full.png");
         // Note: arcade.png from the Phaser 3 examples at: https://github.com/photonstorm/phaser3-examples/tree/master/public/assets/fonts/bitmap
         this.load.bitmapFont(LoginTextures.mainFont, 'resources/fonts/arcade.png', 'resources/fonts/arcade.xml');
+        cypressAsserter.preloadFinished();
     }
 
     create() {
+        cypressAsserter.initStarted();
+
         this.textField = new TextField(this, this.game.renderer.width / 2, 50, 'Enter your name:');
         this.textField.setOrigin(0.5).setCenterAlign()
         this.nameInput = new TextInput(this, this.game.renderer.width / 2 - 64, 70, 4);
@@ -59,7 +64,7 @@ export class LogincScene extends Phaser.Scene {
             }
             return this.login(name);
         });
-
+        cypressAsserter.initFinished();
     }
 
     update(time: number, delta: number): void {
-- 
2.25.1