Merge branch '10.0-release' into alejandro/fix/ct-cli-viewport

Author: estrada9166

browser-versions.json

@@ -1,4 +1,4 @@
 {
   "chrome:beta": "100.0.4896.60",
-  "chrome:stable": "99.0.4844.84"
+  "chrome:stable": "100.0.4896.60"
 }

circle.yml

@@ -29,6 +29,7 @@ mainBuildFilters: &mainBuildFilters
       only:
         - develop
         - 10.0-release
+        - 10.0-use-contexts
 
 # 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: [ 10.0-use-contexts, << 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: [ 10.0-use-contexts, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -419,9 +422,9 @@ commands:
             echo Current working directory is $PWD
             echo Total containers $CIRCLE_NODE_TOTAL
 
-            if [[ -v PACKAGES_RECORD_KEY ]]; then
+            if [[ -v MAIN_RECORD_KEY ]]; then
               # internal PR
-              CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
+              CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
               yarn cypress:run --record --parallel --group 5x-driver-<<parameters.browser>> --browser <<parameters.browser>>
             else
               # external PR
@@ -1416,7 +1419,7 @@ jobs:
       - run:
           command: |
             CYPRESS_KONFIG_ENV=production \
-            CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
+            CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
             PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \
             PERCY_ENABLE=${PERCY_TOKEN:-0} \
             PERCY_PARALLEL_TOTAL=-1 \
@@ -1440,7 +1443,7 @@ jobs:
       - run:
           command: |
             CYPRESS_KONFIG_ENV=production \
-            CYPRESS_RECORD_KEY=$PACKAGES_RECORD_KEY \
+            CYPRESS_RECORD_KEY=$MAIN_RECORD_KEY \
             yarn cypress:run --record --parallel --group ui-components
           working_directory: packages/ui-components
       - verify-mocha-results
@@ -1553,7 +1556,6 @@ jobs:
       - run:
           name: Run tests
           # will use PERCY_TOKEN environment variable if available
-          #
           command: |
             CYPRESS_KONFIG_ENV=production \
             PERCY_PARALLEL_NONCE=$CIRCLE_SHA1 \
@@ -1629,26 +1631,26 @@ jobs:
           command: yarn workspace @cypress/eslint-plugin-dev test
 
   npm-cypress-schematic:
-      <<: *defaults
-      resource_class: small
-      steps:
-        - restore_cached_workspace
-        - run:
-            name: Build + Install
-            command: |
-              yarn workspace @cypress/schematic build:all
-            working_directory: npm/cypress-schematic
-        - run:
-            name: Launch
-            command: |
-              yarn launch:test
-            working_directory: npm/cypress-schematic
-        - run:
-            name: Run unit tests
-            command: |
-              yarn test
-            working_directory: npm/cypress-schematic
-        - store-npm-logs
+    <<: *defaults
+    resource_class: small
+    steps:
+      - restore_cached_workspace
+      - run:
+          name: Build + Install
+          command: |
+            yarn workspace @cypress/schematic build:all
+          working_directory: npm/cypress-schematic
+      - run:
+          name: Launch
+          command: |
+            yarn launch:test
+          working_directory: npm/cypress-schematic
+      - run:
+          name: Run unit tests
+          command: |
+            yarn test
+          working_directory: npm/cypress-schematic
+      - store-npm-logs
 
   npm-release:
     <<: *defaults
@@ -1675,7 +1677,7 @@ jobs:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "marktnoonan/backmerge-develop-3-8-22" && "$CIRCLE_BRANCH" != "10.0-release" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "10.0-use-contexts" && "$CIRCLE_BRANCH" != "10.0-release" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -2148,6 +2150,7 @@ linux-workflow: &linux-workflow
           - build
     # unit, integration and e2e tests
     - cli-visual-tests:
+        context: test-runner:percy
         requires:
           - build
     - unit-tests:
@@ -2188,46 +2191,52 @@ linux-workflow: &linux-workflow
         requires:
           - system-tests-node-modules-install
     - driver-integration-tests-chrome:
+        context: test-runner:cypress-record-key
         requires:
           - build
     - driver-integration-tests-chrome-beta:
+        context: test-runner:cypress-record-key
         requires:
           - build
     - driver-integration-tests-firefox:
+        context: test-runner:cypress-record-key
         requires:
           - build
     - driver-integration-tests-electron:
+        context: test-runner:cypress-record-key
         requires:
           - build
     - run-frontend-shared-component-tests-chrome:
-        context: test-runner:launchpad-tests
+        context: [test-runner:launchpad-tests, test-runner:percy]
         percy: true
         requires:
           - build
     - run-launchpad-integration-tests-chrome:
-        context: test-runner:launchpad-tests
+        context: [test-runner:launchpad-tests, test-runner:percy]
         percy: true
         requires:
           - build
     - run-launchpad-component-tests-chrome:
-        context: test-runner:launchpad-tests
+        context: [test-runner:launchpad-tests, test-runner:percy]
         percy: true
         requires:
           - build
     - run-app-integration-tests-chrome:
-        context: test-runner:launchpad-tests
+        context: [test-runner:launchpad-tests, test-runner:percy]
         percy: true
         requires:
           - build
     - run-app-component-tests-chrome:
-        context: test-runner:launchpad-tests
+        context: [test-runner:launchpad-tests, test-runner:percy]
         percy: true
         requires:
           - build
     - reporter-integration-tests:
+        context: [test-runner:cypress-record-key, test-runner:percy]
         requires:
           - build
     - ui-components-integration-tests:
+        context: test-runner:cypress-record-key
         requires:
           - build
     - npm-webpack-dev-server:
@@ -2243,6 +2252,7 @@ linux-workflow: &linux-workflow
         requires:
           - build
     - npm-design-system:
+        context: test-runner:percy
         requires:
           - build
     - npm-vue:

packages/app/src/runner/SpecRunnerHeaderOpenMode.vue

@@ -171,26 +171,6 @@ fragment SpecRunnerHeader_Browser on Browser {
 }
 `
 
-gql`
-mutation SpecRunnerHeader_SetBrowser($browserId: ID!, $specPath: String!) {
-  launchpadSetBrowser(id: $browserId) {
-    id
-    currentBrowser {
-      id
-      displayName
-      majorVersion
-    }
-    browsers {
-      id
-      isSelected
-    }
-  }
-  launchOpenProject(specPath: $specPath) {
-    id
-  }
-}
-`
-
 const { t } = useI18n()
 
 const autStore = useAutStore()

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

@@ -28,6 +28,10 @@ abstract class DataEmitterEvents {
     this._emit('cloudViewerChange')
   }
 
+  /**
+   * Emitted when the browserStatus field has changed due to the browser
+   * having opened or closed.
+   */
   browserStatusChange () {
     this._emit('browserStatusChange')
   }

packages/data-context/test/unit/sources/GitDataSource.spec.ts

@@ -46,19 +46,19 @@ describe('GitDataSource', () => {
       ctx.git.gitInfo(xhrSpec),
     ])
 
-    expect(created.lastModifiedHumanReadable).to.match(/(a few|[0-9]) second?s ago/)
+    expect(created.lastModifiedHumanReadable).to.match(/(a few|[0-9]) seconds? ago/)
     expect(created.statusType).to.eql('created')
     // do not want to set this explicitly in the test, since it can mess up your local git instance
     expect(created.author).not.to.be.undefined
     expect(created.lastModifiedTimestamp).not.to.be.undefined
 
-    expect(unmodified.lastModifiedHumanReadable).to.match(/(a few|[0-9]) second?s ago/)
+    expect(unmodified.lastModifiedHumanReadable).to.match(/(a few|[0-9]) seconds? ago/)
     expect(unmodified.statusType).to.eql('unmodified')
     // do not want to set this explicitly in the test, since it can mess up your local git instance
     expect(unmodified.author).not.to.be.undefined
     expect(unmodified.lastModifiedTimestamp).not.to.be.undefined
 
-    expect(modified.lastModifiedHumanReadable).to.match(/(a few|[0-9]) second?s ago/)
+    expect(modified.lastModifiedHumanReadable).to.match(/(a few|[0-9]) seconds? ago/)
     expect(modified.statusType).to.eql('modified')
     // do not want to set this explicitly in the test, since it can mess up your local git instance
     expect(modified.author).not.to.be.undefined

packages/driver/cypress/e2e/commands/querying/root.cy.js

@@ -35,6 +35,16 @@ describe('src/cy/commands/querying', () => {
       cy.root().should('have.class', 'foo').and('have.class', 'bar')
     })
 
+    // https://github.com/cypress-io/cypress/issues/19985
+    it('respects timeout option', (done) => {
+      cy.on('fail', (err) => {
+        expect(err.message).to.not.contain('4000ms')
+        done()
+      })
+
+      cy.root({ timeout: 50 }).should('contain', 'root world')
+    })
+
     describe('.log', () => {
       beforeEach(function () {
         this.logs = []

packages/driver/src/cy/commands/querying/root.ts

@@ -29,7 +29,10 @@ export default (Commands, Cypress, cy, state) => {
         return log(withinSubject)
       }
 
-      return cy.now('get', 'html', { log: false }).then(log)
+      return cy.now('get', 'html', {
+        log: false,
+        timeout: options.timeout,
+      }).then(log)
     },
   })
 }

packages/launchpad/cypress/e2e/choose-a-browser.cy.ts

@@ -1,3 +1,5 @@
+import type { FoundBrowser } from '@packages/types/src'
+
 describe('Choose a Browser Page', () => {
   beforeEach(() => {
     cy.scaffoldProject('launchpad')
@@ -174,8 +176,8 @@ describe('Choose a Browser Page', () => {
 
       cy.get('h1').should('contain', 'Choose a Browser')
 
-      cy.withCtx((ctx) => {
-        ctx.actions.project.launchProject = sinon.spy()
+      cy.withCtx((ctx, o) => {
+        ctx.actions.project.launchProject = o.sinon.spy()
       })
 
       cy.intercept('mutation-OpenBrowser_LaunchProject', cy.stub().as('launchProject'))
@@ -217,8 +219,8 @@ describe('Choose a Browser Page', () => {
 
       cy.intercept('mutation-OpenBrowser_FocusActiveBrowserWindow').as('focusBrowser')
 
-      cy.withCtx((ctx) => {
-        sinon.spy(ctx.actions.browser, 'focusActiveBrowserWindow')
+      cy.withCtx((ctx, o) => {
+        o.sinon.spy(ctx.actions.browser, 'focusActiveBrowserWindow')
       })
 
       cy.get('@focusButton').click()
@@ -238,9 +240,9 @@ describe('Choose a Browser Page', () => {
       })
 
       cy.openProject('launchpad', ['--e2e'])
-      cy.withCtx((ctx) => {
+      cy.withCtx((ctx, o) => {
         ctx.project.setRelaunchBrowser(true)
-        ctx.actions.project.launchProject = sinon.stub()
+        ctx.actions.project.launchProject = o.sinon.stub()
       })
 
       cy.visitLaunchpad()
@@ -251,6 +253,34 @@ describe('Choose a Browser Page', () => {
         expect(ctx.actions.project.launchProject).to.have.been.called
       })
     })
+
+    it('subscribes to changes to browserStatus/currentBrowser through the browserStatusUpdated subscription', () => {
+      cy.openProject('launchpad', ['--e2e'])
+
+      cy.visitLaunchpad()
+
+      cy.get('h1').should('contain', 'Choose a Browser')
+
+      cy.findByRole('radio', { name: 'Chrome v1', checked: true }).as('chromeItem')
+
+      cy.contains('button', 'Start E2E Testing in Chrome').should('be.visible').click()
+
+      cy.withCtx((ctx) => {
+        ctx.browser.setBrowserStatus('open')
+      })
+
+      cy.contains('button', 'Running Chrome')
+
+      // Updating active browser in conjunction with the browser status to ensure that changes to
+      // both are reflected in the UI.
+      cy.withCtx((ctx) => {
+        ctx.actions.app.setActiveBrowser(ctx.lifecycleManager.browsers!.find((browser) => browser.name === 'firefox') as FoundBrowser)
+        ctx.browser.setBrowserStatus('closed')
+      })
+
+      cy.contains('button', 'Start E2E Testing in Firefox').should('be.visible')
+      cy.findByRole('radio', { name: 'Firefox v5', checked: true }).should('be.visible')
+    })
   })
 
   describe('No System Browsers Detected', () => {