AddTimeToOpponent (clean)

.eslintrc.js

@@ -23,6 +23,9 @@ module.exports = {
             'plugin:jasmine/recommended',
         ],
         rules: {
+            '@typescript-eslint/no-floating-promises': ['error'],
+            'jasmine/no-expect-in-setup-teardown': ['off'],
+            'jasmine/expect-matcher': ['error'],
             'jasmine/new-line-before-expect': ['off'],
             'jasmine/new-line-between-declarations': ['off'],
             'no-warning-comments': [
@@ -42,7 +45,6 @@ module.exports = {
             '@typescript-eslint/switch-exhaustiveness-check': ['warn'],
             '@typescript-eslint/no-unused-expressions': ['warn'],
             '@typescript-eslint/no-unused-vars': ['warn'],
-            '@typescript-eslint/no-use-before-define': ['warn'],
             '@typescript-eslint/no-useless-constructor': ['warn'],
             '@typescript-eslint/typedef': [
                 'error',

.gitignore

@@ -28,10 +28,10 @@
 /.sass-cache
 /connect.lock
 /coverage
-! coverage/branches.csv
-! coverage/functions.csv
-! coverage/statements.csv
-! coverage/lines.csv
+! /coverage/branches.csv
+! /coverage/functions.csv
+! /coverage/statements.csv
+! /coverage/lines.csv
 /typings
 *.log
 

coverage/branches.csv

@@ -1,23 +1,13 @@
-AttackEpaminondasMinimax.ts,1
-AwaleRules.ts,2
-AwaleMinimax.ts,2
-AuthenticationService.ts,1
-ActivesPartsService.ts,4
-ActivesUsersService.ts,1
-count-down.component.ts,1
-Coord.ts,1
-CoerceoPiecesThreatTilesMinimax.ts,3
-GameWrapper.ts,1
-GoGroupsDatas.ts,5
-HexagonalGameState.ts,3
-LinesOfActionRules.ts,1
-MGPNode.ts,1
-online-game-wrapper.component.ts,11
-ObjectUtils.ts,3
-Player.ts,1
-PylosState.ts,1
-PositionalEpaminondasMinimax.ts,1
-QuartoHasher.ts,1
-QuartoRules.ts,3
-SixMinimax.ts,6
-SiamPiece.ts,1
+ActiveUsersService.ts,1
+AttackEpaminondasMinimax.ts,1
+AuthenticationService.ts,1
+CoerceoPiecesThreatTilesMinimax.ts,3
+GameWrapper.ts,1
+GoGroupsDatas.ts,5
+HexagonalGameState.ts,3
+LinesOfActionRules.ts,1
+MGPNode.ts,1
+ObjectUtils.ts,3
+online-game-wrapper.component.ts,13
+PositionalEpaminondasMinimax.ts,1
+PylosState.ts,1

coverage/functions.csv

@@ -1,10 +1,3 @@
-AuthenticationService.ts,2
-ActivesPartsService.ts,5
-ActivesUsersService.ts,3
-NodeUnheritance.ts,1
-online-game-wrapper.component.ts,2
-PieceThreat.ts,1
-PylosState.ts,1
-QuartoRules.ts,1
-server-page.component.ts,1
-SixMinimax.ts,3
+ActiveUsersService.ts,3
+AuthenticationService.ts,2
+online-game-wrapper.component.ts,1

coverage/lines.csv

@@ -1,22 +1,11 @@
-AwaleRules.ts,1
-AuthenticationService.ts,3
-ActivesPartsService.ts,13
-ActivesUsersService.ts,3
-CoerceoPiecesThreatTilesMinimax.ts,1
-GameWrapper.ts,1
-GoGroupsDatas.ts,4
-HexagonalGameState.ts,6
-LinesOfActionRules.ts,1
-MGPNode.ts,1
-NodeUnheritance.ts,1
-online-game-wrapper.component.ts,9
-ObjectUtils.ts,2
-PieceThreat.ts,1
-Player.ts,2
-PylosState.ts,1
-PositionalEpaminondasMinimax.ts,1
-QuartoHasher.ts,1
-QuartoRules.ts,5
-server-page.component.ts,1
-SixMinimax.ts,13
-SiamPiece.ts,1
+ActiveUsersService.ts,3
+AuthenticationService.ts,3
+CoerceoPiecesThreatTilesMinimax.ts,1
+GameWrapper.ts,1
+GoGroupsDatas.ts,4
+HexagonalGameState.ts,6
+LinesOfActionRules.ts,1
+MGPNode.ts,1
+ObjectUtils.ts,2
+online-game-wrapper.component.ts,11
+PositionalEpaminondasMinimax.ts,1

coverage/statements.csv

@@ -1,23 +1,12 @@
-AwaleRules.ts,1
-AuthenticationService.ts,3
-ActivesPartsService.ts,15
-ActivesUsersService.ts,5
-Coord.ts,1
-CoerceoPiecesThreatTilesMinimax.ts,1
-GameWrapper.ts,1
-GoGroupsDatas.ts,4
-HexagonalGameState.ts,6
-LinesOfActionRules.ts,1
-MGPNode.ts,1
-NodeUnheritance.ts,1
-online-game-wrapper.component.ts,9
-ObjectUtils.ts,2
-PieceThreat.ts,1
-Player.ts,2
-PylosState.ts,2
-PositionalEpaminondasMinimax.ts,1
-QuartoHasher.ts,1
-QuartoRules.ts,5
-server-page.component.ts,1
-SixMinimax.ts,13
-SiamPiece.ts,1
+ActiveUsersService.ts,4
+AuthenticationService.ts,3
+CoerceoPiecesThreatTilesMinimax.ts,1
+GameWrapper.ts,1
+GoGroupsDatas.ts,4
+HexagonalGameState.ts,6
+LinesOfActionRules.ts,1
+MGPNode.ts,1
+ObjectUtils.ts,2
+online-game-wrapper.component.ts,11
+PositionalEpaminondasMinimax.ts,1
+PylosState.ts,1

scripts/check-translations.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-python3 ./scripts/check-translations.py
+python ./scripts/check-translations.py
 if [ "$?" -eq 0 ]; then
     echo 'Translations are OK!'
     BEFORE=$(sha256sum src/assets/fr.json)

scripts/coverage.py

@@ -9,8 +9,9 @@
     print('Usage: %s [generate|check]' % sys.argv[0])
     exit(1)
 
-def sort_function(x):
-    return str.lower(x[0])
+def sort_function(file_and_coverage):
+    return str.lower(file_and_coverage[0])
+
 def to_missing(x):
     "Converts from the string AA/BB to the number BB-AA"
     [low, high] = x.split('/')
@@ -53,7 +54,7 @@ def load_stored_coverage():
 
 def generate_in_file(data, path):
     f = open(path, mode='w', encoding='utf8')
-    for directory in sorted(data, key=sort_function):
+    for directory in dict(sorted(data.items(), key=sort_function)):
         if data[directory] > 0:
             # Only store if coverage is > 0
             f.write('%s,%d\n' % (directory, data[directory]))

src/app/app.component.spec.ts

@@ -1,17 +1,17 @@
 /* eslint-disable max-lines-per-function */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { AppComponent } from './app.component';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 
 describe('AppComponent', () => {
-    beforeEach(() => {
-        TestBed.configureTestingModule({
+    beforeEach(fakeAsync(async() => {
+        await TestBed.configureTestingModule({
             imports: [RouterTestingModule],
             declarations: [AppComponent],
             schemas: [CUSTOM_ELEMENTS_SCHEMA],
         }).compileComponents();
-    });
+    }));
     it('should create the app', () => {
         const fixture: ComponentFixture<AppComponent> = TestBed.createComponent(AppComponent);
         const app: AppComponent = fixture.debugElement.componentInstance;

src/app/app.module.ts

@@ -24,7 +24,7 @@ import { AppComponent } from './app.component';
 import { HeaderComponent } from './components/normal-component/header/header.component';
 import { WelcomeComponent } from './components/normal-component/welcome/welcome.component';
 import { LoginComponent } from './components/normal-component/login/login.component';
-import { ServerPageComponent } from './components/normal-component/server-page/server-page.component';
+import { LobbyComponent } from './components/normal-component/lobby/lobby.component';
 import { PickGameComponent } from './components/normal-component/pick-game/pick-game.component';
 import { PartCreationComponent } from './components/wrapper-components/part-creation/part-creation.component';
 import { NotFoundComponent } from './components/normal-component/not-found/not-found.component';
@@ -97,7 +97,7 @@ registerLocaleData(localeFr);
 
 const routes: Route [] = [
     { path: 'login', component: LoginComponent },
-    { path: 'server', component: ServerPageComponent, canActivate: [VerifiedAccountGuard] },
+    { path: 'lobby', component: LobbyComponent, canActivate: [VerifiedAccountGuard] },
     { path: 'settings', component: SettingsComponent },
     { path: 'register', component: RegisterComponent, canActivate: [NotConnectedGuard] },
     { path: 'reset-password', component: ResetPasswordComponent, canActivate: [NotConnectedGuard] },
@@ -122,7 +122,7 @@ const routes: Route [] = [
         HeaderComponent,
         WelcomeComponent,
         LoginComponent,
-        ServerPageComponent,
+        LobbyComponent,
         PickGameComponent,
         ChatComponent,
         PartCreationComponent,

src/app/components/game-components/game-component/GameComponent.ts

@@ -5,7 +5,7 @@ import { MGPValidation } from 'src/app/utils/MGPValidation';
 import { Player } from 'src/app/jscaip/Player';
 import { Minimax } from 'src/app/jscaip/Minimax';
 import { MoveEncoder } from 'src/app/jscaip/Encoder';
-import { MessageDisplayer } from 'src/app/services/message-displayer/MessageDisplayer';
+import { MessageDisplayer } from 'src/app/services/MessageDisplayer';
 import { TutorialStep } from '../../wrapper-components/tutorial-game-wrapper/TutorialStep';
 import { GameState } from 'src/app/jscaip/GameState';
 import { Utils } from 'src/app/utils/utils';

src/app/components/game-components/game-includer/game-includer.component.spec.ts

@@ -1,21 +1,20 @@
 /* eslint-disable max-lines-per-function */
-import { ComponentFixture, TestBed } from '@angular/core/testing';
-
+import { ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
 import { GameIncluderComponent } from './game-includer.component';
 
 describe('GameIncluderComponent', () => {
 
     let component: GameIncluderComponent;
     let fixture: ComponentFixture<GameIncluderComponent>;
 
-    beforeEach(() => {
-        TestBed.configureTestingModule({
+    beforeEach(fakeAsync(async() => {
+        await TestBed.configureTestingModule({
             declarations: [GameIncluderComponent],
         }).compileComponents();
         fixture = TestBed.createComponent(GameIncluderComponent);
         component = fixture.componentInstance;
         fixture.detectChanges();
-    });
+    }));
     it('should create', () => {
         expect(component).toBeTruthy();
     });