Merge pull request #1036 from gperdomor/fix/ci

ci: fix tests
gperdomor · Apr 23, 2024 · e42edd2 · e42edd2
2 parents 24ad3d1 + 39e6e56
commit e42edd2
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 5 deletions.
diff --git a/jest.preset.js b/jest.preset.js
@@ -1,3 +1,3 @@
 const nxPreset = require('@nx/jest/preset').default;
 
-module.exports = { ...nxPreset, testEnvironment: 'node', coverageReporters: ['html', 'json'] };
+module.exports = { ...nxPreset, testEnvironment: 'node', coverageReporters: ['html', 'json'], clearMocks: true };
diff --git a/packages/container-metadata/src/lib/meta.spec.ts b/packages/container-metadata/src/lib/meta.spec.ts
@@ -1,4 +1,5 @@
 import { ContextProxyFactory, RepoMetadata, RepoProxyFactory, RunnerContext } from '@nx-tools/ci-context';
+import { workspaceRoot } from '@nx/devkit';
 import * as dotenv from 'dotenv';
 import * as fs from 'node:fs';
 import * as path from 'node:path';
@@ -41,8 +42,8 @@ beforeEach(() => {
   });
 
   // workaround for https://github.com/nrwl/nx/issues/20330
-  const projectDir = path.join(__dirname, '..', '..');
-  if (process.env.PWD !== projectDir) {
+  const projectDir = `${workspaceRoot}/packages/container-metadata`;
+  if (process.cwd() !== projectDir) {
     process.chdir(projectDir);
   }
 });

diff --git a/packages/nx-container/src/executors/build/engines/docker/docker.engine.spec.ts b/packages/nx-container/src/executors/build/engines/docker/docker.engine.spec.ts
@@ -32,6 +32,12 @@ describe('Docker Engine', () => {
     adapter = new Docker();
   });
 
+  beforeAll(() => {
+    jest.spyOn(console, 'info').mockImplementation(() => true);
+    jest.spyOn(console, 'log').mockImplementation(() => true);
+    jest.spyOn(console, 'warn').mockImplementation(() => true);
+  });
+
   describe('getArgs', () => {
     beforeEach(() => {
       process.env = Object.keys(process.env).reduce((object, key) => {

diff --git a/packages/nx-container/src/executors/build/engines/podman/podman.engine.spec.ts b/packages/nx-container/src/executors/build/engines/podman/podman.engine.spec.ts
@@ -32,6 +32,12 @@ describe('Podman Engine', () => {
     adapter = new Podman();
   });
 
+  beforeAll(() => {
+    jest.spyOn(console, 'info').mockImplementation(() => true);
+    jest.spyOn(console, 'log').mockImplementation(() => true);
+    jest.spyOn(console, 'warn').mockImplementation(() => true);
+  });
+
   describe('getArgs', () => {
     beforeEach(() => {
       process.env = Object.keys(process.env).reduce((object, key) => {

diff --git a/packages/nx-container/src/executors/build/engines/podman/podman.spec.ts b/packages/nx-container/src/executors/build/engines/podman/podman.spec.ts
@@ -4,7 +4,7 @@ import * as path from 'node:path';
 import * as semver from 'semver';
 import * as podman from './podman';
 
-const tmpNameSync = path.join('/tmp/.docker-build-push-jest', '.tmpname-jest').split(path.sep).join(path.posix.sep);
+const tmpNameSync = path.join('/tmp/.podman-build-push-jest', '.tmpname-jest').split(path.sep).join(path.posix.sep);
 const imageID = 'sha256:bfb45ab72e46908183546477a08f8867fc40cebadd00af54b071b097aed127a9';
 const metadata = `{
   "containerimage.config.digest": "sha256:059b68a595b22564a1cbc167af369349fdc2ecc1f7bc092c2235cbf601a795fd",
@@ -19,7 +19,7 @@ jest.mock('../../context', () => {
     __esModule: true,
     ...originalModule,
     tmpDir: jest.fn(() => {
-      const tmpDir = path.join('/tmp/.docker-build-push-jest').split(path.sep).join(path.posix.sep);
+      const tmpDir = path.join('/tmp/.podman-build-push-jest').split(path.sep).join(path.posix.sep);
       if (!fs.existsSync(tmpDir)) {
         fs.mkdirSync(tmpDir, { recursive: true });
       }

diff --git a/packages/nx-container/src/executors/build/executor.spec.ts b/packages/nx-container/src/executors/build/executor.spec.ts
@@ -1,4 +1,5 @@
 import { RepoMetadata } from '@nx-tools/ci-context';
+import { workspaceRoot } from '@nx/devkit';
 import mockedEnv, { RestoreFn } from 'mocked-env';
 import * as path from 'node:path';
 import { run } from './executor';
@@ -33,6 +34,12 @@ jest.mock('@nx-tools/ci-context', () => {
 describe('Build Executor', () => {
   let restore: RestoreFn;
 
+  beforeAll(() => {
+    jest.spyOn(console, 'info').mockImplementation(() => true);
+    jest.spyOn(console, 'log').mockImplementation(() => true);
+    jest.spyOn(console, 'warn').mockImplementation(() => true);
+  });
+
   beforeEach(() => {
     restore = mockedEnv({
       CI_PIPELINE_SOURCE: 'push',
@@ -43,6 +50,11 @@ describe('Build Executor', () => {
       CI_PIPELINE_ID: '1234',
       CI_PIPELINE_IID: '5678',
     });
+
+    // workaround for https://github.com/nrwl/nx/issues/20330
+    if (process.cwd() !== workspaceRoot) {
+      process.chdir(workspaceRoot);
+    }
   });
 
   afterEach(() => {