Skip to content

Commit

Permalink
fix: windows (#22234)
Browse files Browse the repository at this point in the history
  • Loading branch information
ryanthemanuel committed Jun 10, 2022
1 parent 85f002f commit 600daef
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 8 deletions.
14 changes: 7 additions & 7 deletions circle.yml
Expand Up @@ -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

Expand Down Expand Up @@ -2581,29 +2581,29 @@ 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

- 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
Expand All @@ -2619,15 +2619,15 @@ 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

- create-build-artifacts:
<<: *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
Expand Down
Expand Up @@ -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()
})
Expand All @@ -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()
})
Expand All @@ -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()
})
Expand All @@ -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()
})
Expand All @@ -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()
})
Expand All @@ -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()
})
Expand Down
1 change: 1 addition & 0 deletions packages/app/cypress/e2e/top-nav.cy.ts
Expand Up @@ -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))
}
Expand Down
3 changes: 2 additions & 1 deletion packages/data-context/src/data/ProjectConfigIpc.ts
Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions packages/launchpad/cypress/e2e/slow-network.cy.ts
Expand Up @@ -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())
})
Expand Down

3 comments on commit 600daef

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 600daef Jun 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the linux x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/10.1.0/linux-x64/develop-600daef5cd6b17833f853622749573715253bfa3/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 600daef Jun 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the darwin x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/10.1.0/darwin-x64/develop-600daef5cd6b17833f853622749573715253bfa3/cypress.tgz

@cypress-bot
Copy link
Contributor

@cypress-bot cypress-bot bot commented on 600daef Jun 10, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Circle has built the win32 x64 version of the Test Runner.

Learn more about this pre-release platform-specific build at https://on.cypress.io/installing-cypress#Install-pre-release-version.

Run this command to install the pre-release locally:

npm install https://cdn.cypress.io/beta/npm/10.1.0/win32-x64/develop-600daef5cd6b17833f853622749573715253bfa3/cypress.tgz

Please sign in to comment.