gradle
diff --git a/‎.eslintrc.json‎
Lines changed: 2 additions & 0 deletions b/‎.eslintrc.json‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎build-scan-shared/__tests__/auth/auth.test.ts‎
Lines changed: 3 additions & 7 deletions b/‎build-scan-shared/__tests__/auth/auth.test.ts‎
Lines changed: 3 additions & 7 deletions
diff --git a/‎build-scan-shared/__tests__/buildTool/publish.test.ts‎
Lines changed: 60 additions & 63 deletions b/‎build-scan-shared/__tests__/buildTool/publish.test.ts‎
Lines changed: 60 additions & 63 deletions
diff --git a/‎build-scan-shared/__tests__/metadata/load.test.ts‎
Lines changed: 31 additions & 54 deletions b/‎build-scan-shared/__tests__/metadata/load.test.ts‎
Lines changed: 31 additions & 54 deletions
@@ -11,6 +11,8 @@
     "@typescript-eslint/no-floating-promises": "error",
     "eslint-comments/no-use": "off",
     "import/no-namespace": "off",
+    "import/no-unresolved": "off",
+    "import/named": "off",
     "i18n-text/no-en": "off",
     "no-unused-vars": "off",
     "no-shadow": "off",
 
@@ -1,20 +1,16 @@
+import {jest} from '@jest/globals'
 import nock from 'nock'
 
 import * as auth from '../../src/auth/auth'
 
 describe('auth', () => {
-    let restoreEnv: jest.ReplaceProperty<NodeJS.ProcessEnv>
-
     beforeEach(() => {
         // Remove access keys from environment not to interfere with test results.
-        const newEnv = {...process.env}
-        delete newEnv[auth.ENV_KEY_DEVELOCITY_ACCESS_KEY]
-        delete newEnv[auth.ENV_KEY_GRADLE_ENTERPRISE_ACCESS_KEY]
-        restoreEnv = jest.replaceProperty(process, 'env', newEnv)
+        process.env[auth.ENV_KEY_DEVELOCITY_ACCESS_KEY] = ''
+        process.env[auth.ENV_KEY_GRADLE_ENTERPRISE_ACCESS_KEY] = ''
     })
 
     afterEach(() => {
-        restoreEnv.restore()
         jest.clearAllMocks()
     })
 
 
@@ -1,34 +1,40 @@
-import * as glob from '@actions/glob'
-import * as exec from '@actions/exec'
+import {jest} from '@jest/globals'
 
-process.env['RUNNER_TEMP'] = '/tmp'
+const mockGlob = jest.fn<() => Promise<string[]>>()
+const mockCreate = jest.fn<(patterns: string, options?: object) => Promise<{glob: () => Promise<string[]>}>>()
+
+jest.unstable_mockModule('@actions/glob', () => ({
+    create: mockCreate
+}))
+
+function setupGlob(matchedFiles: string[]): void {
+    mockGlob.mockResolvedValue(matchedFiles)
+    mockCreate.mockResolvedValue({glob: mockGlob})
+}
+
+const mockExecOutput = jest.fn<() => Promise<object>>()
+
+jest.unstable_mockModule('@actions/exec', () => ({
+    getExecOutput: mockExecOutput
+}))
+
+jest.unstable_mockModule('../../src/utils/io', () => ({
+    existsSync: jest.fn().mockReturnValue(true),
+    writeContentToFileSync: jest.fn()
+}))
 
-import * as github from '@actions/github'
-import * as maven from '../../src/buildTool/maven'
-import * as io from '../../src/utils/io'
+process.env['RUNNER_TEMP'] = '/tmp'
 
-const buildTool = maven.mavenBuildTool
+const {mavenBuildTool} = await import('../../src/buildTool/maven')
 
 describe('publish', () => {
-    let execMock: any
     let createPublisherProjectMock: any
     let createPluginDescriptorMock: any
 
     beforeEach(() => {
-        Object.defineProperty(github, 'context', {
-            value: {
-                repo: {
-                    owner: 'foo',
-                    repo: 'bar'
-                },
-                issue: {
-                    number: 42
-                }
-            }
-        })
-        createPublisherProjectMock = jest.spyOn(buildTool, 'createPublisherProjectStructure').mockReturnValue()
+        createPublisherProjectMock = jest.spyOn(mavenBuildTool, 'createPublisherProjectStructure').mockReturnValue()
         createPluginDescriptorMock = jest
-            .spyOn(buildTool, 'createPluginDescriptorFileWithCurrentVersion')
+            .spyOn(mavenBuildTool, 'createPluginDescriptorFileWithCurrentVersion')
             .mockReturnValue()
     })
 
@@ -38,78 +44,69 @@ describe('publish', () => {
 
     it('Publish build scan succeeds', async () => {
         // given
-        jest.spyOn(io, 'existsSync').mockReturnValue(true)
-        execMock = jest
-            .spyOn(exec, 'getExecOutput')
+        mockExecOutput
             .mockReturnValueOnce(Promise.resolve({stderr: '', exitCode: 0, stdout: 'Java 1.0'}))
             .mockReturnValueOnce(Promise.resolve({stderr: '', exitCode: 0, stdout: 'Maven 1.0'}))
             .mockReturnValueOnce(Promise.resolve({stderr: '', exitCode: 0, stdout: 'Build Successful'}))
             .mockReturnValueOnce(Promise.resolve({stderr: '', exitCode: 0, stdout: 'Build Successful'}))
-        jest.spyOn(glob, 'create').mockReturnValue(
-            Promise.resolve({
-                // @ts-ignore
-                glob() {
-                    return [
-                        '/home/foo/.m2/build-scan-data/1.42/previous/abcdef/scan.scan',
-                        '/home/foo/.m2/build-scan-data/1.42/previous/ghijkl/scan.scan'
-                    ]
-                }
-            })
-        )
+        setupGlob([
+            '/home/foo/.m2/build-scan-data/1.42/previous/abcdef/scan.scan',
+            '/home/foo/.m2/build-scan-data/1.42/previous/ghijkl/scan.scan'
+        ])
 
         // when
-        await buildTool.buildScanPublish()
+        await mavenBuildTool.buildScanPublish()
 
         // then
         expect(createPublisherProjectMock).toHaveBeenCalledTimes(1)
         expect(createPluginDescriptorMock).toHaveBeenCalledTimes(2)
-        expect(execMock).toHaveBeenCalledTimes(4)
+        expect(mockExecOutput).toHaveBeenCalledTimes(4)
     })
 
-    it('Publish build scan does nothing when java command fails', async () => {
+    it('Publish build scan throws an error when java command fails', async () => {
         // given
-        execMock = jest
-            .spyOn(exec, 'getExecOutput')
-            .mockReturnValueOnce(Promise.resolve({stderr: 'java not found', exitCode: 1, stdout: ''}))
+        mockExecOutput.mockReturnValueOnce(Promise.resolve({stderr: 'java not found', exitCode: 1, stdout: ''}))
+        setupGlob([
+            '/home/foo/.m2/build-scan-data/1.42/previous/abcdef/scan.scan',
+            '/home/foo/.m2/build-scan-data/1.42/previous/ghijkl/scan.scan'
+        ])
 
         // when / then
-        await expect(async () => buildTool.buildScanPublish()).rejects.toThrow(Error)
+        await expect(async () => mavenBuildTool.buildScanPublish()).rejects.toThrow(Error)
     })
 
-    it('Publish build scan does nothing when maven version command fails', async () => {
+    it('Publish build scan throws an error when maven version command fails', async () => {
         // given
-        execMock = jest
-            .spyOn(exec, 'getExecOutput')
+        mockExecOutput
             .mockReturnValueOnce(Promise.resolve({stderr: '', exitCode: 0, stdout: 'Java 1.0'}))
             .mockReturnValueOnce(Promise.resolve({stderr: 'mvn not found', exitCode: 1, stdout: ''}))
+        setupGlob([
+            '/home/foo/.m2/build-scan-data/1.42/previous/abcdef/scan.scan',
+            '/home/foo/.m2/build-scan-data/1.42/previous/ghijkl/scan.scan'
+        ])
 
         // when / then
-        await expect(async () => buildTool.buildScanPublish()).rejects.toThrow(Error)
+        await expect(async () => mavenBuildTool.buildScanPublish()).rejects.toThrow(Error)
     })
 
-    it('Publish build scan does nothing when maven publish command fails', async () => {
+    it('Publish build scan succeeds when maven publish command fails', async () => {
         // given
-        execMock = jest
-            .spyOn(exec, 'getExecOutput')
+        mockExecOutput
             .mockReturnValueOnce(Promise.resolve({stderr: '', exitCode: 0, stdout: 'Java 1.0'}))
             .mockReturnValueOnce(Promise.resolve({stderr: '', exitCode: 0, stdout: 'Maven 1.0'}))
             .mockReturnValueOnce(Promise.resolve({stderr: 'mvn publication failed', exitCode: 1, stdout: ''}))
             .mockReturnValueOnce(Promise.resolve({stderr: '', exitCode: 0, stdout: 'Build Scan published'}))
-
-        // @ts-ignore
-        jest.spyOn(glob, 'create').mockReturnValue(
-            Promise.resolve({
-                // @ts-ignore
-                glob() {
-                    return [
-                        '/home/foo/.m2/build-scan-data/1.42/previous/abcdef/scan.scan',
-                        '/home/foo/.m2/build-scan-data/1.42/previous/ghijkl/scan.scan'
-                    ]
-                }
-            })
-        )
+        setupGlob([
+            '/home/foo/.m2/build-scan-data/1.42/previous/abcdef/scan.scan',
+            '/home/foo/.m2/build-scan-data/1.42/previous/ghijkl/scan.scan'
+        ])
 
         // when / then
-        await buildTool.buildScanPublish()
+        await mavenBuildTool.buildScanPublish()
+
+        // then
+        expect(createPublisherProjectMock).toHaveBeenCalledTimes(1)
+        expect(createPluginDescriptorMock).toHaveBeenCalledTimes(2)
+        expect(mockExecOutput).toHaveBeenCalledTimes(4)
     })
 })
@@ -1,83 +1,60 @@
-import * as glob from '@actions/glob'
-import * as PropertiesReader from 'properties-reader'
+import {jest} from '@jest/globals'
 
-import * as load from '../../src/metadata/load'
-import * as props from '../../src/metadata/properties'
-import {BuildToolType} from '../../src/buildTool/common'
+const mockGlob = jest.fn<() => Promise<string[]>>()
+const mockCreate = jest.fn<(patterns: string, options?: object) => Promise<{glob: () => Promise<string[]>}>>()
 
-const loadMock = jest.spyOn(load, 'loadJobMetadata')
+jest.unstable_mockModule('@actions/glob', () => ({
+    create: mockCreate
+}))
+
+function setupGlob(matchedFiles: string[]): void {
+    mockGlob.mockResolvedValue(matchedFiles)
+    mockCreate.mockResolvedValue({glob: mockGlob})
+}
 
 const mockedPrNumber = 4242
 
-describe('load', () => {
-    let octokit: any
+const mockReader = {
+    get(): string {
+        return mockedPrNumber.toString()
+    }
+}
 
-    beforeEach(() => {
-        // @ts-ignore
-        jest.spyOn(glob, 'create').mockReturnValue(
-            Promise.resolve({
-                // @ts-ignore
-                glob() {
-                    return ['prNumberFilePath']
-                }
-            })
-        )
-    })
+jest.unstable_mockModule('properties-reader', () => ({
+    default: jest.fn(() => mockReader)
+}))
 
+const {loadJobMetadata} = await import('../../src/metadata/load')
+const {BuildToolType} = await import('../../src/buildTool/common')
+
+describe('load', () => {
     afterEach(() => {
-        jest.clearAllMocks()
+        jest.resetAllMocks()
     })
 
     it('Load build scan metadata succeeds', async () => {
         // given
-        jest.spyOn(glob, 'create').mockReturnValue(
-            Promise.resolve({
-                // @ts-ignore
-                glob() {
-                    return [
-                        '/home/foo/.m2/build-scan-data/1.42/previous/abcdef/scan.scan',
-                        '/home/foo/.m2/build-scan-data/1.42/previous/ghijkl/scan.scan'
-                    ]
-                }
-            })
-        )
-        const reader: Partial<PropertiesReader.Reader> = {
-            get(key: string) {
-                switch (key) {
-                    case 'PR_NUMBER':
-                        return mockedPrNumber
-                    default:
-                        return `value for ${key}`
-                }
-            }
-        }
-        jest.spyOn(props, 'create').mockImplementation(_ => reader)
+        setupGlob([
+            '/home/foo/.m2/build-scan-data/1.42/previous/abcdef/scan.scan',
+            '/home/foo/.m2/build-scan-data/1.42/previous/ghijkl/scan.scan'
+        ])
 
         // when
-        const buildScanData = await load.loadJobMetadata(BuildToolType.MAVEN, 'buildScanMetadataDir')
+        const buildScanData = await loadJobMetadata(BuildToolType.MAVEN, 'buildScanMetadataDir')
 
         // then
-        expect(loadMock).toHaveReturned()
         expect(buildScanData?.builds).toHaveLength(2)
         expect(buildScanData?.prNumber).toBe(mockedPrNumber)
     })
 
     it('Load build scan metadata does nothing without metadata file', async () => {
         // given
-        jest.spyOn(glob, 'create').mockReturnValue(
-            Promise.resolve({
-                // @ts-ignore
-                glob() {
-                    return []
-                }
-            })
-        )
+        setupGlob([])
 
         // when
-        const buildScanData = await load.loadJobMetadata(BuildToolType.MAVEN, 'buildScanMetadataDir')
+        const buildScanData = await loadJobMetadata(BuildToolType.MAVEN, 'buildScanMetadataDir')
 
         // then
-        expect(loadMock).toHaveReturned()
         expect(buildScanData?.builds).toBeUndefined()
         expect(buildScanData?.prNumber).toBeUndefined()
     })