Skip to content

Commit

Permalink
jest: mocks already cleared through configuration
Browse files Browse the repository at this point in the history
Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
  • Loading branch information
crazy-max committed Jun 18, 2024
1 parent f27d52d commit 953dc3b
Show file tree
Hide file tree
Showing 16 changed files with 10 additions and 71 deletions.
6 changes: 1 addition & 5 deletions __tests__/buildkit/buildkit.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
6 changes: 1 addition & 5 deletions __tests__/buildkit/config.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -38,10 +38,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
return tmpName;
});

beforeEach(() => {
jest.clearAllMocks();
});

afterEach(() => {
rimraf.sync(tmpDir);
});
Expand Down
6 changes: 1 addition & 5 deletions __tests__/buildx/bake.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -49,10 +49,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
return tmpName;
});

beforeEach(() => {
jest.clearAllMocks();
});

afterEach(() => {
rimraf.sync(tmpDir);
});
Expand Down
4 changes: 0 additions & 4 deletions __tests__/buildx/build.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
return tmpName;
});

beforeEach(() => {
jest.clearAllMocks();
});

afterEach(() => {
rimraf.sync(tmpDir);
});
Expand Down
6 changes: 1 addition & 5 deletions __tests__/buildx/builder.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -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',
Expand Down
4 changes: 0 additions & 4 deletions __tests__/buildx/buildx.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
return tmpName;
});

beforeEach(() => {
jest.clearAllMocks();
});

afterEach(() => {
rimraf.sync(tmpDir);
});
Expand Down
6 changes: 1 addition & 5 deletions __tests__/buildx/install.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
});
Expand Down
6 changes: 1 addition & 5 deletions __tests__/context.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';

Expand All @@ -36,10 +36,6 @@ jest.spyOn(Context, 'tmpName').mockImplementation((): string => {
return tmpName;
});

beforeEach(() => {
jest.clearAllMocks();
});

afterEach(() => {
rimraf.sync(tmpDir);
});
Expand Down
4 changes: 0 additions & 4 deletions __tests__/docker/docker.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
4 changes: 0 additions & 4 deletions __tests__/docker/install.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
});
Expand Down
6 changes: 1 addition & 5 deletions __tests__/dockerhub.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down
6 changes: 1 addition & 5 deletions __tests__/exec.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion __tests__/git.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ import {Exec} from '../src/exec';
import {ExecOutput} from '@actions/exec';

beforeEach(() => {
jest.clearAllMocks();
jest.restoreAllMocks();
});

Expand Down
4 changes: 0 additions & 4 deletions __tests__/github.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
6 changes: 1 addition & 5 deletions __tests__/oci/oci.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand All @@ -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);
});
Expand Down
6 changes: 1 addition & 5 deletions __tests__/util.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down

0 comments on commit 953dc3b

Please sign in to comment.