diff --git a/e2e/angular-core/src/projects.test.ts b/e2e/angular-core/src/projects.test.ts index 2f3ed371ce..bfea0634c3 100644 --- a/e2e/angular-core/src/projects.test.ts +++ b/e2e/angular-core/src/projects.test.ts @@ -13,7 +13,6 @@ import { runCLI, runCommandUntil, runE2ETests, - setCypressWebServerTimeout, tmpProjPath, uniq, updateFile, @@ -128,7 +127,6 @@ describe('Angular Projects', () => { // check e2e tests if (runE2ETests('cypress')) { - setCypressWebServerTimeout(`${app1}-e2e/cypress.config.ts`); const e2eResults = runCLI(`e2e ${app1}-e2e`); expect(e2eResults).toContain('All specs passed!'); expect(await killPort(4200)).toBeTruthy(); diff --git a/e2e/angular-module-federation/src/module-federation.test.ts b/e2e/angular-module-federation/src/module-federation.test.ts index 380ca25a48..1558f02923 100644 --- a/e2e/angular-module-federation/src/module-federation.test.ts +++ b/e2e/angular-module-federation/src/module-federation.test.ts @@ -8,7 +8,6 @@ import { runCLI, runCommandUntil, runE2ETests, - setCypressWebServerTimeout, uniq, updateFile, } from '@nx/e2e/utils'; @@ -378,7 +377,6 @@ describe('Angular Module Federation', () => { expect(buildRemoteOutput).toContain('Successfully ran target build'); if (runE2ETests('cypress')) { - setCypressWebServerTimeout(`${host}-e2e/cypress.config.ts`); const e2eProcess = await runCommandUntil(`e2e ${host}-e2e`, (output) => output.includes('All specs passed!') ); @@ -470,7 +468,6 @@ describe('Angular Module Federation', () => { expect(buildRemoteOutput).toContain('Successfully ran target build'); if (runE2ETests('cypress')) { - setCypressWebServerTimeout(`${host}-e2e/cypress.config.ts`); const e2eProcess = await runCommandUntil(`e2e ${host}-e2e`, (output) => output.includes('All specs passed!') ); diff --git a/e2e/cypress/src/cypress.test.ts b/e2e/cypress/src/cypress.test.ts index 646f0f4504..8e80c004ac 100644 --- a/e2e/cypress/src/cypress.test.ts +++ b/e2e/cypress/src/cypress.test.ts @@ -7,7 +7,6 @@ import { readJson, runCLI, runE2ETests, - setCypressWebServerTimeout, uniq, updateFile, } from '@nx/e2e/utils'; @@ -77,7 +76,6 @@ describe('env vars', () => { ); if (runE2ETests('cypress')) { - setCypressWebServerTimeout(`apps/${myapp}-e2e/cypress.config.ts`); // contains the correct output and works const run1 = runCLI( `e2e ${myapp}-e2e --config \\'{\\"env\\":{\\"cliArg\\":\\"i am from the cli args\\"}}\\'` @@ -169,7 +167,6 @@ export default defineConfig({ ); if (runE2ETests('cypress')) { - setCypressWebServerTimeout(`apps/${appName}/cypress.config.ts`); expect(runCLI(`run ${appName}:component-test`)).toContain( 'All specs passed!' ); @@ -198,7 +195,6 @@ export default defineConfig({ ); if (runE2ETests('cypress')) { - setCypressWebServerTimeout(`apps/${appName}/cypress.config.ts`); expect(runCLI(`run ${appName}:component-test`)).toContain( 'All specs passed!' ); diff --git a/e2e/next-core/src/next.test.ts b/e2e/next-core/src/next.test.ts index 2eda40232e..1e550d396d 100644 --- a/e2e/next-core/src/next.test.ts +++ b/e2e/next-core/src/next.test.ts @@ -6,7 +6,6 @@ import { readFile, runCLI, runE2ETests, - setCypressWebServerTimeout, uniq, updateFile, } from '@nx/e2e/utils'; @@ -194,7 +193,6 @@ describe('Next.js Applications', () => { ); if (runE2ETests('cypress')) { - setCypressWebServerTimeout(`${appName}-e2e/cypress.config.ts`); const e2eResults = runCLI(`e2e-ci ${appName}-e2e --verbose`, { verbose: true, }); diff --git a/packages/cypress/plugins/cypress-preset.ts b/packages/cypress/plugins/cypress-preset.ts index 71e4bbc44f..7a77496abd 100644 --- a/packages/cypress/plugins/cypress-preset.ts +++ b/packages/cypress/plugins/cypress-preset.ts @@ -172,7 +172,7 @@ function waitForServer( let pollTimeout: NodeJS.Timeout | null; const { protocol } = new URL(url); - const timeoutDuration = webServerConfig?.timeout ?? 15 * 1000; + const timeoutDuration = webServerConfig?.timeout ?? 60 * 1000; const timeout = setTimeout(() => { clearTimeout(pollTimeout); reject(