Merge branch 'main' into dependabot/npm_and_yarn/npm-development-3bf7…

…eacf52
karpikpl · Aug 25, 2024 · 8794de4 · 8794de4
2 parents 31ce604 + 19beba1
commit 8794de4
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 25 deletions.
diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -43,7 +43,7 @@ jobs:
           DEFAULT_BRANCH: main
           FILTER_REGEX_EXCLUDE: dist/**/*
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          TYPESCRIPT_DEFAULT_STYLE: prettier
+          VALIDATE_TYPESCRIPT_STANDARD: false
           VALIDATE_ALL_CODEBASE: true
           VALIDATE_JAVASCRIPT_STANDARD: false
           VALIDATE_JSCPD: false
diff --git a/__tests__/azdo.test.ts b/__tests__/azdo.test.ts
@@ -11,11 +11,12 @@ describe('Azure DevOps API tests', () => {
     jest.clearAllMocks()
 
     // mock fetch
-    global.fetch = jest.fn(async () =>
-      Promise.resolve({
-        json: async () => Promise.resolve(JSON.parse(adoResponse)),
-        status: 200
-      })
+    global.fetch = jest.fn(
+      async () =>
+        await Promise.resolve({
+          json: async () => await Promise.resolve(JSON.parse(adoResponse)),
+          status: 200
+        })
     ) as jest.Mock
   })
 
@@ -31,7 +32,7 @@ describe('Azure DevOps API tests', () => {
     )
 
     expect(fetch).toHaveBeenCalledWith(
-      `https://dev.azure.com/my-org/my-project/_apis/wit/workitemsbatch?api-version=7.1-preview.1`,
+      'https://dev.azure.com/my-org/my-project/_apis/wit/workitemsbatch?api-version=7.1-preview.1',
       expect.objectContaining({
         headers: expect.objectContaining({
           Authorization: `Basic ${expectedAuth}`
@@ -46,10 +47,11 @@ describe('Azure DevOps API tests', () => {
   })
 
   it('returns undefined on error', async () => {
-    global.fetch = jest.fn(async () =>
-      Promise.resolve({
-        status: 500
-      })
+    global.fetch = jest.fn(
+      async () =>
+        await Promise.resolve({
+          status: 500
+        })
     ) as jest.Mock
 
     const workItems = await getWorkItemsBatch(
@@ -63,8 +65,8 @@ describe('Azure DevOps API tests', () => {
   })
 
   it('returns undefined on catch error', async () => {
-    global.fetch = jest.fn(async () =>
-      Promise.reject(new Error('error'))
+    global.fetch = jest.fn(
+      async () => await Promise.reject(new Error('error'))
     ) as jest.Mock
 
     const workItems = await getWorkItemsBatch(

diff --git a/badges/coverage.svg b/badges/coverage.svg
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/src/azdo.ts b/src/azdo.ts
@@ -50,6 +50,5 @@ export async function getWorkItemsBatch(
     return workItems
   } catch (error) {
     core.error(`\u001b[48;2;255;0;0mError getting work items: ${error}`)
-    return
   }
 }
diff --git a/src/azdoTypes.ts b/src/azdoTypes.ts
@@ -1,13 +1,13 @@
 /** Response type for AzDO work item batch query.
  * see: https://learn.microsoft.com/en-us/rest/api/azure/devops/wit/work-items/get-work-items-batch?view=azure-devops-rest-7.1&tabs=HTTP
  */
-export type WorkItemsBatchResponse = {
+export interface WorkItemsBatchResponse {
   count: number
   value: WorkItem[]
 }
 
 /** Work item type */
-export type WorkItem = {
+export interface WorkItem {
   id: number
   url: string
   fields: {

diff --git a/src/main.ts b/src/main.ts
@@ -55,15 +55,15 @@ export async function run(): Promise<void> {
     core.info(`\u001b[35mWork item ids: ${workItemIds}`)
 
     if (workItemIds.length === 0) {
-      core.info(`\u001b[48;2;255;0;0mNo work items found in the release notes`)
+      core.info('\u001b[48;2;255;0;0mNo work items found in the release notes')
       core.setOutput('workItems', '')
       return
     }
 
     const workItems: WorkItemsBatchResponse | undefined =
       await getWorkItemsBatch(adoPat, adoOrg, adoProject, workItemIds)
 
-    if (!workItems) {
+    if (workItems == null) {
       core.setFailed('Failed to get work item details')
       return
     }
@@ -73,7 +73,7 @@ export async function run(): Promise<void> {
     for (const id of workItemIds) {
       const workItem = workItems.value.find(wi => wi.id === id)
 
-      if (workItem) {
+      if (workItem != null) {
         core.info(
           `\u001b[35mWork item ${id}: ${workItem.fields['System.WorkItemType']} ${workItem.fields['System.Title']} (${workItem.fields['System.State']})`
         )