From f1ac6cbe326b5b3066cc6a0c1fc7901104e79188 Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Mon, 6 Jan 2025 09:38:59 -0500 Subject: [PATCH] chore: Clean-up missing imports for tests Noticed we had missing imports here, fixes them. --- sources/test/jest/cache-cleanup.test.ts | 1 + sources/test/jest/cache-debug.test.ts | 1 + sources/test/jest/cache-reporting.test.ts | 1 + sources/test/jest/cache-utils.test.ts | 1 + sources/test/jest/configuration.test.ts | 1 + sources/test/jest/gradle-version.test.ts | 3 ++- sources/test/jest/job-summary.test.ts | 1 + sources/test/jest/predefined-toolchains.test.ts | 1 + sources/test/jest/short-lived-token.test.ts | 1 + sources/test/jest/wrapper-validation/validate.test.ts | 1 - 10 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sources/test/jest/cache-cleanup.test.ts b/sources/test/jest/cache-cleanup.test.ts index 7a8f335..d1a192f 100644 --- a/sources/test/jest/cache-cleanup.test.ts +++ b/sources/test/jest/cache-cleanup.test.ts @@ -4,6 +4,7 @@ import * as glob from '@actions/glob' import fs from 'fs' import path from 'path' import {CacheCleaner} from '../../src/caching/cache-cleaner' +import {expect, test, jest} from '@jest/globals' jest.setTimeout(120000) diff --git a/sources/test/jest/cache-debug.test.ts b/sources/test/jest/cache-debug.test.ts index 141d51b..85895cf 100644 --- a/sources/test/jest/cache-debug.test.ts +++ b/sources/test/jest/cache-debug.test.ts @@ -2,6 +2,7 @@ import * as path from 'path' import * as fs from 'fs' import {GradleUserHomeCache} from "../../src/caching/gradle-user-home-cache" import {CacheConfig} from "../../src/configuration" +import {describe, expect} from '@jest/globals' const testTmp = 'test/jest/tmp' fs.rmSync(testTmp, {recursive: true, force: true}) diff --git a/sources/test/jest/cache-reporting.test.ts b/sources/test/jest/cache-reporting.test.ts index 7a3c307..fd891bd 100644 --- a/sources/test/jest/cache-reporting.test.ts +++ b/sources/test/jest/cache-reporting.test.ts @@ -1,5 +1,6 @@ import exp from 'constants' import {CacheEntryListener, CacheListener} from '../../src/caching/cache-reporting' +import {describe, expect} from '@jest/globals' describe('caching report', () => { describe('reports not fully restored', () => { diff --git a/sources/test/jest/cache-utils.test.ts b/sources/test/jest/cache-utils.test.ts index ac6fb10..4819c30 100644 --- a/sources/test/jest/cache-utils.test.ts +++ b/sources/test/jest/cache-utils.test.ts @@ -1,4 +1,5 @@ import * as cacheUtils from '../../src/caching/cache-utils' +import {describe, expect} from '@jest/globals' describe('cacheUtils-utils', () => { describe('can hash', () => { diff --git a/sources/test/jest/configuration.test.ts b/sources/test/jest/configuration.test.ts index d1dfa47..b40993e 100644 --- a/sources/test/jest/configuration.test.ts +++ b/sources/test/jest/configuration.test.ts @@ -1,4 +1,5 @@ import * as inputParams from '../../src/configuration' +import { describe, expect} from '@jest/globals' describe('input params', () => { describe('parses numeric input', () => { diff --git a/sources/test/jest/gradle-version.test.ts b/sources/test/jest/gradle-version.test.ts index 81b761d..407a3b6 100644 --- a/sources/test/jest/gradle-version.test.ts +++ b/sources/test/jest/gradle-version.test.ts @@ -1,6 +1,7 @@ -import { describe } from 'node:test' import { versionIsAtLeast, parseGradleVersionFromOutput } from '../../src/execution/gradle' +import { describe, expect, it} from '@jest/globals' + describe('gradle', () => { describe('can compare version with', () => { it('same version', async () => { diff --git a/sources/test/jest/job-summary.test.ts b/sources/test/jest/job-summary.test.ts index 0f5c102..88a9b74 100644 --- a/sources/test/jest/job-summary.test.ts +++ b/sources/test/jest/job-summary.test.ts @@ -1,6 +1,7 @@ import { BuildResult } from '../../src/build-results' import { renderSummaryTable } from '../../src/job-summary' import dedent from 'dedent' +import { describe, expect, it} from '@jest/globals' const successfulHelpBuild: BuildResult = { diff --git a/sources/test/jest/predefined-toolchains.test.ts b/sources/test/jest/predefined-toolchains.test.ts index 6f88a03..ece2ec2 100644 --- a/sources/test/jest/predefined-toolchains.test.ts +++ b/sources/test/jest/predefined-toolchains.test.ts @@ -1,4 +1,5 @@ import {getPredefinedToolchains, mergeToolchainContent} from "../../src/caching/gradle-user-home-utils"; +import { afterAll, describe, expect, it, jest } from '@jest/globals' describe('predefined-toolchains', () => { const OLD_ENV = process.env diff --git a/sources/test/jest/short-lived-token.test.ts b/sources/test/jest/short-lived-token.test.ts index 2f39b50..5440e9d 100644 --- a/sources/test/jest/short-lived-token.test.ts +++ b/sources/test/jest/short-lived-token.test.ts @@ -1,5 +1,6 @@ import {DevelocityAccessCredentials, getToken} from "../../src/develocity/short-lived-token"; import nock from "nock"; +import { describe, expect, it } from '@jest/globals' describe('short lived tokens', () => { it('parse valid access key should return an object', async () => { diff --git a/sources/test/jest/wrapper-validation/validate.test.ts b/sources/test/jest/wrapper-validation/validate.test.ts index 54d9d6d..1d2cb1d 100644 --- a/sources/test/jest/wrapper-validation/validate.test.ts +++ b/sources/test/jest/wrapper-validation/validate.test.ts @@ -4,7 +4,6 @@ import * as validate from '../../../src/wrapper-validation/validate' import {expect, test, jest} from '@jest/globals' import { WrapperChecksums, KNOWN_CHECKSUMS } from '../../../src/wrapper-validation/checksums' import { ChecksumCache } from '../../../src/wrapper-validation/cache' -import exp from 'constants' jest.setTimeout(30000)