Skip to content

Commit

Permalink
chore(repo): dont use unit-test-setup during e2e (#26393)
Browse files Browse the repository at this point in the history
<!-- Please make sure you have read the submission guidelines before
posting an PR -->
<!--
https://github.com/nrwl/nx/blob/master/CONTRIBUTING.md#-submitting-a-pr
-->

<!-- Please make sure that your commit message follows our format -->
<!-- Example: `fix(nx): must begin with lowercase` -->

## Current Behavior
<!-- This is the behavior we have today -->

## Expected Behavior
<!-- This is the behavior we should expect with the changes in this PR
-->

## Related Issue(s)
<!-- Please link the issue being fixed so it gets closed when this is
merged. -->

Fixes #
  • Loading branch information
AgentEnder authored Jun 6, 2024
1 parent e441991 commit b2e6662
Show file tree
Hide file tree
Showing 29 changed files with 34 additions and 28 deletions.
2 changes: 1 addition & 1 deletion e2e/angular/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-angular',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/cypress/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-cypress',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/detox/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export default {
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-detox',
testTimeout: 600000,
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/esbuild/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-esbuild',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/eslint/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-eslint',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/expo/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export default {
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-expo',
testTimeout: 600000,
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/gradle/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export default {
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-gradle',
testTimeout: 600000,
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
6 changes: 6 additions & 0 deletions e2e/jest.preset.e2e.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const preset = require('../jest.preset');

// The root preset sets up the environment for unit tests.
delete preset.setupFiles;

module.exports = preset;
2 changes: 1 addition & 1 deletion e2e/jest/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-jest',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/js/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-js',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/lerna-smoke-tests/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-lerna-smoke-tests',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/next/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-next',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/node/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-node',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/nuxt/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable */
export default {
displayName: 'e2e-nuxt',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
transform: {
'^.+\\.[tj]sx?$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/nx-init/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-nx-init',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/nx/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-nx',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/playwright/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-playwright',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/plugin/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-plugin',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/react-native/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ export default {
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-react-native',
testTimeout: 600000,
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/react/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-react',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/release/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-release',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/remix/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable */
export default {
displayName: 'e2e-remix',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
transform: {
'^.+\\.[tj]sx?$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/rollup/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-rollup',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/storybook/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-storybook',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/vite/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-vite',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/vue/jest.config.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* eslint-disable */
export default {
displayName: 'e2e-vue',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
transform: {
'^.+\\.[tj]sx?$': ['ts-jest', { tsconfig: '<rootDir>/tsconfig.spec.json' }],
},
Expand Down
2 changes: 1 addition & 1 deletion e2e/web/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-web',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/webpack/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-webpack',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};
2 changes: 1 addition & 1 deletion e2e/workspace-create/jest.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ export default {
globalSetup: '../utils/global-setup.ts',
globalTeardown: '../utils/global-teardown.ts',
displayName: 'e2e-workspace-create',
preset: '../../jest.preset.js',
preset: '../jest.preset.e2e.js',
};

0 comments on commit b2e6662

Please sign in to comment.