diff --git a/packages/cli/config/jest.js b/packages/cli/config/jest.js index e10f2d1ce1..3c015dd7c7 100644 --- a/packages/cli/config/jest.js +++ b/packages/cli/config/jest.js @@ -134,7 +134,7 @@ async function getProjectConfig(targetPath, displayName) { '\\.(js|jsx|ts|tsx|mjs|cjs)$': [ '@swc/jest', { - enableSourceMaps: envOptions.enableSourceMaps || envOptions.nextTests, + sourceMaps: false, // envOptions.enableSourceMaps || envOptions.nextTests, }, ], // '^.+\\.(t|j)sx?$': '@swc/jest', diff --git a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts index 8c501cf8f1..d8c9e06612 100644 --- a/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts +++ b/plugins/scaffolder-backend-module-cookiecutter/src/actions/fetch/cookiecutter.test.ts @@ -17,12 +17,12 @@ const executeShellCommand = jest.fn(); const commandExists = jest.fn(); const fetchContents = jest.fn(); -jest.mock('@backstage/plugin-scaffolder-backend', () => ({ - ...jest.requireActual('@backstage/plugin-scaffolder-backend'), +jest.doMock('@backstage/plugin-scaffolder-backend', () => ({ + ...require('@backstage/plugin-scaffolder-backend'), fetchContents, executeShellCommand, })); -jest.mock('command-exists', () => commandExists); +jest.doMock('command-exists', () => commandExists); import { getVoidLogger, diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts index 0767e63f29..0e0e5891a3 100644 --- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts +++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.test.ts @@ -17,15 +17,14 @@ const executeShellCommand = jest.fn(); const commandExists = jest.fn(); -jest.mock('@backstage/plugin-scaffolder-backend', () => ({ +jest.doMock('@backstage/plugin-scaffolder-backend', () => ({ executeShellCommand, })); -jest.mock('command-exists', () => commandExists); -jest.mock('fs-extra'); +jest.doMock('command-exists', () => commandExists); import { ContainerRunner } from '@backstage/backend-common'; import fs from 'fs-extra'; - +import mockfs from 'mock-fs'; import path from 'path'; import { PassThrough } from 'stream'; diff --git a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts index 0ed02e293c..caebc36779 100644 --- a/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts +++ b/plugins/scaffolder-backend-module-rails/src/actions/fetch/rails/railsNewRunner.ts @@ -57,7 +57,6 @@ export class RailsNewRunner { const baseCommand = 'rails'; const baseArguments = ['new']; const commandExistsToRun = await commandExists(baseCommand); - if (commandExistsToRun) { const arrayExtraArguments = railsArgumentResolver( workspacePath, diff --git a/plugins/scaffolder-backend/src/service/router.test.ts b/plugins/scaffolder-backend/src/service/router.test.ts index 7ddec46078..4079fd0114 100644 --- a/plugins/scaffolder-backend/src/service/router.test.ts +++ b/plugins/scaffolder-backend/src/service/router.test.ts @@ -14,8 +14,6 @@ * limitations under the License. */ -const mockAccess = jest.fn(); - import { DatabaseManager, getVoidLogger, @@ -43,7 +41,9 @@ import { import { createRouter, DatabaseTaskStore, TaskBroker } from '../index'; import { StorageTaskBroker } from '../scaffolder/tasks/StorageTaskBroker'; -jest.mock('fs-extra', () => ({ +const mockAccess = jest.fn(); + +jest.doMock('fs-extra', () => ({ access: mockAccess, promises: { access: mockAccess,