From 3ff831722d999d25d8486d0b8248272b3ce1121c Mon Sep 17 00:00:00 2001 From: Kevin Brightwell Date: Tue, 14 Jan 2025 16:03:32 -0500 Subject: [PATCH] chore: Clean-up missing imports for tests (#505) Noticed had missing imports in tests, this adds them and orders imports consistently. Not sure why eslint missed this. --- sources/test/jest/cache-cleanup.test.ts | 3 ++- sources/test/jest/cache-debug.test.ts | 2 ++ sources/test/jest/cache-reporting.test.ts | 3 ++- sources/test/jest/cache-utils.test.ts | 2 ++ sources/test/jest/configuration.test.ts | 2 ++ sources/test/jest/dependency-graph.test.ts | 4 +++- sources/test/jest/gradle-version.test.ts | 5 +++-- sources/test/jest/job-summary.test.ts | 5 +++-- sources/test/jest/predefined-toolchains.test.ts | 2 ++ sources/test/jest/short-lived-token.test.ts | 4 +++- sources/test/jest/wrapper-validation/validate.test.ts | 1 - 11 files changed, 24 insertions(+), 9 deletions(-) diff --git a/sources/test/jest/cache-cleanup.test.ts b/sources/test/jest/cache-cleanup.test.ts index 7a8f335..4bf9f98 100644 --- a/sources/test/jest/cache-cleanup.test.ts +++ b/sources/test/jest/cache-cleanup.test.ts @@ -1,8 +1,9 @@ import * as exec from '@actions/exec' -import * as core from '@actions/core' import * as glob from '@actions/glob' import fs from 'fs' import path from 'path' +import {expect, test, jest} from '@jest/globals' + import {CacheCleaner} from '../../src/caching/cache-cleaner' jest.setTimeout(120000) diff --git a/sources/test/jest/cache-debug.test.ts b/sources/test/jest/cache-debug.test.ts index 141d51b..ee880b0 100644 --- a/sources/test/jest/cache-debug.test.ts +++ b/sources/test/jest/cache-debug.test.ts @@ -1,5 +1,7 @@ import * as path from 'path' import * as fs from 'fs' +import {describe, expect, it} from '@jest/globals' + import {GradleUserHomeCache} from "../../src/caching/gradle-user-home-cache" import {CacheConfig} from "../../src/configuration" diff --git a/sources/test/jest/cache-reporting.test.ts b/sources/test/jest/cache-reporting.test.ts index 7a3c307..ab81d8c 100644 --- a/sources/test/jest/cache-reporting.test.ts +++ b/sources/test/jest/cache-reporting.test.ts @@ -1,4 +1,5 @@ -import exp from 'constants' +import {describe, expect, it} from '@jest/globals' + import {CacheEntryListener, CacheListener} from '../../src/caching/cache-reporting' describe('caching report', () => { diff --git a/sources/test/jest/cache-utils.test.ts b/sources/test/jest/cache-utils.test.ts index ac6fb10..76c606b 100644 --- a/sources/test/jest/cache-utils.test.ts +++ b/sources/test/jest/cache-utils.test.ts @@ -1,3 +1,5 @@ +import {describe, expect, it} from '@jest/globals' + import * as cacheUtils from '../../src/caching/cache-utils' describe('cacheUtils-utils', () => { diff --git a/sources/test/jest/configuration.test.ts b/sources/test/jest/configuration.test.ts index d1dfa47..2baa045 100644 --- a/sources/test/jest/configuration.test.ts +++ b/sources/test/jest/configuration.test.ts @@ -1,3 +1,5 @@ +import {describe, expect, it} from '@jest/globals' + import * as inputParams from '../../src/configuration' describe('input params', () => { diff --git a/sources/test/jest/dependency-graph.test.ts b/sources/test/jest/dependency-graph.test.ts index e97ed45..c2c02da 100644 --- a/sources/test/jest/dependency-graph.test.ts +++ b/sources/test/jest/dependency-graph.test.ts @@ -1,4 +1,6 @@ -import { DependencyGraphConfig } from "../../src/configuration" +import {describe, expect, it} from '@jest/globals' + +import {DependencyGraphConfig} from "../../src/configuration" describe('dependency-graph', () => { describe('constructs job correlator', () => { diff --git a/sources/test/jest/gradle-version.test.ts b/sources/test/jest/gradle-version.test.ts index 81b761d..9bcf520 100644 --- a/sources/test/jest/gradle-version.test.ts +++ b/sources/test/jest/gradle-version.test.ts @@ -1,5 +1,6 @@ -import { describe } from 'node:test' -import { versionIsAtLeast, parseGradleVersionFromOutput } from '../../src/execution/gradle' +import {describe, expect, it} from '@jest/globals' + +import {versionIsAtLeast, parseGradleVersionFromOutput} from '../../src/execution/gradle' describe('gradle', () => { describe('can compare version with', () => { diff --git a/sources/test/jest/job-summary.test.ts b/sources/test/jest/job-summary.test.ts index 0f5c102..10197ad 100644 --- a/sources/test/jest/job-summary.test.ts +++ b/sources/test/jest/job-summary.test.ts @@ -1,7 +1,8 @@ -import { BuildResult } from '../../src/build-results' -import { renderSummaryTable } from '../../src/job-summary' import dedent from 'dedent' +import {describe, expect, it} from '@jest/globals' +import {BuildResult} from '../../src/build-results' +import {renderSummaryTable} from '../../src/job-summary' const successfulHelpBuild: BuildResult = { rootProjectName: 'root', diff --git a/sources/test/jest/predefined-toolchains.test.ts b/sources/test/jest/predefined-toolchains.test.ts index 6f88a03..4e4f01e 100644 --- a/sources/test/jest/predefined-toolchains.test.ts +++ b/sources/test/jest/predefined-toolchains.test.ts @@ -1,3 +1,5 @@ +import {afterAll, describe, expect, it, jest} from '@jest/globals' + import {getPredefinedToolchains, mergeToolchainContent} from "../../src/caching/gradle-user-home-utils"; describe('predefined-toolchains', () => { diff --git a/sources/test/jest/short-lived-token.test.ts b/sources/test/jest/short-lived-token.test.ts index 2f39b50..a0f8d9d 100644 --- a/sources/test/jest/short-lived-token.test.ts +++ b/sources/test/jest/short-lived-token.test.ts @@ -1,5 +1,7 @@ -import {DevelocityAccessCredentials, getToken} from "../../src/develocity/short-lived-token"; import nock from "nock"; +import {describe, expect, it} from '@jest/globals' + +import {DevelocityAccessCredentials, getToken} from "../../src/develocity/short-lived-token"; 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)