AddTimeToOpponent (clean)

.eslintrc.js

@@ -23,6 +23,7 @@ module.exports = {
             'plugin:jasmine/recommended',
         ],
         rules: {
+            'jasmine/expect-matcher': ['error'],
             'jasmine/new-line-before-expect': ['off'],
             'jasmine/new-line-between-declarations': ['off'],
             'no-warning-comments': [
@@ -42,7 +43,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,18 @@
-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
+AwaleMinimax.ts,2
+AwaleRules.ts,2
+AttackEpaminondasMinimax.ts,1
+ActivesPartsService.ts,3
+ActivesUsersService.ts,1
+AuthenticationService.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,13
+ObjectUtils.ts,3
+PositionalEpaminondasMinimax.ts,1
+PylosState.ts,1
+QuartoHasher.ts,1
+QuartoRules.ts,3

coverage/functions.csv

@@ -1,10 +1,7 @@
-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
+ActivesPartsService.ts,2
+ActivesUsersService.ts,3
+AuthenticationService.ts,2
+online-game-wrapper.component.ts,1
+PieceThreat.ts,1
+QuartoRules.ts,1
+server-page.component.ts,1

coverage/lines.csv

@@ -1,22 +1,17 @@
-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
+AwaleRules.ts,1
+ActivesPartsService.ts,6
+ActivesUsersService.ts,3
+AuthenticationService.ts,3
+CoerceoPiecesThreatTilesMinimax.ts,1
+GameWrapper.ts,1
+GoGroupsDatas.ts,4
+HexagonalGameState.ts,6
+LinesOfActionRules.ts,1
+MGPNode.ts,1
+online-game-wrapper.component.ts,11
+ObjectUtils.ts,2
+PositionalEpaminondasMinimax.ts,1
+PieceThreat.ts,1
+QuartoHasher.ts,1
+QuartoRules.ts,5
+server-page.component.ts,1

coverage/statements.csv

@@ -1,23 +1,18 @@
-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
+AwaleRules.ts,1
+ActivesPartsService.ts,7
+ActivesUsersService.ts,5
+AuthenticationService.ts,3
+CoerceoPiecesThreatTilesMinimax.ts,1
+GameWrapper.ts,1
+GoGroupsDatas.ts,4
+HexagonalGameState.ts,6
+LinesOfActionRules.ts,1
+MGPNode.ts,1
+online-game-wrapper.component.ts,11
+ObjectUtils.ts,2
+PositionalEpaminondasMinimax.ts,1
+PylosState.ts,1
+PieceThreat.ts,1
+QuartoHasher.ts,1
+QuartoRules.ts,5
+server-page.component.ts,1

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('/')

src/app/components/normal-component/count-down/count-down.component.html

@@ -1,4 +1,12 @@
-<div>
+<div class="level"
+     [ngClass]="getTimeClass()"
+>
     <p id="remainingTime"
-       [ngClass]="getTimeClass()">{{ displayedMinute }}:{{ displayedSec | number:'2.0-0' }}</p>
+       class="level-item"
+    >{{ displayedMinute }}:{{ displayedSec | number:'2.0-0' }}</p>
+    <button id="addTimeButton"
+            class="button level-item is-small"
+            *ngIf="canAddTime"
+            (click)="addTime()"
+            i18n>Add {{ timeToAdd }} to chrono</button>
 </div>

src/app/components/normal-component/count-down/count-down.component.spec.ts

@@ -1,22 +1,18 @@
 /* eslint-disable max-lines-per-function */
 import { DebugElement } from '@angular/core';
-import { ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
-import { By } from '@angular/platform-browser';
+import { fakeAsync, tick } from '@angular/core/testing';
+import { SimpleComponentTestUtils } from 'src/app/utils/tests/TestUtils.spec';
 import { CountDownComponent } from './count-down.component';
 
 describe('CountDownComponent', () => {
 
-    let component: CountDownComponent;
+    let testUtils: SimpleComponentTestUtils<CountDownComponent>;
 
-    let fixture: ComponentFixture<CountDownComponent>;
+    let component: CountDownComponent;
 
     beforeEach(fakeAsync(async() => {
-        await TestBed.configureTestingModule({
-            declarations: [CountDownComponent],
-        }).compileComponents();
-        fixture = TestBed.createComponent(CountDownComponent);
-        component = fixture.componentInstance;
-        fixture.detectChanges();
+        testUtils = await SimpleComponentTestUtils.create(CountDownComponent);
+        component = testUtils.getComponent();
     }));
     it('should create', () => {
         expect(component).toBeTruthy();
@@ -41,14 +37,15 @@ describe('CountDownComponent', () => {
         });
         it('should show remaining time once set', () => {
             component.setDuration(62000);
-            fixture.detectChanges();
-            const element: DebugElement = fixture.debugElement.query(By.css('#remainingTime'));
-            const timeText: string = element.nativeElement.innerHTML;
+            testUtils.detectChanges();
+            const element: DebugElement = testUtils.findElement('#remainingTime');
+            const timeText: string = element.nativeElement.innerText;
             expect(timeText).toBe('1:02');
         });
         it('should throw when starting stopped chrono again', () => {
             component.setDuration(1250);
             component.start();
+            expect(component.isStarted()).toBeTrue();
             component.stop();
             expect(() => component.start()).toThrowError('Should not start a chrono that has not been set!');
         });
@@ -93,34 +90,34 @@ describe('CountDownComponent', () => {
         component.setDuration(3000);
         component.start();
         tick(1000);
-        fixture.detectChanges();
-        let timeText: string = fixture.debugElement.query(By.css('#remainingTime')).nativeElement.innerHTML;
+        testUtils.detectChanges();
+        let timeText: string = testUtils.findElement('#remainingTime').nativeElement.innerText;
         expect(timeText).toBe('0:02');
         tick(1000);
-        fixture.detectChanges();
-        timeText = fixture.debugElement.query(By.css('#remainingTime')).nativeElement.innerHTML;
+        testUtils.detectChanges();
+        timeText = testUtils.findElement('#remainingTime').nativeElement.innerText;
         expect(timeText).toBe('0:01');
         component.stop();
     }));
     it('should update written time correctly (closest rounding) even when playing in less than refreshing time', fakeAsync(() => {
         spyOn(component.outOfTimeAction, 'emit').and.callThrough();
-        component.setDuration(599501); // 9 minutes 59 sec 501 ms
-        fixture.detectChanges();
-        let timeText: string = fixture.debugElement.query(By.css('#remainingTime')).nativeElement.innerHTML;
+        component.setDuration((9 * 60 + 59) * 1000 + 501); // 9 minutes 59 sec 501 ms
+        testUtils.detectChanges();
+        let timeText: string = testUtils.findElement('#remainingTime').nativeElement.innerText;
         expect(timeText).toBe('9:59');
         component.start();
 
         tick(401); // 9 min 59.501s -> 9 min 59.1 (9:59)
         component.pause();
-        fixture.detectChanges();
-        timeText = fixture.debugElement.query(By.css('#remainingTime')).nativeElement.innerHTML;
+        testUtils.detectChanges();
+        timeText = testUtils.findElement('#remainingTime').nativeElement.innerText;
         expect(timeText).toBe('9:59');
 
         component.resume();
         tick(200); // 9 min 59.1 -> 9 min 58.9 (9:58)
         component.pause();
-        fixture.detectChanges();
-        timeText = fixture.debugElement.query(By.css('#remainingTime')).nativeElement.innerHTML;
+        testUtils.detectChanges();
+        timeText = testUtils.findElement('#remainingTime').nativeElement.innerText;
         expect(timeText).toBe('9:58');
     }));
     it('should emit when timeout reached', fakeAsync(() => {
@@ -132,21 +129,44 @@ describe('CountDownComponent', () => {
         tick(1000);
         expect(component.outOfTimeAction.emit).toHaveBeenCalledOnceWith();
     }));
+    describe('Add Time Button', () => {
+        it('should offer opportunity to add time if allowed', fakeAsync(async() => {
+            // Given a CountDownComponent allowed to add time
+            component.canAddTime = true;
+            component.remainingMs = 60 * 1000;
+            testUtils.detectChanges();
+
+            // When clicking the add time button
+            spyOn(component.addTimeToOpponent, 'emit').and.callThrough();
+            await testUtils.clickElement('#addTimeButton');
+
+            // Then the component should have called addTimeToOpponent
+            expect(component.addTimeToOpponent.emit).toHaveBeenCalledOnceWith();
+        }));
+        it('should not display button when not allowed to add time', fakeAsync(async() => {
+            // Given a CountDownComponent not allowed to add time
+            component.canAddTime = false;
+            testUtils.detectChanges();
+
+            // Then the component should not have that button
+            testUtils.expectElementNotToExist('#addTimeButton');
+        }));
+    });
     describe('Style depending of remaining time', () => {
         it('Should be safe style when upper than limit', () => {
             component.dangerTimeLimit = 10 * 1000;
             component.setDuration(12 * 1000);
-            expect(component.getTimeClass()).toEqual(component.SAFE_TIME);
+            expect(component.getTimeClass()).toEqual(CountDownComponent.SAFE_TIME);
         });
         it('Should be first danger style when lower than limit and even remaining second', () => {
             component.dangerTimeLimit = 10 * 1000;
             component.setDuration(9 * 1000);
-            expect(component.getTimeClass()).toEqual(component.DANGER_TIME_EVEN);
+            expect(component.getTimeClass()).toEqual(CountDownComponent.DANGER_TIME_EVEN);
         });
         it('Should be second danger style when lower than limit and odd remaining second', () => {
             component.dangerTimeLimit = 10 * 1000;
             component.setDuration(8 * 1000);
-            expect(component.getTimeClass()).toEqual(component.DANGER_TIME_ODD);
+            expect(component.getTimeClass()).toEqual(CountDownComponent.DANGER_TIME_ODD);
         });
         it('Should be in passive style when passive', () => {
             // given a chrono that could be in danger time style
@@ -156,7 +176,7 @@ describe('CountDownComponent', () => {
             component.active = false;
 
             // then it should still be in passive style
-            expect(component.getTimeClass()).toEqual(component.PASSIVE_STYLE);
+            expect(component.getTimeClass()).toEqual(CountDownComponent.PASSIVE_STYLE);
         });
     });
 });