diff --git a/circle.yml b/circle.yml index 0021d1d991f9..1c0f5ed6a45d 100644 --- a/circle.yml +++ b/circle.yml @@ -98,7 +98,7 @@ executors: machine: image: windows-server-2019-vs2019:stable shell: bash.exe -eo pipefail - resource_class: windows.medium + resource_class: windows.xlarge environment: PLATFORM: windows @@ -2581,21 +2581,21 @@ windows-workflow: &windows-workflow - node_modules_install: name: windows-node-modules-install executor: windows - resource_class: windows.medium + resource_class: windows.xlarge only-cache-for-root-user: true - build: name: windows-build context: test-runner:env-canary executor: windows - resource_class: windows.medium + resource_class: windows.xlarge requires: - windows-node-modules-install - run-app-integration-tests-chrome: name: windows-run-app-integration-tests-chrome executor: windows - resource_class: windows.medium + resource_class: windows.xlarge context: test-runner:launchpad-tests requires: - windows-build @@ -2603,7 +2603,7 @@ windows-workflow: &windows-workflow - run-launchpad-integration-tests-chrome: name: windows-run-launchpad-integration-tests-chrome executor: windows - resource_class: windows.medium + resource_class: windows.xlarge context: test-runner:launchpad-tests requires: - windows-build @@ -2619,7 +2619,7 @@ windows-workflow: &windows-workflow <<: *full-windows-workflow-filters name: windows-unit-tests executor: windows - resource_class: windows.medium + resource_class: windows.xlarge requires: - windows-build @@ -2627,7 +2627,7 @@ windows-workflow: &windows-workflow <<: *full-windows-workflow-filters name: windows-create-build-artifacts executor: windows - resource_class: windows.medium + resource_class: windows.xlarge context: - test-runner:sign-windows-binary - test-runner:upload diff --git a/packages/app/cypress/e2e/subscriptions/authChange-subscription.cy.ts b/packages/app/cypress/e2e/subscriptions/authChange-subscription.cy.ts index ce1638901648..6ea15de793d6 100644 --- a/packages/app/cypress/e2e/subscriptions/authChange-subscription.cy.ts +++ b/packages/app/cypress/e2e/subscriptions/authChange-subscription.cy.ts @@ -31,6 +31,7 @@ describe('authChange subscription', () => { it('responds to authChange subscription for login', () => { cy.contains('Log In') + cy.wait(500) cy.withCtx(async (ctx) => { await ctx.actions.auth.login() }) @@ -42,6 +43,7 @@ describe('authChange subscription', () => { setActiveUser() cy.reload() // Reload to show the latest state cy.contains('Test User') + cy.wait(500) cy.withCtx(async (ctx) => { await ctx.actions.auth.logout() }) @@ -58,6 +60,7 @@ describe('authChange subscription', () => { it('responds to authChange subscription for login', () => { cy.contains('Log In') + cy.wait(500) cy.withCtx(async (ctx) => { await ctx.actions.auth.login() }) @@ -69,6 +72,7 @@ describe('authChange subscription', () => { setActiveUser() cy.reload() // Reload to show the latest state cy.contains('Test User') + cy.wait(500) cy.withCtx(async (ctx) => { await ctx.actions.auth.logout() }) @@ -84,6 +88,7 @@ describe('authChange subscription', () => { it('responds to authChange subscription for login', () => { cy.contains('Log In') + cy.wait(500) cy.withCtx(async (ctx) => { await ctx.actions.auth.login() }) @@ -95,6 +100,7 @@ describe('authChange subscription', () => { setActiveUser() cy.visitLaunchpad() cy.contains('Test User') + cy.wait(500) cy.withCtx(async (ctx) => { await ctx.actions.auth.logout() }) diff --git a/packages/app/cypress/e2e/top-nav.cy.ts b/packages/app/cypress/e2e/top-nav.cy.ts index 0c75a2095b71..2fd31713cadf 100644 --- a/packages/app/cypress/e2e/top-nav.cy.ts +++ b/packages/app/cypress/e2e/top-nav.cy.ts @@ -226,6 +226,7 @@ describe('App Top Nav Workflows', () => { const oldFetch = ctx.util.fetch o.sinon.stub(ctx.util, 'fetch').callsFake(async (url: RequestInfo | URL, init?: RequestInit) => { + await new Promise((resolve) => setTimeout(resolve, 500)) if (['https://download.cypress.io/desktop.json', 'https://registry.npmjs.org/cypress'].includes(String(url))) { throw new Error(String(url)) } diff --git a/packages/data-context/src/data/ProjectConfigIpc.ts b/packages/data-context/src/data/ProjectConfigIpc.ts index c287d58bb7b9..ade85bb69a9b 100644 --- a/packages/data-context/src/data/ProjectConfigIpc.ts +++ b/packages/data-context/src/data/ProjectConfigIpc.ts @@ -9,13 +9,14 @@ import inspector from 'inspector' import debugLib from 'debug' import { autoBindDebug, hasTypeScriptInstalled } from '../util' import _ from 'lodash' +import { pathToFileURL } from 'url' const pkg = require('@packages/root') const debug = debugLib(`cypress:lifecycle:ProjectConfigIpc`) const CHILD_PROCESS_FILE_PATH = require.resolve('@packages/server/lib/plugins/child/require_async_child') -const tsNodeEsm = require.resolve('ts-node/esm/transpile-only') +const tsNodeEsm = pathToFileURL(require.resolve('ts-node/esm/transpile-only')).href const tsNode = require.resolve('@packages/server/lib/plugins/child/register_ts_node') export type IpcHandler = (ipc: ProjectConfigIpc) => void diff --git a/packages/launchpad/cypress/e2e/slow-network.cy.ts b/packages/launchpad/cypress/e2e/slow-network.cy.ts index 00fc56dad960..b15e78e8ef42 100644 --- a/packages/launchpad/cypress/e2e/slow-network.cy.ts +++ b/packages/launchpad/cypress/e2e/slow-network.cy.ts @@ -42,6 +42,7 @@ describe('slow network: launchpad', () => { cy.visitLaunchpad() cy.get('[data-cy=top-nav-cypress-version-current-link]').should('not.exist') cy.contains('Log In') + cy.wait(500) cy.withCtx(async (ctx, o) => { o.testState.pendingFetches.map((f) => f.resolve()) })