fix: CI Fixes related to #19308 (#19314)

* Fixing proxy_performance_spec

Author: tgriesser

packages/app/cypress/e2e/integration/settings.spec.ts

@@ -40,7 +40,6 @@ describe('Settings', { viewportWidth: 600 }, () => {
   })
 
   it('selects well known editor', () => {
-    cy.visitApp()
     cy.withCtx(async (ctx) => {
       ctx.coreData.localSettings.availableEditors = [
         ...ctx.coreData.localSettings.availableEditors,
@@ -56,6 +55,8 @@ describe('Settings', { viewportWidth: 600 }, () => {
       ctx.coreData.localSettings.preferences.preferredEditorBinary = undefined
     })
 
+    cy.visitApp()
+
     cy.get('[href="#/settings"]').click()
     cy.contains('Device Settings').click()
 

packages/data-context/src/actions/ProjectActions.ts

@@ -77,7 +77,7 @@ export class ProjectActions {
     await this.clearActiveProject()
 
     // Set initial properties, so we can set the config object on the active project
-    await this.setCurrentProjectProperties({
+    this.setCurrentProjectProperties({
       projectRoot,
       title,
       ctPluginsInitialized: false,

packages/frontend-shared/cypress/e2e/e2ePluginSetup.ts

@@ -60,9 +60,11 @@ export async function e2ePluginSetup (projectRoot: string, on: Cypress.PluginEve
   let remoteGraphQLIntercept: RemoteGraphQLInterceptor | undefined
 
   on('task', {
-    beforeEach () {
+    async beforeEach () {
+      await ctx?.destroy()
       clearCtx()
       setCtx(makeDataContext({}))
+      testState = {}
       remoteGraphQLIntercept = undefined
 
       return null
@@ -80,15 +82,13 @@ export async function e2ePluginSetup (projectRoot: string, on: Cypress.PluginEve
     async withCtx (obj: WithCtxObj) {
       // Ensure we spin up a completely isolated server/state for each test
       if (obj.activeTestId !== currentTestId) {
-        await ctx?.destroy()
-        currentTestId = obj.activeTestId
+        currentTestId = obj.activeTestId;
 
-        testState = {};
         ({ serverPortPromise, ctx } = runInternalServer({
           projectRoot: null,
         }, {
           loadCachedProjects: false,
-        }) as {ctx: DataContext, serverPortPromise: Promise<number> })
+        }) as { ctx: DataContext, serverPortPromise: Promise<number> })
 
         const fetchApi = ctx.util.fetch
 

packages/frontend-shared/cypress/e2e/support/e2eProjectDirs.ts

@@ -73,6 +73,7 @@ export const e2eProjectDirs = [
   'todos',
   'ts-installed',
   'ts-proj',
+  'ts-proj-compiler',
   'ts-proj-custom-names',
   'ts-proj-esmoduleinterop-true',
   'ts-proj-tsconfig-in-plugins',

packages/graphql/schemas/cloud.graphql

@@ -289,6 +289,15 @@ enum CloudRunStatus {
 A CloudUser represents an User stored in the Cypress Cloud
 """
 type CloudUser implements Node {
+  """
+  Url to manage cloud organizations for this user
+  """
+  cloudOrganizationsUrl: String
+
+  """
+  Url to create a cloud organization for this user
+  """
+  createCloudOrganizationUrl: String
   email: String
 
   """

packages/graphql/schemas/schema.graphql

@@ -236,6 +236,11 @@ enum CloudRunStatus {
 
 """A CloudUser represents an User stored in the Cypress Cloud"""
 type CloudUser implements Node {
+  """Url to manage cloud organizations for this user"""
+  cloudOrganizationsUrl: String
+
+  """Url to create a cloud organization for this user"""
+  createCloudOrganizationUrl: String
   email: String
 
   """The display name of the user, if we have one"""

packages/server/lib/server-e2e.ts

@@ -46,7 +46,7 @@ export class ServerE2E extends ServerBase<SocketE2E> {
   private _urlResolver: Bluebird<Record<string, any>> | null
 
   constructor (ctx: DataContext) {
-    super(getCtx())
+    super(ctx ?? getCtx())
 
     this._urlResolver = null
   }

packages/server/test/performance/proxy_performance_spec.js

@@ -1,7 +1,8 @@
 require('../spec_helper')
-const { setCtx, makeDataContext } = require('../../lib/makeDataContext')
 
-setCtx(makeDataContext({}))
+const { makeDataContext, setCtx } = require('../../lib/makeDataContext')
+
+const ctx = setCtx(makeDataContext({}))
 
 const cp = require('child_process')
 const fse = require('fs-extra')
@@ -354,7 +355,7 @@ describe('Proxy Performance', function () {
           // turn off morgan
           config.morgan = false
 
-          cyServer = new ServerE2E()
+          cyServer = new ServerE2E(ctx)
 
           return cyServer.open(config, {
             SocketCtor: SocketE2E,

packages/server/test/spec_helper.js

@@ -100,6 +100,11 @@ before(function () {
 
 const { setCtx, getCtx, clearCtx, makeDataContext } = require('../lib/makeDataContext')
 
+before(() => {
+  clearCtx()
+  setCtx(makeDataContext({}))
+})
+
 beforeEach(function () {
   clearCtx()
   setCtx(makeDataContext({}))