aboutsummaryrefslogtreecommitdiff
path: root/Timeline/ClientApp/src
diff options
context:
space:
mode:
author杨宇千 <crupest@outlook.com>2019-02-21 16:32:16 +0000
committer杨宇千 <crupest@outlook.com>2019-02-21 16:32:16 +0000
commit9ae2a899eb53b8ee31710a5533cdf21b0f14dafd (patch)
tree8f22c966d15d928a5587385f38b5284f0691b2de /Timeline/ClientApp/src
parent35f8562f1f1db36a42c53ce42c39db3d615deb0f (diff)
parent504d770e51a07ca7765de725979412b6dacdcf15 (diff)
downloadtimeline-9ae2a899eb53b8ee31710a5533cdf21b0f14dafd.tar.gz
timeline-9ae2a899eb53b8ee31710a5533cdf21b0f14dafd.tar.bz2
timeline-9ae2a899eb53b8ee31710a5533cdf21b0f14dafd.zip
Merged PR 3: Add unit test for front side.
Related work items: #1
Diffstat (limited to 'Timeline/ClientApp/src')
-rw-r--r--Timeline/ClientApp/src/app/home/home.component.spec.ts5
-rw-r--r--Timeline/ClientApp/src/app/home/home.component.ts13
-rw-r--r--Timeline/ClientApp/src/app/todo-list-page/todo-list-page.component.spec.ts46
-rw-r--r--Timeline/ClientApp/src/app/todo-list-page/todo-list.service.spec.ts71
-rw-r--r--Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts40
-rw-r--r--Timeline/ClientApp/src/karma.conf.js1
-rw-r--r--Timeline/ClientApp/src/test.ts2
7 files changed, 138 insertions, 40 deletions
diff --git a/Timeline/ClientApp/src/app/home/home.component.spec.ts b/Timeline/ClientApp/src/app/home/home.component.spec.ts
index 490e81bd..74bedd08 100644
--- a/Timeline/ClientApp/src/app/home/home.component.spec.ts
+++ b/Timeline/ClientApp/src/app/home/home.component.spec.ts
@@ -2,15 +2,16 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { HomeComponent } from './home.component';
+
describe('HomeComponent', () => {
let component: HomeComponent;
let fixture: ComponentFixture<HomeComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
- declarations: [ HomeComponent ]
+ declarations: [HomeComponent],
})
- .compileComponents();
+ .compileComponents();
}));
beforeEach(() => {
diff --git a/Timeline/ClientApp/src/app/home/home.component.ts b/Timeline/ClientApp/src/app/home/home.component.ts
index 873aee7f..2b16eef7 100644
--- a/Timeline/ClientApp/src/app/home/home.component.ts
+++ b/Timeline/ClientApp/src/app/home/home.component.ts
@@ -1,10 +1,4 @@
import { Component, OnInit } from '@angular/core';
-import { HttpClient } from '@angular/common/http';
-
-class LoginInfo {
- username = '';
- password = '';
-}
@Component({
selector: 'app-home',
@@ -13,15 +7,8 @@ class LoginInfo {
})
export class HomeComponent implements OnInit {
- loginInfo = new LoginInfo();
message = '';
- constructor(/* private http: HttpClient */) { }
-
ngOnInit() {
}
-
- tryLogin() {
- alert('Not implemented!!!');
- }
}
diff --git a/Timeline/ClientApp/src/app/todo-list-page/todo-list-page.component.spec.ts b/Timeline/ClientApp/src/app/todo-list-page/todo-list-page.component.spec.ts
index a74ce3e6..7fc4164d 100644
--- a/Timeline/ClientApp/src/app/todo-list-page/todo-list-page.component.spec.ts
+++ b/Timeline/ClientApp/src/app/todo-list-page/todo-list-page.component.spec.ts
@@ -1,16 +1,45 @@
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { Component, NO_ERRORS_SCHEMA } from '@angular/core';
+import { async, ComponentFixture, TestBed, tick } from '@angular/core/testing';
+
+import { defer, Observable } from 'rxjs';
import { TodoListPageComponent } from './todo-list-page.component';
+import { TodoListService, WorkItem } from './todo-list.service';
+import { By } from '@angular/platform-browser';
+
+@Component({
+ selector: 'mat-progress-bar',
+ template: ''
+})
+class MatProgressBarStubComponent {
+
+}
+
+function asyncData<T>(data: T): Observable<T> {
+ return defer(() => Promise.resolve(data));
+}
describe('TodoListPageComponent', () => {
let component: TodoListPageComponent;
let fixture: ComponentFixture<TodoListPageComponent>;
beforeEach(async(() => {
+ const todoListService: jasmine.SpyObj<TodoListService> = jasmine.createSpyObj('TodoListService', ['getWorkItemList']);
+
+ todoListService.getWorkItemList.and.returnValue(asyncData(<WorkItem[]>[{
+ id: 0, title: 'Test title 1', closed: true
+ }, {
+ id: 1, title: 'Test title 2', closed: false
+ }]));
+
TestBed.configureTestingModule({
- declarations: [ TodoListPageComponent ]
+ declarations: [TodoListPageComponent, MatProgressBarStubComponent],
+ providers: [
+ { provide: TodoListService, useValue: todoListService }
+ ],
+ schemas: [NO_ERRORS_SCHEMA]
})
- .compileComponents();
+ .compileComponents();
}));
beforeEach(() => {
@@ -22,4 +51,15 @@ describe('TodoListPageComponent', () => {
it('should create', () => {
expect(component).toBeTruthy();
});
+
+ it('should show progress bar during loading', () => {
+ expect(fixture.debugElement.query(By.css('mat-progress-bar'))).toBeTruthy();
+ });
+
+ it('should hide progress bar after loading', async(() => {
+ fixture.whenStable().then(() => {
+ fixture.detectChanges();
+ expect(fixture.debugElement.query(By.css('mat-progress-bar'))).toBeFalsy();
+ });
+ }));
});
diff --git a/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.spec.ts b/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.spec.ts
index 529ba8cc..7e88ca52 100644
--- a/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.spec.ts
+++ b/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.spec.ts
@@ -1,12 +1,79 @@
import { TestBed } from '@angular/core/testing';
+import { HttpClientTestingModule, HttpTestingController } from '@angular/common/http/testing';
+
+import { TodoListService, WorkItem, AzureDevOpsAccessInfo, WiqlResult, WiqlWorkItemResult, WorkItemResult } from './todo-list.service';
-import { TodoListService } from './todo-list.service';
describe('TodoListServiceService', () => {
- beforeEach(() => TestBed.configureTestingModule({}));
+ beforeEach(() => TestBed.configureTestingModule({
+ imports: [HttpClientTestingModule]
+ }));
it('should be created', () => {
+
+ const service: TodoListService = TestBed.get(TodoListService);
+ expect(service).toBeTruthy();
+ });
+
+ it('should work well', () => {
const service: TodoListService = TestBed.get(TodoListService);
expect(service).toBeTruthy();
+
+ const mockWorkItems: WorkItem[] = [{
+ id: 0,
+ title: 'Test work item 1',
+ closed: true
+ }, {
+ id: 1,
+ title: 'Test work item 2',
+ closed: false
+ }];
+
+ service.getWorkItemList().subscribe(data => {
+ expect(data).toEqual(mockWorkItems);
+ });
+
+ const httpController: HttpTestingController = TestBed.get(HttpTestingController);
+
+ const mockAccessInfo: AzureDevOpsAccessInfo = {
+ username: 'testusername',
+ personalAccessToken: 'testtoken',
+ organization: 'testorganization',
+ project: 'testproject'
+ };
+
+ httpController.expectOne('/api/TodoPage/AzureDevOpsAccessInfo').flush(mockAccessInfo);
+
+ const mockWiqlWorkItems: WiqlWorkItemResult[] = [{
+ id: 0,
+ url: `https://dev.azure.com/${mockAccessInfo.organization}/${mockAccessInfo.project}/_apis/wit/workItems/0`
+ }, {
+ id: 1,
+ url: `https://dev.azure.com/${mockAccessInfo.organization}/${mockAccessInfo.project}/_apis/wit/workItems/1`
+ }];
+
+ const authorizationHeader = 'Basic ' + btoa(mockAccessInfo.username + ':' + mockAccessInfo.personalAccessToken);
+
+ httpController.expectOne(req =>
+ req.url === `https://dev.azure.com/${mockAccessInfo.organization}/${mockAccessInfo.project}/_apis/wit/wiql?api-version=5.0` &&
+ req.headers.get('Authorization') === authorizationHeader
+ ).flush(<WiqlResult>{ workItems: mockWiqlWorkItems });
+
+ function mapWorkItemToResult(workItem: WorkItem): WorkItemResult {
+ return {
+ id: workItem.id,
+ fields: {
+ [TodoListService.titleFieldName]: workItem.title,
+ [TodoListService.stateFieldName]: (workItem.closed ? 'Closed' : 'Active')
+ }
+ };
+ }
+
+ for (let i = 0; i < mockWorkItems.length; i++) {
+ httpController.expectOne(req =>
+ req.url === mockWiqlWorkItems[i].url &&
+ req.headers.get('Authorization') === authorizationHeader
+ ).flush(mapWorkItemToResult(mockWorkItems[i]));
+ }
});
});
diff --git a/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts b/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts
index 0b54653b..619e9a6b 100644
--- a/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts
+++ b/Timeline/ClientApp/src/app/todo-list-page/todo-list.service.ts
@@ -3,20 +3,28 @@ import { HttpClient, HttpHeaders } from '@angular/common/http';
import { Observable } from 'rxjs';
import { switchMap, concatMap, map, toArray } from 'rxjs/operators';
-interface WiqlWorkItemResult {
+export interface AzureDevOpsAccessInfo {
+ username: string;
+ personalAccessToken: string;
+ organization: string;
+ project: string;
+}
+
+export interface WiqlWorkItemResult {
id: number;
url: string;
}
-interface WiqlResult {
+export interface WiqlResult {
workItems: WiqlWorkItemResult[];
}
-interface WorkItemResult {
+export interface WorkItemResult {
id: number;
fields: { [name: string]: any };
}
+
export interface WorkItem {
id: number;
title: string;
@@ -28,41 +36,33 @@ export interface WorkItem {
})
export class TodoListService {
- private username = 'crupest';
- private organization = 'crupest-web';
- private project = 'Timeline';
- private titleFieldName = 'System.Title';
- private stateFieldName = 'System.State';
+ public static titleFieldName = 'System.Title';
+ public static stateFieldName = 'System.State';
constructor(private client: HttpClient) { }
- private getAzureDevOpsPat(): Observable<string> {
- return this.client.get('/api/TodoList/AzureDevOpsPat', {
- headers: {
- 'Accept': 'text/plain'
- },
- responseType: 'text'
- });
+ private getAzureDevOpsPat(): Observable<AzureDevOpsAccessInfo> {
+ return this.client.get<AzureDevOpsAccessInfo>('/api/TodoPage/AzureDevOpsAccessInfo');
}
getWorkItemList(): Observable<WorkItem[]> {
return this.getAzureDevOpsPat().pipe(
switchMap(
- pat => {
+ accessInfo => {
const headers = new HttpHeaders({
'Accept': 'application/json',
- 'Authorization': `Basic ${btoa(this.username + ':' + pat)}`
+ 'Authorization': `Basic ${btoa(accessInfo.username + ':' + accessInfo.personalAccessToken)}`
});
return this.client.post<WiqlResult>(
- `https://dev.azure.com/${this.organization}/${this.project}/_apis/wit/wiql?api-version=5.0`, {
+ `https://dev.azure.com/${accessInfo.organization}/${accessInfo.project}/_apis/wit/wiql?api-version=5.0`, {
query: 'SELECT [System.Id] FROM workitems WHERE [System.TeamProject] = @project'
}, { headers: headers }).pipe(
switchMap(result => result.workItems),
concatMap(result => this.client.get<WorkItemResult>(result.url, { headers: headers })),
map(result => <WorkItem>{
id: result.id,
- title: <string>result.fields[this.titleFieldName],
- closed: ((<string>result.fields[this.stateFieldName]).toLowerCase() === 'closed')
+ title: <string>result.fields[TodoListService.titleFieldName],
+ closed: ((<string>result.fields[TodoListService.stateFieldName]).toLowerCase() === 'closed')
}),
toArray()
);
diff --git a/Timeline/ClientApp/src/karma.conf.js b/Timeline/ClientApp/src/karma.conf.js
index 4a9730b9..775e624c 100644
--- a/Timeline/ClientApp/src/karma.conf.js
+++ b/Timeline/ClientApp/src/karma.conf.js
@@ -10,6 +10,7 @@ module.exports = function (config) {
require('karma-chrome-launcher'),
require('karma-jasmine-html-reporter'),
require('karma-coverage-istanbul-reporter'),
+ require('karma-junit-reporter'),
require('@angular-devkit/build-angular/plugins/karma')
],
client: {
diff --git a/Timeline/ClientApp/src/test.ts b/Timeline/ClientApp/src/test.ts
index 16317897..2513deed 100644
--- a/Timeline/ClientApp/src/test.ts
+++ b/Timeline/ClientApp/src/test.ts
@@ -1,6 +1,8 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files
+import 'zone.js/dist/zone-patch-rxjs-fake-async';
import 'zone.js/dist/zone-testing';
+
import { getTestBed } from '@angular/core/testing';
import {
BrowserDynamicTestingModule,