From 94373feca1b1072bd7dcea52df91d0627a8eb6b5 Mon Sep 17 00:00:00 2001 From: Andre Wanlin Date: Fri, 17 Sep 2021 16:31:51 -0500 Subject: [PATCH] Type fixes Signed-off-by: Andre Wanlin --- plugins/azure-devops-backend/src/api/types.ts | 13 +++++++++---- .../azure-devops-backend/src/service/router.test.ts | 12 ++++++------ 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/plugins/azure-devops-backend/src/api/types.ts b/plugins/azure-devops-backend/src/api/types.ts index 06068953ef..35d4e38ae1 100644 --- a/plugins/azure-devops-backend/src/api/types.ts +++ b/plugins/azure-devops-backend/src/api/types.ts @@ -14,12 +14,17 @@ * limitations under the License. */ +import { + BuildResult, + BuildStatus, +} from 'azure-devops-node-api/interfaces/BuildInterfaces'; + export type RepoBuild = { - id: number; + id?: number; title: string; link: string; - status: string; - result: string; - queueTime: Date; + status?: BuildStatus; + result?: BuildResult; + queueTime?: Date; source: string; }; diff --git a/plugins/azure-devops-backend/src/service/router.test.ts b/plugins/azure-devops-backend/src/service/router.test.ts index b8b888e41c..56693bccbd 100644 --- a/plugins/azure-devops-backend/src/service/router.test.ts +++ b/plugins/azure-devops-backend/src/service/router.test.ts @@ -149,8 +149,8 @@ describe('createRouter', () => { id: 1, title: 'My Build Definition - Build 1', link: 'https://host.com/myOrg/0bcc0c0d-2d02/_build/results?buildId=1', - status: 'completed', - result: 'partiallySucceeded', + status: BuildStatus.Completed, + result: BuildResult.PartiallySucceeded, queueTime: '2020-09-12T06:10:23.9325232Z' as unknown as Date, source: 'refs/heads/develop (f4f78b31)', }; @@ -159,8 +159,8 @@ describe('createRouter', () => { id: 2, title: 'My Build Definition - Build 2', link: 'https://host.com/myOrg/0bcc0c0d-2d02/_build/results?buildId=2', - status: 'inProgress', - result: 'none', + status: BuildStatus.InProgress, + result: BuildResult.None, queueTime: '2020-09-12T06:20:23.9325232Z' as unknown as Date, source: 'refs/heads/develop (13c988d4)', }; @@ -169,8 +169,8 @@ describe('createRouter', () => { id: 3, title: 'My Build Definition - Build 3', link: 'https://host.com/myOrg/0bcc0c0d-2d02/_build/results?buildId=3', - status: 'completed', - result: 'succeeded', + status: BuildStatus.Completed, + result: BuildResult.Succeeded, queueTime: '2020-09-12T06:30:23.9325232Z' as unknown as Date, source: 'refs/heads/develop (9bedf678)', };