Merge branch 'tgriesser/10.0-release/refactor-lifecycle' into feat/alert-with-stack

* tgriesser/10.0-release/refactor-lifecycle: (50 commits)
  Remove unused test file
  update task spec to use correct projectRoot
  update
  Fix test
  Fix test
  Fix tests
  update tests
  fix test
  correct config path
  Fix TS
  resolve conflicts
  Fixing component & e2e tests
  build: fix dev process on windows (#19401)
  fix: `cy.contains()` ignores `<style>` and `<script>` without removing them. (#19424)
  Fix some tests
  chore: Fix the broken codeowners automation (#19431)
  chore: add types for Cypress.session.clearAllSavedSessions (#19412)
  fix: No unnecessary snapshotting (#19311)
  chore: Remove pkg/driver @ts-nocheck part 1 (#19353)
  fix: add CYPRESS_VERIFY_TIMEOUT param and a test for it (#19282)
  ...

Author: tgriesser

.github/CODEOWNERS

@@ -26,4 +26,4 @@
 /packages/ts/  @cypress-io/test-runner
 /packages/ui-components/  @cypress-io/test-runner
 /packages/web-config/  @cypress-io/test-runner
-/scripts/  @cypress-io/test-runner
+/scripts/  @cypress-io/test-runner

browser-versions.json

@@ -1,4 +1,4 @@
 {
-  "chrome:beta": "96.0.4664.45",
-  "chrome:stable": "96.0.4664.45"
+  "chrome:beta": "97.0.4692.56",
+  "chrome:stable": "96.0.4664.110"
 }

circle.yml

@@ -29,6 +29,7 @@ mainBuildFilters: &mainBuildFilters
       only:
         - develop
         - 10.0-release
+        - test-binary-downstream-windows
 
 # usually we don't build Mac app - it takes a long time
 # but sometimes we want to really confirm we are doing the right thing
@@ -38,6 +39,7 @@ macWorkflowFilters: &mac-workflow-filters
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ '10.0-release', << pipeline.git.branch >> ]
+    - equal: [ renovate/cypress-request-2.x, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -47,6 +49,7 @@ windowsWorkflowFilters: &windows-workflow-filters
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
     - equal: [ '10.0-release', << pipeline.git.branch >> ]
+    - equal: [ test-binary-downstream-windows, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -1665,7 +1668,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "10.0-release" && "$CIRCLE_BRANCH" != "renovate/cypress-request-2.x" && "$CIRCLE_BRANCH" != "tgriesser/fix/patch-resolutions" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" &&  "$CIRCLE_BRANCH" != "test-binary-downstream-windows" && "$CIRCLE_BRANCH" != "10.0-release" && "$CIRCLE_BRANCH" != "renovate/cypress-request-2.x" && "$CIRCLE_BRANCH" != "tgriesser/fix/patch-resolutions" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -1750,7 +1753,12 @@ jobs:
 
   test-binary-and-npm-against-other-projects:
     <<: *defaults
-    resource_class: medium
+    parameters:
+      <<: *defaultsParameters
+      resource_class:
+        type: string
+        default: medium
+    resource_class: << parameters.resource_class >>
     steps:
       # needs uploaded NPM and test binary
       - restore_cached_workspace
@@ -1759,23 +1767,14 @@ jobs:
       - run: ls -la binary-url.json npm-package-url.json
       - run: cat binary-url.json
       - run: cat npm-package-url.json
-      - run: mkdir /tmp/testing
-      - run:
-          name: create dummy package
-          working_directory: /tmp/testing
-          command: npm init -y
       - run:
           # install NPM from unique urls
-          name: Install Cypress
+          name: Install Cypress Binary in Dummy Package
           command: |
             node scripts/test-unique-npm-and-binary.js \
               --npm npm-package-url.json \
               --binary binary-url.json \
               --cwd /tmp/testing
-      - run:
-          name: Verify Cypress binary
-          working_directory: /tmp/testing
-          command: $(yarn bin)/cypress verify
       - run:
           name: Running other test projects with new NPM package and binary
           command: |
@@ -1806,19 +1805,19 @@ jobs:
       - run:
           name: Cypress version
           working_directory: test-binary
-          command: $(yarn bin)/cypress version
+          command: $(yarn bin cypress) version
       - run:
           name: Verify Cypress binary
           working_directory: test-binary
-          command: $(yarn bin)/cypress verify
+          command: $(yarn bin cypress) verify
       - run:
           name: Cypress help
           working_directory: test-binary
-          command: $(yarn bin)/cypress help
+          command: $(yarn bin cypress) help
       - run:
           name: Cypress info
           working_directory: test-binary
-          command: $(yarn bin)/cypress info
+          command: $(yarn bin cypress) info
       - store-npm-logs
 
   test-npm-module-on-minimum-node-version:
@@ -1999,7 +1998,7 @@ jobs:
             CYPRESS_PROJECT_ID=$TEST_TINY_PROJECT_ID \
             CYPRESS_RECORD_KEY=$TEST_TINY_RECORD_KEY \
             CYPRESS_INTERNAL_ENV=staging \
-            $(yarn bin)/cypress run --record
+            $(yarn bin cypress) run --record
       - store-npm-logs
 
   test-binary-against-recipes-firefox:
@@ -2145,11 +2144,11 @@ jobs:
       - run:
           name: Cypress help
           working_directory: test-binary
-          command: $(yarn bin)/cypress help
+          command: $(yarn bin cypress) help
       - run:
           name: Cypress info
           working_directory: test-binary
-          command: $(yarn bin)/cypress info
+          command: $(yarn bin cypress) info
       - run:
           name: Add Cypress demo
           working_directory: test-binary
@@ -2165,11 +2164,11 @@ jobs:
       - run:
           name: Verify Cypress binary
           working_directory: test-binary
-          command: DEBUG=cypress:cli $(yarn bin)/cypress verify
+          command: DEBUG=cypress:cli $(yarn bin cypress) verify
       - run:
           name: Run Cypress binary
           working_directory: test-binary
-          command: DEBUG=cypress:cli $(yarn bin)/cypress run
+          command: DEBUG=cypress:cli $(yarn bin cypress) run
       - store-npm-logs
 
 linux-workflow: &linux-workflow
@@ -2584,6 +2583,14 @@ windows-workflow: &windows-workflow
         requires:
           - windows-build
 
+    - test-binary-and-npm-against-other-projects:
+        context: test-runner:trigger-test-jobs
+        name: windows-test-binary-and-npm-against-other-projects
+        executor: windows
+        resource_class: windows.medium
+        requires:
+          - windows-create-build-artifacts
+
 workflows:
   linux:
     <<: *linux-workflow

cli/lib/tasks/verify.js

@@ -15,7 +15,7 @@ const logger = require('../logger')
 const xvfb = require('../exec/xvfb')
 const state = require('./state')
 
-const VERIFY_TEST_RUNNER_TIMEOUT_MS = 30000
+const VERIFY_TEST_RUNNER_TIMEOUT_MS = process.env.CYPRESS_VERIFY_TIMEOUT || 30000
 
 const checkExecutable = (binaryDir) => {
   const executable = state.getPathToExecutable(binaryDir)

cli/test/lib/tasks/verify_spec.js

@@ -72,6 +72,14 @@ context('lib/tasks/verify', () => {
     expect(verify.VERIFY_TEST_RUNNER_TIMEOUT_MS).to.be.gt(10000)
   })
 
+  it('accepts custom verify task timeout', () => {
+    process.env.CYPRESS_VERIFY_TIMEOUT = '500000'
+    delete require.cache[require.resolve(`${lib}/tasks/verify`)]
+    const newVerifyInstance = require(`${lib}/tasks/verify`)
+
+    expect(newVerifyInstance.VERIFY_TEST_RUNNER_TIMEOUT_MS).to.be.gte(500000)
+  })
+
   it('logs error and exits when no version of Cypress is installed', () => {
     return verify
     .start()

cli/types/cypress.d.ts

@@ -319,6 +319,11 @@ declare namespace Cypress {
      */
     LocalStorage: LocalStorage
 
+    /**
+     * Internal class for session management.
+     */
+    session: Session
+
     /**
      * Current testing type, determined by the Test Runner chosen to run.
      */
@@ -3136,6 +3141,11 @@ declare namespace Cypress {
     onAnyAbort(route: RouteOptions, proxy: any): void
   }
 
+  interface Session {
+    // Clear all saved sessions and re-run the current spec file.
+    clearAllSavedSessions: () => Promise<void>
+  }
+
   type SameSiteStatus = 'no_restriction' | 'strict' | 'lax'
 
   interface SetCookieOptions extends Loggable, Timeoutable {

npm/vite-dev-server/src/makeCypressPlugin.ts

@@ -1,4 +1,4 @@
-import { resolve, posix, sep } from 'path'
+import { resolve, sep } from 'path'
 import { readFile } from 'fs'
 import { promisify } from 'util'
 import Debug from 'debug'

package.json

@@ -12,7 +12,7 @@
     "binary-release": "node ./scripts/binary.js release",
     "binary-upload": "node ./scripts/binary.js upload",
     "binary-zip": "node ./scripts/binary.js zip",
-    "build": "lerna run build --stream --no-bail --ignore create-cypress-tests && lerna run build --stream --scope create-cypress-tests",
+    "build": "lerna run build --stream --no-bail --ignore create-cypress-tests --ignore \"'@packages/{runner}'\" && lerna run build --stream --scope create-cypress-tests",
     "build-prod": "lerna run build-prod-ui --stream && lerna run build-prod --stream --ignore create-cypress-tests && lerna run build-prod --stream --scope create-cypress-tests",
     "bump": "node ./scripts/binary.js bump",
     "check-node-version": "node scripts/check-node-version.js",

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

@@ -0,0 +1,15 @@
+describe('App: Spec List', () => {
+  beforeEach(() => {
+    cy.scaffoldProject('component-tests')
+    cy.openProject('component-tests')
+    cy.startAppServer('component')
+    cy.visitApp()
+  })
+
+  it('highlights the currently running spec', () => {
+    cy.contains('fails').click()
+
+    cy.get('[data-selected-spec="true"]').should('contain', 'fails')
+    cy.get('[data-selected-spec="false"]').should('contain', 'foo')
+  })
+})

packages/app/src/runner/SnapshotControls.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="absolute inset-x-0 bottom-24">
-    <div class="h-11 flex justify-center">
+  <div class="inset-x-0 bottom-24 absolute">
+    <div class="flex justify-center children:h-11">
       <SnapshotMessage
         v-if="snapshotStore.messageTitle"
         :message-title="snapshotStore.messageTitle"

packages/app/src/runner/SpecRunner.vue

@@ -323,15 +323,23 @@ $navbar-width: 80px;
 
 <style>
 #unified-runner > div {
-  height: min(100%, 100vh);
+  height: 100%
 }
 
-iframe {
+iframe.aut-iframe {
   width: 100%;
   height: 100%;
   background: white;
 }
 
+iframe.spec-iframe {
+    border: none;
+    height: 0;
+    position: absolute;
+    visibility: hidden;
+    width: 0;
+}
+
 .highlight {
   background: rgba(159, 196, 231, 0.6);
   border: solid 2px #9FC4E7;

packages/app/src/runner/event-manager.ts

@@ -339,12 +339,8 @@ export class EventManager {
     Cypress = this.Cypress = this.$CypressDriver.create(config)
 
     // expose Cypress globally
-    // since CT AUT shares the window with the spec, we don't want to overwrite
-    // our spec Cypress instance with the component's Cypress instance
-    if (window.top === window) {
-      // @ts-ignore
-      window.Cypress = Cypress
-    }
+    // @ts-ignore
+    window.Cypress = Cypress
 
     this._addListeners()
 

packages/app/src/runs/RunsContainer.vue

@@ -3,20 +3,22 @@
     v-if="!currentProject?.projectId || !cloudViewer?.id"
     :gql="props.gql"
   />
-  <RunsEmpty
-    v-else-if="!currentProject?.cloudProject?.runs?.nodes.length"
-    :gql="currentProject"
-  />
-  <div
-    v-else
-    data-cy="runs"
-  >
-    <RunCard
-      v-for="run of currentProject?.cloudProject?.runs?.nodes"
-      :key="run.id"
-      :gql="run"
+  <template v-else-if="currentProject?.cloudProject?.__typename === 'CloudProject'">
+    <RunsEmpty
+      v-if="!currentProject?.cloudProject?.runs?.nodes.length"
+      :gql="currentProject"
     />
-  </div>
+    <div
+      v-else
+      data-cy="runs"
+    >
+      <RunCard
+        v-for="run of currentProject?.cloudProject?.runs?.nodes"
+        :key="run.id"
+        :gql="run"
+      />
+    </div>
+  </template>
 </template>
 
 <script lang="ts" setup>
@@ -33,11 +35,14 @@ fragment RunsContainer on Query {
     id
     ...RunsEmpty
     cloudProject {
-      id
-      runs(first: 10) {
-        nodes {
-          id
-          ...RunCard
+      __typename
+      ... on CloudProject {
+        id
+        runs(first: 10) {
+          nodes {
+            id
+            ...RunCard
+          }
         }
       }
     }
@@ -56,15 +61,6 @@ const currentProject = computed(() => props.gql.currentProject)
 const cloudViewer = computed(() => props.gql.cloudViewer)
 </script>
 
-<route>
-{
-  name: "Runs",
-  meta: {
-    title: "Runs"
-  }
-}
-</route>
-
 <style scoped>
 .fade-enter-active, .fade-leave-active {
   transition: opacity .3s