Merge pull request #425 from crazy-max/jest-tmp

jest: fix temp dir and rename fixtures folder

__tests__/buildkit/config.test.ts

@@ -15,22 +15,20 @@
  */
 
 import {describe, expect, jest, test, afterEach} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
-import * as path from 'path';
+import os from 'os';
+import path from 'path';
 import * as rimraf from 'rimraf';
 
 import {BuildKit} from '../../src/buildkit/buildkit';
 import {Context} from '../../src/context';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+const fixturesDir = path.join(__dirname, '..', '.fixtures');
-// prettier-ignore
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildkit-config-'));
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildkit-config-jest');
 const tmpName = path.join(tmpDir, '.tmpname-jest');
 
 jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
-  if (!fs.existsSync(tmpDir)) {
+  fs.mkdirSync(tmpDir, {recursive: true});
-    fs.mkdirSync(tmpDir, {recursive: true});
-  }
   return tmpDir;
 });
 

__tests__/buildx/bake.test.itg.ts

@@ -21,7 +21,7 @@ import * as path from 'path';
 import {Bake} from '../../src/buildx/bake';
 import {BakeDefinition} from '../../src/types/buildx/bake';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+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;
 

__tests__/buildx/bake.test.ts

@@ -15,8 +15,9 @@
  */
 
 import {afterEach, describe, expect, it, jest, test} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
-import * as path from 'path';
+import os from 'os';
+import path from 'path';
 import * as rimraf from 'rimraf';
 
 import {Bake} from '../../src/buildx/bake';
@@ -26,16 +27,13 @@ import {ExecOptions} from '@actions/exec';
 import {BakeDefinition} from '../../src/types/buildx/bake';
 import {BuildMetadata} from '../../src/types/buildx/build';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+const fixturesDir = path.join(__dirname, '..', '.fixtures');
-// prettier-ignore
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-bake-'));
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-bake-jest');
 const tmpName = path.join(tmpDir, '.tmpname-jest');
 const metadata = JSON.parse(fs.readFileSync(path.join(fixturesDir, 'metadata-bake.json'), 'utf-8'));
 
 jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
-  if (!fs.existsSync(tmpDir)) {
+  fs.mkdirSync(tmpDir, {recursive: true});
-    fs.mkdirSync(tmpDir, {recursive: true});
-  }
   return tmpDir;
 });
 

__tests__/buildx/build.test.ts

@@ -15,23 +15,21 @@
  */
 
 import {afterEach, beforeEach, describe, expect, it, jest, test} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
-import * as path from 'path';
+import os from 'os';
+import path from 'path';
 import * as rimraf from 'rimraf';
 
 import {Context} from '../../src/context';
 import {Build} from '../../src/buildx/build';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+const fixturesDir = path.join(__dirname, '..', '.fixtures');
-// prettier-ignore
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-build-'));
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-build-jest');
 const tmpName = path.join(tmpDir, '.tmpname-jest');
 const metadata = JSON.parse(fs.readFileSync(path.join(fixturesDir, 'metadata-build.json'), 'utf-8'));
 
 jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
-  if (!fs.existsSync(tmpDir)) {
+  fs.mkdirSync(tmpDir, {recursive: true});
-    fs.mkdirSync(tmpDir, {recursive: true});
-  }
   return tmpDir;
 });
 

__tests__/buildx/builder.test.ts

@@ -23,7 +23,7 @@ import {Exec} from '../../src/exec';
 
 import {BuilderInfo} from '../../src/types/buildx/builder';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+const fixturesDir = path.join(__dirname, '..', '.fixtures');
 
 jest.spyOn(Builder.prototype, 'inspect').mockImplementation(async (): Promise<BuilderInfo> => {
   return {

__tests__/buildx/buildx.test.itg.ts

@@ -15,8 +15,9 @@
  */
 
 import {describe, expect, it} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
-import * as path from 'path';
+import os from 'os';
+import path from 'path';
 import * as core from '@actions/core';
 
 import {Buildx} from '../../src/buildx/buildx';
@@ -24,10 +25,8 @@ import {Build} from '../../src/buildx/build';
 import {Bake} from '../../src/buildx/bake';
 import {Exec} from '../../src/exec';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+const fixturesDir = path.join(__dirname, '..', '.fixtures');
-
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-buildx-itg-'));
-// prettier-ignore
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-jest');
 
 const maybe = !process.env.GITHUB_ACTIONS || (process.env.GITHUB_ACTIONS === 'true' && process.env.ImageOS && process.env.ImageOS.startsWith('ubuntu')) ? describe : describe.skip;
 

__tests__/buildx/buildx.test.ts

@@ -15,8 +15,9 @@
  */
 
 import {describe, expect, it, jest, test, beforeEach, afterEach} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
-import * as path from 'path';
+import os from 'os';
+import path from 'path';
 import * as rimraf from 'rimraf';
 import * as semver from 'semver';
 
@@ -26,15 +27,12 @@ import {Exec} from '../../src/exec';
 
 import {Cert, LocalState} from '../../src/types/buildx/buildx';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+const fixturesDir = path.join(__dirname, '..', '.fixtures');
-// prettier-ignore
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-buildx-'));
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-jest');
 const tmpName = path.join(tmpDir, '.tmpname-jest');
 
 jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
-  if (!fs.existsSync(tmpDir)) {
+  fs.mkdirSync(tmpDir, {recursive: true});
-    fs.mkdirSync(tmpDir, {recursive: true});
-  }
   return tmpDir;
 });
 

__tests__/buildx/history.test.itg.ts

@@ -15,8 +15,9 @@
  */
 
 import {afterEach, beforeEach, describe, expect, it, jest, test} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
-import * as path from 'path';
+import os from 'os';
+import path from 'path';
 
 import {Buildx} from '../../src/buildx/buildx';
 import {Bake} from '../../src/buildx/bake';
@@ -24,10 +25,8 @@ import {Build} from '../../src/buildx/build';
 import {History} from '../../src/buildx/history';
 import {Exec} from '../../src/exec';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+const fixturesDir = path.join(__dirname, '..', '.fixtures');
-
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-history-itg-'));
-// prettier-ignore
-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;
 

__tests__/buildx/install.test.ts

@@ -15,15 +15,15 @@
  */
 
 import {describe, expect, it, jest, test, afterEach} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
-import * as path from 'path';
+import os from 'os';
+import path from 'path';
 import * as rimraf from 'rimraf';
 import osm = require('os');
 
 import {Install} from '../../src/buildx/install';
 
-// prettier-ignore
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'buildx-install-'));
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'buildx-jest');
 
 afterEach(function () {
   rimraf.sync(tmpDir);

__tests__/cache.test.itg.ts

@@ -14,15 +14,15 @@
  * limitations under the License.
  */
 
-import path from 'path';
 import {describe, expect, it} from '@jest/globals';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
 
 import {Cache} from '../src/cache';
 
-// prettier-ignore
+const fixturesDir = path.join(__dirname, '.fixtures');
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'cache-jest');
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'cache-itg-'));
-
-const fixturesDir = path.join(__dirname, 'fixtures');
 
 describe('cache', () => {
   it('github-repo', async () => {

__tests__/context.test.ts

@@ -14,21 +14,19 @@
  * limitations under the License.
  */
 
-import * as fs from 'fs';
-import * as path from 'path';
-import * as rimraf from 'rimraf';
 import {describe, expect, jest, it, afterEach} from '@jest/globals';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
+import * as rimraf from 'rimraf';
 
 import {Context} from '../src/context';
 
-// prettier-ignore
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'context-'));
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'context-jest');
 const tmpName = path.join(tmpDir, '.tmpname-jest');
 
 jest.spyOn(Context, 'tmpDir').mockImplementation((): string => {
-  if (!fs.existsSync(tmpDir)) {
+  fs.mkdirSync(tmpDir, {recursive: true});
-    fs.mkdirSync(tmpDir, {recursive: true});
-  }
   return tmpDir;
 });
 

__tests__/docker/docker.test.ts

@@ -15,7 +15,8 @@
  */
 
 import {afterEach, beforeEach, describe, expect, it, jest} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
+import os from 'os';
 import path from 'path';
 import * as io from '@actions/io';
 import osm = require('os');
@@ -25,10 +26,8 @@ import {Docker} from '../../src/docker/docker';
 
 import {ConfigFile} from '../../src/types/docker/docker';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+const fixturesDir = path.join(__dirname, '..', '.fixtures');
-
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'docker-docker-'));
-// prettier-ignore
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'docker-jest');
 
 afterEach(function () {
   rimraf.sync(tmpDir);

__tests__/docker/install.test.itg.ts

@@ -14,15 +14,16 @@
  * limitations under the License.
  */
 
-import path from 'path';
 import {jest, describe, expect, test, beforeEach, afterEach} from '@jest/globals';
+import fs from 'fs';
+import os from 'os';
+import path from 'path';
 
 import {Install} from '../../src/docker/install';
 import {Docker} from '../../src/docker/docker';
 import {Exec} from '../../src/exec';
 
-// prettier-ignore
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'docker-install-itg-'));
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'docker-install-jest');
 
 describe('install', () => {
   const originalEnv = process.env;

__tests__/docker/install.test.ts

@@ -15,15 +15,15 @@
  */
 
 import {describe, expect, jest, test, beforeEach, afterEach, it} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
-import * as path from 'path';
+import os from 'os';
+import path from 'path';
 import * as rimraf from 'rimraf';
 import osm = require('os');
 
 import {Install} from '../../src/docker/install';
 
-// prettier-ignore
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'docker-install-'));
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'docker-install-jest');
 
 afterEach(function () {
   rimraf.sync(tmpDir);

__tests__/dockerhub.test.ts

@@ -21,9 +21,9 @@ import * as path from 'path';
 import {DockerHub} from '../src/dockerhub';
 import {RepositoryResponse, RepositoryTagsResponse} from '../src/types/dockerhub';
 
-import repoInfoFixture from './fixtures/dockerhub-repoinfo.json';
+import repoInfoFixture from './.fixtures/dockerhub-repoinfo.json';
-import repoTagsFixture from './fixtures/dockerhub-repotags.json';
+import repoTagsFixture from './.fixtures/dockerhub-repotags.json';
-import repoAllTagsFixture from './fixtures/dockerhub-repoalltags.json';
+import repoAllTagsFixture from './.fixtures/dockerhub-repoalltags.json';
 
 describe('getRepository', () => {
   it('returns repo info', async () => {

__tests__/github.test.itg.ts

@@ -16,7 +16,8 @@
 
 import {describe, expect, it, test} from '@jest/globals';
 import fs from 'fs';
-import * as path from 'path';
+import os from 'os';
+import path from 'path';
 
 import {Buildx} from '../src/buildx/buildx';
 import {Bake} from '../src/buildx/bake';
@@ -25,10 +26,8 @@ import {Exec} from '../src/exec';
 import {GitHub} from '../src/github';
 import {History} from '../src/buildx/history';
 
-const fixturesDir = path.join(__dirname, 'fixtures');
+const fixturesDir = path.join(__dirname, '.fixtures');
-
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'github-itg-'));
-// prettier-ignore
-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;
 

__tests__/github.test.ts

@@ -22,7 +22,7 @@ import * as core from '@actions/core';
 import {GitHub} from '../src/github';
 import {GitHubRepo} from '../src/types/github';
 
-import repoFixture from './fixtures/github-repo.json';
+import repoFixture from './.fixtures/github-repo.json';
 jest.spyOn(GitHub.prototype, 'repoData').mockImplementation((): Promise<GitHubRepo> => {
   return <Promise<GitHubRepo>>(repoFixture as unknown);
 });
@@ -123,7 +123,7 @@ describe('actionsRuntimeToken', () => {
   });
   it('fixture', async () => {
     process.env.ACTIONS_RUNTIME_TOKEN = fs
-      .readFileSync(path.join(__dirname, 'fixtures', 'runtimeToken.txt'))
+      .readFileSync(path.join(__dirname, '.fixtures', 'runtimeToken.txt'))
       .toString()
       .trim();
     const runtimeToken = GitHub.actionsRuntimeToken;
@@ -154,7 +154,7 @@ describe('printActionsRuntimeTokenACs', () => {
   it('refs/heads/master', async () => {
     const infoSpy = jest.spyOn(core, 'info');
     process.env.ACTIONS_RUNTIME_TOKEN = fs
-      .readFileSync(path.join(__dirname, 'fixtures', 'runtimeToken.txt'))
+      .readFileSync(path.join(__dirname, '.fixtures', 'runtimeToken.txt'))
       .toString()
       .trim();
     await GitHub.printActionsRuntimeTokenACs();

__tests__/oci/oci.test.ts

@@ -15,16 +15,15 @@
  */
 
 import {afterEach, describe, expect, test} from '@jest/globals';
-import * as fs from 'fs';
+import fs from 'fs';
+import os from 'os';
 import path from 'path';
 import * as rimraf from 'rimraf';
 
 import {OCI} from '../../src/oci/oci';
 
-const fixturesDir = path.join(__dirname, '..', 'fixtures');
+const fixturesDir = path.join(__dirname, '..', '.fixtures');
-
+const tmpDir = fs.mkdtempSync(path.join(process.env.TEMP || os.tmpdir(), 'oci-oci-'));
-// prettier-ignore
-const tmpDir = path.join(process.env.TEMP || '/tmp', 'docker-jest');
 
 afterEach(function () {
   rimraf.sync(tmpDir);

__tests__/util.test.ts

@@ -165,7 +165,7 @@ FOO=bar`
   });
 
   it('large multiline values', async () => {
-    const pgp = fs.readFileSync(path.join(__dirname, 'fixtures', 'pgp.txt'), {encoding: 'utf-8'});
+    const pgp = fs.readFileSync(path.join(__dirname, '.fixtures', 'pgp.txt'), {encoding: 'utf-8'});
     setInput(
       'secrets',
       `"GPG_KEY=${pgp}"