Merge pull request #372 from crazy-max/jest-fixes

jest: small configuration changes for mock

__tests__/buildkit/buildkit.test.ts

@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-import {beforeEach, describe, expect, it, jest, test} from '@jest/globals';
+import {describe, expect, it, jest, test} from '@jest/globals';
 
 import {BuildKit} from '../../src/buildkit/buildkit';
 import {Builder} from '../../src/buildx/builder';
 
 import {BuilderInfo} from '../../src/types/buildx/builder';
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<BuilderInfo> => {
   return {
     name: 'builder2',

__tests__/buildkit/config.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {describe, expect, jest, test, beforeEach, afterEach} from '@jest/globals';
+import {describe, expect, jest, test, afterEach} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as rimraf from 'rimraf';
@@ -38,10 +38,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
   return tmpName;
 });
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 afterEach(() => {
   rimraf.sync(tmpDir);
 });

__tests__/buildx/bake.test.itg.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {beforeEach, describe, expect, jest, test} from '@jest/globals';
+import {describe, expect, test} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 
@@ -25,10 +25,6 @@ const fixturesDir = path.join(__dirname, '..', 'fixtures');
 
 const maybe = !process.env.GITHUB_ACTIONS || (process.env.GITHUB_ACTIONS === 'true' && process.env.ImageOS && process.env.ImageOS.startsWith('ubuntu')) ? describe : describe.skip;
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 maybe('getDefinition', () => {
   // prettier-ignore
   test.each([

__tests__/buildx/bake.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {afterEach, beforeEach, describe, expect, it, jest, test} from '@jest/globals';
+import {afterEach, describe, expect, it, jest, test} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as rimraf from 'rimraf';
@@ -49,10 +49,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
   return tmpName;
 });
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 afterEach(() => {
   rimraf.sync(tmpDir);
 });

__tests__/buildx/build.test.ts

@@ -39,10 +39,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
   return tmpName;
 });
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 afterEach(() => {
   rimraf.sync(tmpDir);
 });

__tests__/buildx/builder.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {beforeEach, describe, expect, it, jest, test} from '@jest/globals';
+import {describe, expect, it, jest, test} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 
@@ -25,10 +25,6 @@ import {BuilderInfo} from '../../src/types/buildx/builder';
 
 const fixturesDir = path.join(__dirname, '..', 'fixtures');
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<BuilderInfo> => {
   return {
     name: 'builder2',

__tests__/buildx/buildx.test.ts

@@ -42,10 +42,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
   return tmpName;
 });
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 afterEach(() => {
   rimraf.sync(tmpDir);
 });

__tests__/buildx/history.test.itg.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {beforeEach, describe, expect, jest, test} from '@jest/globals';
+import {describe, expect, test} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 
@@ -31,10 +31,6 @@ const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-history-jest');
 
 const maybe = !process.env.GITHUB_ACTIONS || (process.env.GITHUB_ACTIONS === 'true' && process.env.ImageOS && process.env.ImageOS.startsWith('ubuntu')) ? describe : describe.skip;
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 maybe('exportBuild', () => {
   // prettier-ignore
   test.each([

__tests__/buildx/install.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {describe, expect, it, jest, test, beforeEach, afterEach} from '@jest/globals';
+import {describe, expect, it, jest, test, afterEach} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as rimraf from 'rimraf';
@@ -25,10 +25,6 @@ import {Install} from '../../src/buildx/install';
 // prettier-ignore
 const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-jest');
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 afterEach(function () {
   rimraf.sync(tmpDir);
 });

__tests__/context.test.ts

@@ -17,7 +17,7 @@
 import * as fs from 'fs';
 import * as path from 'path';
 import * as rimraf from 'rimraf';
-import {describe, expect, jest, it, beforeEach, afterEach} from '@jest/globals';
+import {describe, expect, jest, it, afterEach} from '@jest/globals';
 
 import {Context} from '../src/context';
 
@@ -36,10 +36,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
   return tmpName;
 });
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 afterEach(() => {
   rimraf.sync(tmpDir);
 });

__tests__/docker/docker.test.ts

@@ -31,10 +31,6 @@ const fixturesDir = path.join(__dirname, '..', 'fixtures');
 // prettier-ignore
 const tmpDir = path.join(process.env.TEMP || '/tmp', 'docker-jest');
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 afterEach(function () {
   rimraf.sync(tmpDir);
 });

__tests__/docker/install.test.ts

@@ -25,10 +25,6 @@ import {Install} from '../../src/docker/install';
 // prettier-ignore
 const tmpDir = path.join(process.env.TEMP || '/tmp', 'docker-install-jest');
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 afterEach(function () {
   rimraf.sync(tmpDir);
 });

__tests__/dockerhub.test.ts

@@ -14,17 +14,13 @@
  * limitations under the License.
  */
 
-import {describe, expect, jest, it, beforeEach} from '@jest/globals';
+import {describe, expect, jest, it} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 
 import {DockerHub} from '../src/dockerhub';
 import {RepositoryResponse, RepositoryTagsResponse} from '../src/types/dockerhub';
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 import repoInfoFixture from './fixtures/dockerhub-repoinfo.json';
 import repoTagsFixture from './fixtures/dockerhub-repotags.json';
 import repoAllTagsFixture from './fixtures/dockerhub-repoalltags.json';

__tests__/exec.test.ts

@@ -14,14 +14,10 @@
  * limitations under the License.
  */
 
-import {beforeEach, describe, expect, it, jest} from '@jest/globals';
+import {describe, expect, it, jest} from '@jest/globals';
 
 import {Exec} from '../src/exec';
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 describe('exec', () => {
   it('returns docker version', async () => {
     const execSpy = jest.spyOn(Exec, 'exec');

__tests__/git.test.ts

@@ -21,7 +21,6 @@ import {Exec} from '../src/exec';
 import {ExecOutput} from '@actions/exec';
 
 beforeEach(() => {
-  jest.clearAllMocks();
   jest.restoreAllMocks();
 });
 

__tests__/github.test.itg.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {beforeEach, describe, expect, it, jest, test} from '@jest/globals';
+import {describe, expect, it, test} from '@jest/globals';
 import fs from 'fs';
 import * as path from 'path';
 
@@ -32,10 +32,6 @@ const tmpDir = path.join(process.env.TEMP || '/tmp', 'github-jest');
 
 const maybe = !process.env.GITHUB_ACTIONS || (process.env.GITHUB_ACTIONS === 'true' && process.env.ImageOS && process.env.ImageOS.startsWith('ubuntu')) ? describe : describe.skip;
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 maybe('uploadArtifact', () => {
   it('uploads an artifact', async () => {
     const res = await GitHub.uploadArtifact({

__tests__/github.test.ts

@@ -22,10 +22,6 @@ import * as core from '@actions/core';
 import {GitHub} from '../src/github';
 import {GitHubRepo} from '../src/types/github';
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 import repoFixture from './fixtures/github-repo.json';
 jest.spyOn(GitHub.prototype, 'repoData').mockImplementation((): Promise<GitHubRepo> => {
   return <Promise<GitHubRepo>>(repoFixture as unknown);

__tests__/oci/oci.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-import {afterEach, beforeEach, describe, expect, jest, test} from '@jest/globals';
+import {afterEach, describe, expect, test} from '@jest/globals';
 import * as fs from 'fs';
 import path from 'path';
 import * as rimraf from 'rimraf';
@@ -26,10 +26,6 @@ const fixturesDir = path.join(__dirname, '..', 'fixtures');
 // prettier-ignore
 const tmpDir = path.join(process.env.TEMP || '/tmp', 'docker-jest');
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 afterEach(function () {
   rimraf.sync(tmpDir);
 });

__tests__/util.test.ts

@@ -14,16 +14,12 @@
  * limitations under the License.
  */
 
-import {beforeEach, describe, expect, it, jest, test} from '@jest/globals';
+import {describe, expect, it, test} from '@jest/globals';
 import * as fs from 'fs';
 import * as path from 'path';
 
 import {Util} from '../src/util';
 
-beforeEach(() => {
-  jest.clearAllMocks();
-});
-
 describe('getInputList', () => {
   it('single line correctly', async () => {
     await setInput('foo', 'bar');

jest.config.itg.ts

@@ -22,10 +22,6 @@ const tmpDir = fs.mkdtempSync(path.join(os.tmpdir(), 'docker-actions-toolkit-'))
 
 process.env = Object.assign({}, process.env, {
   TEMP: tmpDir,
-  GITHUB_REPOSITORY: 'docker/actions-toolkit',
-  GITHUB_RUN_ATTEMPT: 2,
-  GITHUB_RUN_ID: 2188748038,
-  GITHUB_RUN_NUMBER: 15,
   RUNNER_TEMP: path.join(tmpDir, 'runner-temp'),
   RUNNER_TOOL_CACHE: path.join(tmpDir, 'runner-tool-cache')
 }) as {
@@ -33,7 +29,6 @@ process.env = Object.assign({}, process.env, {
 };
 
 module.exports = {
-  clearMocks: true,
   testEnvironment: 'node',
   moduleFileExtensions: ['js', 'ts'],
   setupFiles: ['dotenv/config'],