AddTimeToOpponent (clean)

coverage/branches.csv

@@ -1,26 +1,25 @@
-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
-Minimax.ts,1
-online-game-wrapper.component.ts,11
-ObjectUtils.ts,3
-part-creation.component.ts,3
-Player.ts,1
-PylosState.ts,1
-PositionalEpaminondasMinimax.ts,1
-QuartoHasher.ts,1
-QuartoRules.ts,3
-Rules.ts,1
-SixMinimax.ts,6
-SiamPiece.ts,1
+AwaleMinimax.ts,2
+AwaleRules.ts,2
+AttackEpaminondasMinimax.ts,1
+ActivesPartsService.ts,4
+ActivesUsersService.ts,1
+AuthenticationService.ts,1
+count-down.component.ts,1
+CoerceoPiecesThreatTilesMinimax.ts,3
+Coord.ts,1
+GameWrapper.ts,1
+GoGroupsDatas.ts,5
+HexagonalGameState.ts,3
+LinesOfActionRules.ts,1
+MGPNode.ts,1
+Minimax.ts,1
+online-game-wrapper.component.ts,11
+ObjectUtils.ts,3
+part-creation.component.ts,3
+PositionalEpaminondasMinimax.ts,1
+PylosState.ts,1
+Player.ts,1
+QuartoHasher.ts,1
+QuartoRules.ts,3
+SiamPiece.ts,1
+SixMinimax.ts,6

coverage/functions.csv

@@ -1,11 +1,11 @@
-AuthenticationService.ts,2
-ActivesPartsService.ts,5
-ActivesUsersService.ts,3
-Minimax.ts,1
-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,5
+ActivesUsersService.ts,3
+AuthenticationService.ts,2
+Minimax.ts,1
+NodeUnheritance.ts,1
+online-game-wrapper.component.ts,1
+PylosState.ts,1
+PieceThreat.ts,1
+QuartoRules.ts,1
+server-page.component.ts,1
+SixMinimax.ts,3

coverage/lines.csv

@@ -1,25 +1,24 @@
-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
-Minimax.ts,2
-NodeUnheritance.ts,1
-online-game-wrapper.component.ts,9
-ObjectUtils.ts,2
-part-creation.component.ts,6
-PieceThreat.ts,1
-Player.ts,2
-PylosState.ts,1
-PositionalEpaminondasMinimax.ts,1
-QuartoHasher.ts,1
-QuartoRules.ts,5
-Rules.ts,1
-server-page.component.ts,1
-SixMinimax.ts,13
-SiamPiece.ts,1
+AwaleRules.ts,1
+ActivesPartsService.ts,13
+ActivesUsersService.ts,3
+AuthenticationService.ts,3
+CoerceoPiecesThreatTilesMinimax.ts,1
+GameWrapper.ts,1
+GoGroupsDatas.ts,4
+HexagonalGameState.ts,6
+LinesOfActionRules.ts,1
+MGPNode.ts,1
+Minimax.ts,2
+NodeUnheritance.ts,1
+online-game-wrapper.component.ts,9
+ObjectUtils.ts,2
+part-creation.component.ts,6
+PositionalEpaminondasMinimax.ts,1
+PylosState.ts,1
+PieceThreat.ts,1
+Player.ts,2
+QuartoHasher.ts,1
+QuartoRules.ts,5
+server-page.component.ts,1
+SiamPiece.ts,1
+SixMinimax.ts,13

coverage/statements.csv

@@ -1,26 +1,25 @@
-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
-Minimax.ts,2
-NodeUnheritance.ts,1
-online-game-wrapper.component.ts,9
-ObjectUtils.ts,2
-part-creation.component.ts,6
-PieceThreat.ts,1
-Player.ts,2
-PylosState.ts,2
-PositionalEpaminondasMinimax.ts,1
-QuartoHasher.ts,1
-QuartoRules.ts,5
-Rules.ts,1
-server-page.component.ts,1
-SixMinimax.ts,13
-SiamPiece.ts,1
+AwaleRules.ts,1
+ActivesPartsService.ts,15
+ActivesUsersService.ts,5
+AuthenticationService.ts,3
+CoerceoPiecesThreatTilesMinimax.ts,1
+Coord.ts,1
+GameWrapper.ts,1
+GoGroupsDatas.ts,4
+HexagonalGameState.ts,6
+LinesOfActionRules.ts,1
+MGPNode.ts,1
+Minimax.ts,2
+NodeUnheritance.ts,1
+online-game-wrapper.component.ts,9
+ObjectUtils.ts,2
+part-creation.component.ts,6
+PositionalEpaminondasMinimax.ts,1
+PylosState.ts,2
+PieceThreat.ts,1
+Player.ts,2
+QuartoHasher.ts,1
+QuartoRules.ts,5
+server-page.component.ts,1
+SiamPiece.ts,1
+SixMinimax.ts,13

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

@@ -1,4 +1,14 @@
-<div>
+<div class="tile"
+     [ngStyle]="getBackgroundColor()"
+>
     <p id="remainingTime"
+       class="remainingTimeText"
+       style="margin: auto; width: 67%"
        [ngStyle]="getTimeStyle()">{{ displayedMinute }}:{{ displayedSec | number:'2.0-0' }}</p>
-</div>
+    <button id="addTimeButton"
+            class="button is-small remainingTimeButton"
+            [ngStyle]="getBackgroundColor()"
+            *ngIf="canAddTime"
+            (click)="addTime()"
+            i18n> + </button>
+</div>

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

@@ -1,21 +1,17 @@
 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();
@@ -40,14 +36,15 @@ describe('CountDownComponent', () => {
         });
         it('should show remaining time once set', () => {
             component.setDuration(62000);
-            fixture.detectChanges();
-            const element: DebugElement = fixture.debugElement.query(By.css('#remainingTime'));
+            testUtils.detectChanges();
+            const element: DebugElement = testUtils.findElement('#remainingTime');
             const timeText: string = element.nativeElement.innerHTML;
             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!');
         });
@@ -92,34 +89,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.innerHTML;
         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.innerHTML;
         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;
+        testUtils.detectChanges();
+        let timeText: string = testUtils.findElement('#remainingTime').nativeElement.innerHTML;
         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.innerHTML;
         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.innerHTML;
         expect(timeText).toBe('9:58');
     }));
     it('should emit when timeout reached', fakeAsync(() => {
@@ -131,21 +128,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, with 1 minute remaining
+            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');
+
+            // 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();
+
+            // 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.getTimeStyle()).toEqual(component.SAFE_TIME);
+            expect(component.getTimeStyle()).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.getTimeStyle()).toEqual(component.DANGER_TIME_EVEN);
+            expect(component.getTimeStyle()).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.getTimeStyle()).toEqual(component.DANGER_TIME_ODD);
+            expect(component.getTimeStyle()).toEqual(CountDownComponent.DANGER_TIME_ODD);
         });
         it('Should be in passive style when passive', () => {
             // given a chrono that could be in danger time style
@@ -155,7 +175,7 @@ describe('CountDownComponent', () => {
             component.active = false;
 
             // then it should still be in passive style
-            expect(component.getTimeStyle()).toEqual(component.PASSIVE_STYLE);
+            expect(component.getTimeStyle()).toEqual(CountDownComponent.PASSIVE_STYLE);
         });
     });
 });