miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(testing): calculate correct support file path in cypress e2e preset (#22096)

Browse Source
This commit is contained in:
Leosvel Pérez Espinosa 2024-03-01 14:40:09 +01:00 committed by GitHub
parent 511eb36fa7
commit 2bcde03c01
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
e2e/react-module-federation/src/react-module-federation.test.ts
View File

@ -32,7 +32,7 @@ describe('React Module Federation', () => {
${false} ${false}
${true} ${true}
`( `(
'should generate host and remote apps', 'should generate host and remote apps with "--js=$js"',
async ({ js }) => { async ({ js }) => {
const shell = uniq('shell'); const shell = uniq('shell');
const remote1 = uniq('remote1'); const remote1 = uniq('remote1');

12
packages/cypress/plugins/cypress-preset.ts
View File

@ -102,22 +102,12 @@ export function nxE2EPreset(
) { ) {
const basePath = options?.cypressDir || 'src'; const basePath = options?.cypressDir || 'src';
const dir = dirname(pathToConfig);
let supportFile: undefined | string = undefined;
for (const f of ['e2e.ts', 'e2e.js']) {
const candidate = join(dir, basePath, 'support', f);
if (existsSync(candidate)) {
supportFile = candidate;
break;
}
}
const baseConfig: any /*Cypress.EndToEndConfigOptions & { const baseConfig: any /*Cypress.EndToEndConfigOptions & {
[NX_PLUGIN_OPTIONS]: unknown; [NX_PLUGIN_OPTIONS]: unknown;
}*/ = { }*/ = {
...nxBaseCypressPreset(pathToConfig), ...nxBaseCypressPreset(pathToConfig),
fileServerFolder: '.', fileServerFolder: '.',
supportFile, supportFile: `${basePath}/support/e2e.{js,ts}`,
specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`, specPattern: `${basePath}/**/*.cy.{js,jsx,ts,tsx}`,
fixturesFolder: `${basePath}/fixtures`, fixturesFolder: `${basePath}/fixtures`,