From 89acf9c8a5e6220f645eb4b2a72a27b056d010e0 Mon Sep 17 00:00:00 2001
From: Bill Glesias <bglesias@gmail.com>
Date: Mon, 18 Jul 2022 18:24:01 -0400
Subject: [PATCH 1/3] chore: add types to screenshots (#22768)

* chore: add types to screenshots

* remove wrong reference to event property and opt for Event
---
 packages/driver/src/cy/commands/screenshot.ts | 101 +++++++++++-------
 packages/driver/src/cypress/log.ts            |   1 +
 packages/driver/src/cypress/screenshot.ts     |   2 +-
 packages/driver/src/cypress/utils.ts          |   4 +-
 packages/driver/src/dom/animation.ts          |   4 +-
 packages/driver/src/dom/blackout.ts           |   8 +-
 6 files changed, 73 insertions(+), 47 deletions(-)

diff --git a/packages/driver/src/cy/commands/screenshot.ts b/packages/driver/src/cy/commands/screenshot.ts
index c0c392ab23ec..b04ffdff1292 100644
--- a/packages/driver/src/cy/commands/screenshot.ts
+++ b/packages/driver/src/cy/commands/screenshot.ts
@@ -9,17 +9,42 @@ import $dom from '../../dom'
 import $errUtils from '../../cypress/error_utils'
 import $utils from '../../cypress/utils'
 import type { Log } from '../../cypress/log'
+import type { StateFunc } from '../../cypress/state'
 
-const getViewportHeight = (state) => {
+interface InternalScreenshotOptions extends Partial<Cypress.Loggable & Cypress.Timeoutable & Cypress.ScreenshotOptions> {
+  _log?: Log
+}
+
+type Scroll = {
+  y: number
+  clip?: Cypress.ScreenshotOptions['clip']
+  afterScroll?: () => Cypress.Dimensions
+}
+
+type TakeScreenshotOptions = {
+  name?: string
+  subject?: JQuery<HTMLElement>
+  simple?: boolean
+  testFailure?: boolean
+  runnable: (Mocha.Test | Mocha.Hook) & {
+    id: string
+  }
+  log?: Log
+  timeout?: number
+}
+
+type AutomationOptions = TakeScreenshotOptions & Omit<Cypress.ScreenshotOptions, 'onBeforeScreenshot'| 'onAfterScreenshot' | 'disableTimersAndAnimations' | 'scale' | 'padding'> & Partial<Cypress.ScreenshotOptions>
+
+const getViewportHeight = (state: StateFunc) => {
   // TODO this doesn't seem correct
   return Math.min(state('viewportHeight'), window.innerHeight)
 }
 
-const getViewportWidth = (state) => {
+const getViewportWidth = (state: StateFunc) => {
   return Math.min(state('viewportWidth'), window.innerWidth)
 }
 
-const automateScreenshot = (state, options: TakeScreenshotOptions = {}) => {
+const automateScreenshot = (state: StateFunc, options: TakeScreenshotOptions) => {
   const { runnable, timeout } = options
 
   const titles: string[] = []
@@ -27,7 +52,7 @@ const automateScreenshot = (state, options: TakeScreenshotOptions = {}) => {
   // if this a hook then push both the current test title
   // and our own hook title
   if (runnable.type === 'hook') {
-    let ct = runnable.ctx.currentTest
+    let ct = runnable.ctx?.currentTest
 
     if (runnable.ctx && ct) {
       titles.push(ct.title, runnable.title)
@@ -56,6 +81,7 @@ const automateScreenshot = (state, options: TakeScreenshotOptions = {}) => {
     titles,
     testId: runnable.id,
     takenPaths: state('screenshotPaths'),
+    // @ts-ignore
     testAttemptIndex: $utils.getTestFromRunnable(runnable)._currentRetry,
   }, _.omit(options, 'runnable', 'timeout', 'log', 'subject'))
 
@@ -84,7 +110,7 @@ const automateScreenshot = (state, options: TakeScreenshotOptions = {}) => {
   })
 }
 
-const scrollOverrides = (win, doc) => {
+const scrollOverrides = (win: Window, doc: Document) => {
   const originalOverflow = doc.documentElement.style.overflow
   const originalBodyOverflowY = doc.body.style.overflowY
   const originalX = win.scrollX
@@ -108,7 +134,8 @@ const scrollOverrides = (win, doc) => {
   // since we scroll down the page in takeScrollingScreenshots
   // and don't want the page size to change once we start
   // https://github.com/cypress-io/cypress/issues/6099
-  win.dispatchEvent(new win.Event('scroll'))
+
+  win.dispatchEvent(new Event('scroll'))
 
   return () => {
     doc.documentElement.style.overflow = originalOverflow
@@ -122,7 +149,7 @@ const scrollOverrides = (win, doc) => {
   }
 }
 
-const validateNumScreenshots = (numScreenshots, automationOptions) => {
+const validateNumScreenshots = (numScreenshots: number, automationOptions: AutomationOptions) => {
   if (numScreenshots < 1) {
     $errUtils.throwErrByPath('screenshot.invalid_height', {
       log: automationOptions.log,
@@ -130,8 +157,8 @@ const validateNumScreenshots = (numScreenshots, automationOptions) => {
   }
 }
 
-const takeScrollingScreenshots = (scrolls, win, state, automationOptions) => {
-  const scrollAndTake = ({ y, clip, afterScroll }, index) => {
+const takeScrollingScreenshots = (scrolls: Scroll[], win: Window, state: StateFunc, automationOptions: AutomationOptions) => {
+  const scrollAndTake = ({ y, clip, afterScroll }: Scroll, index) => {
     win.scrollTo(0, y)
     if (afterScroll) {
       clip = afterScroll()
@@ -151,7 +178,7 @@ const takeScrollingScreenshots = (scrolls, win, state, automationOptions) => {
   .then(_.last)
 }
 
-const takeFullPageScreenshot = (state, automationOptions) => {
+const takeFullPageScreenshot = (state: StateFunc, automationOptions: AutomationOptions) => {
   const win = state('window')
   const doc = state('document')
 
@@ -187,11 +214,12 @@ const takeFullPageScreenshot = (state, automationOptions) => {
   .finally(resetScrollOverrides)
 }
 
-const applyPaddingToElementPositioning = (elPosition, automationOptions) => {
+const applyPaddingToElementPositioning = (elPosition: Cypress.ElementPositioning, automationOptions: AutomationOptions) => {
   if (!automationOptions.padding) {
     return elPosition
   }
 
+  // @ts-ignore
   const [paddingTop, paddingRight, paddingBottom, paddingLeft] = automationOptions.padding
 
   return {
@@ -208,7 +236,7 @@ const applyPaddingToElementPositioning = (elPosition, automationOptions) => {
   }
 }
 
-const takeElementScreenshot = ($el, state, automationOptions) => {
+const takeElementScreenshot = ($el: JQuery<HTMLElement>, state: StateFunc, automationOptions: AutomationOptions) => {
   const win = state('window')
   const doc = state('document')
 
@@ -224,7 +252,7 @@ const takeElementScreenshot = ($el, state, automationOptions) => {
 
   validateNumScreenshots(numScreenshots, automationOptions)
 
-  const scrolls = _.map(_.times(numScreenshots), (index) => {
+  const scrolls: Scroll[] = _.map(_.times(numScreenshots), (index) => {
     const y = elPosition.fromElWindow.top + (viewportHeight * index)
 
     const afterScroll = () => {
@@ -274,30 +302,30 @@ const takeElementScreenshot = ($el, state, automationOptions) => {
 }
 
 // "app only" means we're hiding the runner UI
-const isAppOnly = ({ capture }) => {
+const isAppOnly = ({ capture }: { capture: Cypress.ScreenshotOptions['capture']}) => {
   return (capture === 'viewport') || (capture === 'fullPage')
 }
 
-const getShouldScale = ({ capture, scale }) => {
+const getShouldScale = ({ capture, scale }: {
+  capture: Cypress.ScreenshotOptions['capture']
+  scale: Cypress.ScreenshotOptions['scale']
+}) => {
   return isAppOnly({ capture }) ? scale : true
 }
 
-const getBlackout = ({ capture, blackout }) => {
+const getBlackout = ({ capture, blackout }: {
+  capture: Cypress.ScreenshotOptions['capture']
+  blackout: Cypress.ScreenshotOptions['blackout']
+}) => {
   return isAppOnly({ capture }) ? blackout : []
 }
 
-// TODO: anys should be removed.
-type TakeScreenshotOptions = {
-  name?: string
-  subject?: any
-  simple?: boolean
-  testFailure?: boolean
-  runnable?: any
-  log?: any
-  timeout?: number
-}
-
-const takeScreenshot = (Cypress, state, screenshotConfig, options: TakeScreenshotOptions = {}) => {
+const takeScreenshot = (
+  Cypress: Cypress.Cypress,
+  state: StateFunc,
+  screenshotConfig: Partial<Cypress.ScreenshotOptions> & Pick<Cypress.ScreenshotOptions, 'capture' | 'scale' | 'blackout' | 'overwrite'>,
+  options: TakeScreenshotOptions,
+) => {
   const {
     capture,
     padding,
@@ -326,7 +354,8 @@ const takeScreenshot = (Cypress, state, screenshotConfig, options: TakeScreensho
   const getOptions = (isOpen) => {
     return {
       id: runnable.id,
-      testAttemptIndex: $utils.getTestFromRunnable(runnable)._currentRetry,
+      // @ts-ignore
+      testAttemptIndex: $utils.getTestFromRunnable(runnable)?._currentRetry,
       isOpen,
       appOnly: isAppOnly(screenshotConfig),
       scale: getShouldScale(screenshotConfig),
@@ -337,7 +366,7 @@ const takeScreenshot = (Cypress, state, screenshotConfig, options: TakeScreensho
     }
   }
 
-  const before = ($body, $container) => {
+  const before = ($body: JQuery<HTMLBodyElement>, $container: JQuery<HTMLElement>) => {
     return Promise.try(() => {
       if (disableTimersAndAnimations) {
         return cy.pauseTimers(true)
@@ -366,7 +395,7 @@ const takeScreenshot = (Cypress, state, screenshotConfig, options: TakeScreensho
     })
   }
 
-  const after = ($body) => {
+  const after = ($body: JQuery<HTMLBodyElement>) => {
     // could fail if iframe is cross-origin, so fail gracefully
     try {
       if (disableTimersAndAnimations) {
@@ -392,7 +421,7 @@ const takeScreenshot = (Cypress, state, screenshotConfig, options: TakeScreensho
     })
   }
 
-  const automationOptions = _.extend({}, options, {
+  const automationOptions: AutomationOptions = _.extend({}, options, {
     capture,
     clip: {
       x: 0,
@@ -413,13 +442,13 @@ const takeScreenshot = (Cypress, state, screenshotConfig, options: TakeScreensho
   })
 
   // use the subject as $el or yield the wrapped documentElement
-  const $el = $dom.isElement(subject)
+  const $el: JQuery<HTMLElement> = $dom.isElement(subject)
     ? subject
     : $dom.wrap(state('document').documentElement)
 
   // get the current body of the AUT to accurately calculate screenshot blackouts
   // as well as properly enable/disable CSS animations while screenshotting is happening
-  const $body = Cypress.$('body')
+  const $body: JQuery<HTMLBodyElement> = Cypress.$('body')
 
   return before($body, $el)
   .then(() => {
@@ -451,10 +480,6 @@ const takeScreenshot = (Cypress, state, screenshotConfig, options: TakeScreensho
   .finally(() => after($body))
 }
 
-interface InternalScreenshotOptions extends Partial<Cypress.Loggable & Cypress.Timeoutable & Cypress.ScreenshotOptions> {
-  _log?: Log
-}
-
 export default function (Commands, Cypress, cy, state, config) {
   // failure screenshot when not interactive
   Cypress.on('runnable:after:run:async', (test, runnable) => {
diff --git a/packages/driver/src/cypress/log.ts b/packages/driver/src/cypress/log.ts
index a2869227d462..6bec5bf54100 100644
--- a/packages/driver/src/cypress/log.ts
+++ b/packages/driver/src/cypress/log.ts
@@ -179,6 +179,7 @@ const defaults = function (state: StateFunc, config, obj) {
 
     const t = $utils.getTestFromRunnable(runnable)
 
+    // @ts-ignore
     return t._currentRetry || 0
   }
 
diff --git a/packages/driver/src/cypress/screenshot.ts b/packages/driver/src/cypress/screenshot.ts
index d9648a232db8..e24bb6f627ad 100644
--- a/packages/driver/src/cypress/screenshot.ts
+++ b/packages/driver/src/cypress/screenshot.ts
@@ -3,7 +3,7 @@ import _ from 'lodash'
 import $utils from './utils'
 import $errUtils from './error_utils'
 
-const _reset = () => {
+const _reset = (): Pick<Cypress.ScreenshotDefaultsOptions, 'capture' | 'scale' | 'disableTimersAndAnimations' | 'screenshotOnRunFailure' | 'blackout' | 'overwrite' | 'onBeforeScreenshot' | 'onAfterScreenshot'> => {
   return {
     capture: 'fullPage',
     scale: false,
diff --git a/packages/driver/src/cypress/utils.ts b/packages/driver/src/cypress/utils.ts
index ef4f7d0f576e..bce7d4df618c 100644
--- a/packages/driver/src/cypress/utils.ts
+++ b/packages/driver/src/cypress/utils.ts
@@ -312,8 +312,8 @@ export default {
     return Math.sqrt((deltaX * deltaX) + (deltaY * deltaY))
   },
 
-  getTestFromRunnable (r) {
-    return r.ctx.currentTest || r
+  getTestFromRunnable (r: Mocha.Runnable) {
+    return r.ctx?.currentTest || r
   },
 
   memoize (func, cacheInstance = new Map()) {
diff --git a/packages/driver/src/dom/animation.ts b/packages/driver/src/dom/animation.ts
index e18c2b2c2a31..42282d04a570 100644
--- a/packages/driver/src/dom/animation.ts
+++ b/packages/driver/src/dom/animation.ts
@@ -1,6 +1,6 @@
 import $ from 'jquery'
 
-function addCssAnimationDisabler ($body) {
+function addCssAnimationDisabler ($body: JQuery<HTMLBodyElement>) {
   $(`
     <style id="__cypress-animation-disabler">
       *, *:before, *:after {
@@ -11,7 +11,7 @@ function addCssAnimationDisabler ($body) {
   `).appendTo($body)
 }
 
-function removeCssAnimationDisabler ($body) {
+function removeCssAnimationDisabler ($body: JQuery<HTMLBodyElement>) {
   $body.find('#__cypress-animation-disabler').remove()
 }
 
diff --git a/packages/driver/src/dom/blackout.ts b/packages/driver/src/dom/blackout.ts
index 864f7a6913e0..00744496c32a 100644
--- a/packages/driver/src/dom/blackout.ts
+++ b/packages/driver/src/dom/blackout.ts
@@ -11,7 +11,7 @@ const styles = (styleString) => {
   return styleString.replace(/\s*\n\s*/g, '')
 }
 
-function addBlackoutForElement ($body, $el) {
+function addBlackoutForElement ($body: JQuery<HTMLBodyElement>, $el: JQuery<HTMLElement>) {
   const dimensions = $dimensions.getElementDimensions($el)
   const width = dimensions.widthWithBorder
   const height = dimensions.heightWithBorder
@@ -32,8 +32,8 @@ function addBlackoutForElement ($body, $el) {
   $(`<div class="__cypress-blackout" style="${style}">`).appendTo($body)
 }
 
-function addBlackouts ($body, $container, selector) {
-  let $el
+function addBlackouts ($body: JQuery<HTMLBodyElement>, $container: JQuery<HTMLElement>, selector: string) {
+  let $el: JQuery<HTMLElement>
 
   try {
     // only scope blacked out elements to to screenshotted element, not necessarily the whole body
@@ -49,7 +49,7 @@ function addBlackouts ($body, $container, selector) {
   })
 }
 
-function removeBlackouts ($body) {
+function removeBlackouts ($body: JQuery<HTMLBodyElement>) {
   $body.find('.__cypress-blackout').remove()
 }
 

From 2aa7b93ea1f891bf96e0baf1fb1b426827519562 Mon Sep 17 00:00:00 2001
From: rockindahizzy <25568640+rockindahizzy@users.noreply.github.com>
Date: Mon, 18 Jul 2022 19:34:15 -0500
Subject: [PATCH 2/3] fix: Correct pluralization in Spec Pattern (#22773)

* fix: Correct pluralization in Spec Pattern

* update failing e2e tests

Co-authored-by: Zachary Williams <ZachJW34@gmail.com>
Co-authored-by: Lachlan Miller <lachlan.miller.1990@outlook.com>
---
 packages/app/cypress/e2e/specs.cy.ts          |  6 ++--
 .../app/src/components/SpecPatterns.cy.tsx    | 34 ++++++++++++++++++-
 packages/app/src/components/SpecPatterns.vue  | 10 ++----
 .../frontend-shared/src/locales/en-US.json    |  2 +-
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/packages/app/cypress/e2e/specs.cy.ts b/packages/app/cypress/e2e/specs.cy.ts
index d71a2e703e12..4502f63d8902 100644
--- a/packages/app/cypress/e2e/specs.cy.ts
+++ b/packages/app/cypress/e2e/specs.cy.ts
@@ -61,7 +61,7 @@ describe('App: Specs', () => {
         }).should('be.visible').within(() => {
           cy.validateExternalLink({ name: 'Need help', href: 'https://on.cypress.io/test-type-options' })
           cy.findByRole('button', { name: 'Close' }).should('be.visible').as('CloseDialogButton')
-          cy.get('[data-cy="file-match-indicator"]').contains('0 Matches')
+          cy.get('[data-cy="file-match-indicator"]').contains('No Matches')
           cy.get('[data-cy="spec-pattern"]').contains('cypress/e2e/**/*.cy.{js,jsx,ts,tsx}')
         })
 
@@ -320,7 +320,7 @@ describe('App: Specs', () => {
         .should('be.visible')
         .and('contain', defaultMessages.createSpec.page.customPatternNoSpecs.description.split('{0}')[0])
 
-        cy.findByTestId('file-match-indicator').should('contain', '0 Matches')
+        cy.findByTestId('file-match-indicator').should('contain', 'No Matches')
         cy.findByRole('button', { name: 'cypress.config.js' })
         cy.findByTestId('spec-pattern').should('contain', 'src/**/*.{cy,spec}.{js,jsx}')
 
@@ -652,7 +652,7 @@ describe('App: Specs', () => {
         .should('be.visible')
         .and('contain', defaultMessages.createSpec.page.customPatternNoSpecs.description.split('{0}')[0])
 
-        cy.findByTestId('file-match-indicator').should('contain', '0 Matches')
+        cy.findByTestId('file-match-indicator').should('contain', 'No Matches')
         cy.findByRole('button', { name: 'cypress.config.js' })
         cy.findByTestId('spec-pattern').should('contain', 'src/specs-folder/*.cy.{js,jsx}')
 
diff --git a/packages/app/src/components/SpecPatterns.cy.tsx b/packages/app/src/components/SpecPatterns.cy.tsx
index c81bff023f93..c7a4e0b526e0 100644
--- a/packages/app/src/components/SpecPatterns.cy.tsx
+++ b/packages/app/src/components/SpecPatterns.cy.tsx
@@ -30,7 +30,7 @@ describe('<SpecPatterns />', () => {
     cy.get('[data-cy="file-match-indicator"]').contains('50 Matches')
   })
 
-  it('renders component spec pattern should not show matches', () => {
+  it('renders component spec pattern should not show matches verbiage', () => {
     cy.mountFragment(SpecPatternsFragmentDoc, {
       onResult: (res) => {
         if (!res) {
@@ -46,4 +46,36 @@ describe('<SpecPatterns />', () => {
     cy.get('[data-cy="spec-pattern"]').contains('**/*.cy.{js,jsx,ts,tsx}')
     cy.get('[data-cy="file-match-indicator"]').should('contain', 'specPattern')
   })
+
+  it('displays `No Matches` when specs are empty', () => {
+    cy.mountFragment(SpecPatternsFragmentDoc, {
+      onResult: (res) => {
+        if (!res) {
+          return
+        }
+
+        res.currentTestingType = 'component'
+        res.specs = []
+      },
+      render: (gql) => <div class="p-16px"><SpecPatterns gql={gql}/></div>,
+    })
+
+    cy.get('[data-cy="file-match-indicator"]').contains('No Matches')
+  })
+
+  it('displays `1 Match` when specs has 1 element', () => {
+    cy.mountFragment(SpecPatternsFragmentDoc, {
+      onResult: (res) => {
+        if (!res) {
+          return
+        }
+
+        res.currentTestingType = 'component'
+        res.specs = res.specs.slice(0, 1) || []
+      },
+      render: (gql) => <div class="p-16px"><SpecPatterns gql={gql}/></div>,
+    })
+
+    cy.get('[data-cy="file-match-indicator"]').contains('1 Match')
+  })
 })
diff --git a/packages/app/src/components/SpecPatterns.vue b/packages/app/src/components/SpecPatterns.vue
index 7492d34f6fa7..dc67be9fd12e 100644
--- a/packages/app/src/components/SpecPatterns.vue
+++ b/packages/app/src/components/SpecPatterns.vue
@@ -3,13 +3,7 @@
     <div class="flex p-16px items-center justify-between">
       <FileMatchIndicator :variant="props.variant">
         <span v-if="props.variant === 'info'">specPattern</span>
-        <i18n-t
-          v-else
-          scope="global"
-          keypath="components.specPattern.matches"
-        >
-          {{ props.gql.specs.length }}
-        </i18n-t>
+        <span v-else>{{ t('components.specPattern.matches', props.gql.specs.length) }}</span>
       </FileMatchIndicator>
       <OpenConfigFileInIDE
         v-slot="{onClick}"
@@ -41,6 +35,7 @@
 <script lang="ts" setup>
 import { computed } from 'vue'
 import { gql } from '@urql/core'
+import { useI18n } from 'vue-i18n'
 import type { SpecPatternsFragment } from '../generated/graphql'
 import OpenConfigFileInIDE from '@packages/frontend-shared/src/gql-components/OpenConfigFileInIDE.vue'
 import FileMatchIndicator from './FileMatchIndicator.vue'
@@ -58,6 +53,7 @@ fragment SpecPatterns on CurrentProject {
 }
 `
 
+const { t } = useI18n()
 const props = defineProps<{
   gql: SpecPatternsFragment
   variant?: 'default' | 'info'
diff --git a/packages/frontend-shared/src/locales/en-US.json b/packages/frontend-shared/src/locales/en-US.json
index e06a36897650..0a91b2e4968d 100644
--- a/packages/frontend-shared/src/locales/en-US.json
+++ b/packages/frontend-shared/src/locales/en-US.json
@@ -33,7 +33,7 @@
       "dismissAriaLabel": "Dismiss"
     },
     "specPattern": {
-      "matches": "{0} Matches"
+      "matches": "No Matches | {n} Match | {n} Matches"
     },
     "specPatternModal": {
       "title": "Spec pattern settings"

From 1da95a7db1317bd6c66a7d9bf6ba6f8dd5b7d620 Mon Sep 17 00:00:00 2001
From: Chris Breiding <chrisbreiding@users.noreply.github.com>
Date: Tue, 19 Jul 2022 10:28:46 -0400
Subject: [PATCH 3/3] fix: Determine global mode based on whether there is a
 current project (#22838)

Co-authored-by: Mark Noonan <mark@cypress.io>
---
 circle.yml                                      | 17 +++++++----------
 cli/lib/exec/open.js                            |  6 ++++++
 .../cypress/e2e/e2ePluginSetup.ts               | 17 +++++++++++++----
 .../cypress/e2e/support/e2eSupport.ts           |  9 +++++++--
 packages/graphql/schemas/schema.graphql         |  4 +++-
 .../src/schemaTypes/objectTypes/gql-Query.ts    |  4 ++--
 .../launchpad/cypress/e2e/global-mode.cy.ts     | 16 +++++++++++++++-
 7 files changed, 53 insertions(+), 20 deletions(-)

diff --git a/circle.yml b/circle.yml
index 39e4681f3f9b..9af034d3404b 100644
--- a/circle.yml
+++ b/circle.yml
@@ -27,7 +27,7 @@ mainBuildFilters: &mainBuildFilters
     branches:
       only:
         - develop
-        - issue-22147-nohoist
+        - global-mode-issue
 
 # 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
@@ -36,8 +36,7 @@ macWorkflowFilters: &darwin-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ linux-arm64, << pipeline.git.branch >> ]
-    - equal: [ 'tbiethman/UNIFY-1816-prototype', << pipeline.git.branch >> ]
+    - equal: [ 'global-mode-issue', << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -46,7 +45,6 @@ linuxArm64WorkflowFilters: &linux-arm64-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ linux-arm64, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -65,7 +63,6 @@ windowsWorkflowFilters: &windows-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ linux-arm64, << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
           value: << pipeline.git.branch >>
@@ -129,7 +126,7 @@ commands:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tbiethman/UNIFY-1816-prototype" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "global-mode-issue" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi
@@ -658,7 +655,7 @@ commands:
         ## by default, assert that at least 1 test ran
         default: 0
     steps:
-      - run: 
+      - run:
           name: 'Verify Mocha Results'
           command: |
             source ./scripts/ensure-node.sh
@@ -1614,7 +1611,7 @@ jobs:
           path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
-      - store-npm-logs      
+      - store-npm-logs
 
   run-vite-dev-server-integration-tests:
     <<: *defaults
@@ -1636,7 +1633,7 @@ jobs:
           path: /tmp/cypress
       - store_artifacts:
           path: /tmp/artifacts
-      - store-npm-logs            
+      - store-npm-logs
 
   ui-components-integration-tests:
     <<: *defaults
@@ -2363,7 +2360,7 @@ linux-x64-workflow: &linux-x64-workflow
     - run-vite-dev-server-integration-tests:
         context: [test-runner:cypress-record-key, test-runner:percy]
         requires:
-          - system-tests-node-modules-install          
+          - system-tests-node-modules-install
     - run-app-component-tests-chrome:
         context: [test-runner:cypress-record-key, test-runner:launchpad-tests, test-runner:percy]
         percy: true
diff --git a/cli/lib/exec/open.js b/cli/lib/exec/open.js
index 777eed730f46..c77fdc639900 100644
--- a/cli/lib/exec/open.js
+++ b/cli/lib/exec/open.js
@@ -15,6 +15,12 @@ const { exitWithError } = require('../errors')
  * @returns {string[]} list of CLI arguments
  */
 const processOpenOptions = (options = {}) => {
+  // In addition to setting the project directory, setting the project option
+  // here ultimately decides whether cypress is run in global mode or not.
+  // It's first based off whether it's installed globally by npm/yarn (-g).
+  // A global install can be overridden by the --project flag, putting Cypress
+  // in project mode. A non-global install can be overridden by the --global
+  // flag, putting it in global mode.
   if (!util.isInstalledGlobally() && !options.global && !options.project) {
     options.project = process.cwd()
   }
diff --git a/packages/frontend-shared/cypress/e2e/e2ePluginSetup.ts b/packages/frontend-shared/cypress/e2e/e2ePluginSetup.ts
index e883f643cb64..c6b7285f75fe 100644
--- a/packages/frontend-shared/cypress/e2e/e2ePluginSetup.ts
+++ b/packages/frontend-shared/cypress/e2e/e2ePluginSetup.ts
@@ -1,7 +1,7 @@
 import path from 'path'
 import execa from 'execa'
 
-import type { CyTaskResult, RemoteGraphQLInterceptor, ResetOptionsResult, WithCtxInjected, WithCtxOptions } from './support/e2eSupport'
+import type { CyTaskResult, OpenGlobalModeOptions, RemoteGraphQLInterceptor, ResetOptionsResult, WithCtxInjected, WithCtxOptions } from './support/e2eSupport'
 import { fixtureDirs } from '@tooling/system-tests'
 // import type { CloudExecuteRemote } from '@packages/data-context/src/sources'
 import { makeGraphQLServer } from '@packages/graphql/src/makeGraphQLServer'
@@ -86,6 +86,7 @@ async function makeE2ETasks () {
   const { scaffoldCommonNodeModules, scaffoldProjectNodeModules } = require('@tooling/system-tests/lib/dep-installer')
 
   const cli = require('../../../../cli/lib/cli')
+  const cliUtil = require('../../../../cli/lib/util')
   const cliOpen = require('../../../../cli/lib/exec/open')
 
   // Remove all the fixtures when the plugin starts
@@ -288,12 +289,18 @@ async function makeE2ETasks () {
       return Fixtures.projectPath(opts.projectName)
     },
     __internal_scaffoldProject,
-    async __internal_openGlobal (argv: string[] = []): Promise<ResetOptionsResult> {
-      const openArgv = ['--global', ...argv]
+    async __internal_openGlobal ({ argv = [], byFlag = true }: OpenGlobalModeOptions): Promise<ResetOptionsResult> {
+      let isInstalledGloballyStub
+
+      if (byFlag) {
+        argv.unshift('--global')
+      } else {
+        isInstalledGloballyStub = sinon.stub(cliUtil, 'isInstalledGlobally').returns(true)
+      }
 
       // Runs the launchArgs through the whole pipeline for the CLI open process,
       // which probably needs a bit of refactoring / consolidating
-      const cliOptions = await cli.parseOpenCommand(['open', ...openArgv])
+      const cliOptions = await cli.parseOpenCommand(['open', ...argv])
       const processedArgv = cliOpen.processOpenOptions(cliOptions)
       const modeOptions = { ...argUtils.toObject(processedArgv), invokedFromCli: true }
 
@@ -303,6 +310,8 @@ async function makeE2ETasks () {
       // Handle any pre-loading that should occur based on the launch arg settings
       await ctx.initializeMode()
 
+      isInstalledGloballyStub?.restore()
+
       return {
         modeOptions,
         e2eServerPort: ctx.appServerPort,
diff --git a/packages/frontend-shared/cypress/e2e/support/e2eSupport.ts b/packages/frontend-shared/cypress/e2e/support/e2eSupport.ts
index c94b1c6bf81b..d5fb5dfd0f72 100644
--- a/packages/frontend-shared/cypress/e2e/support/e2eSupport.ts
+++ b/packages/frontend-shared/cypress/e2e/support/e2eSupport.ts
@@ -198,9 +198,14 @@ export interface ResetOptionsResult {
   e2eServerPort?: number | null
 }
 
-function openGlobalMode (argv?: string[]) {
+export interface OpenGlobalModeOptions {
+  argv?: string[]
+  byFlag?: boolean
+}
+
+function openGlobalMode (options: OpenGlobalModeOptions = {}) {
   return logInternal({ name: 'openGlobalMode', message: '' }, () => {
-    return taskInternal('__internal_openGlobal', argv)
+    return taskInternal('__internal_openGlobal', options)
   }).then((obj) => {
     Cypress.env('e2e_serverPort', obj.e2eServerPort)
 
diff --git a/packages/graphql/schemas/schema.graphql b/packages/graphql/schemas/schema.graphql
index a7e475655fa0..219444950c20 100644
--- a/packages/graphql/schemas/schema.graphql
+++ b/packages/graphql/schemas/schema.graphql
@@ -1442,7 +1442,9 @@ type Query {
   """
   invokedFromCli: Boolean!
 
-  """Whether the app is in global mode or not"""
+  """
+  Whether the app is in global mode or not. This is based off the presence of a project, which is set by the CLI (or absent if the app is run directly). See cli/lib/exec/open.js for the logic that sets the project or not.
+  """
   isGlobalMode: Boolean!
 
   """local settings on a device-by-device basis"""
diff --git a/packages/graphql/src/schemaTypes/objectTypes/gql-Query.ts b/packages/graphql/src/schemaTypes/objectTypes/gql-Query.ts
index e4f637dc3058..71da5316c788 100644
--- a/packages/graphql/src/schemaTypes/objectTypes/gql-Query.ts
+++ b/packages/graphql/src/schemaTypes/objectTypes/gql-Query.ts
@@ -78,8 +78,8 @@ export const Query = objectType({
     })
 
     t.nonNull.boolean('isGlobalMode', {
-      description: 'Whether the app is in global mode or not',
-      resolve: (source, args, ctx) => Boolean(ctx.modeOptions.global),
+      description: 'Whether the app is in global mode or not. This is based off the presence of a project, which is set by the CLI (or absent if the app is run directly). See cli/lib/exec/open.js for the logic that sets the project or not.',
+      resolve: (source, args, ctx) => !ctx.modeOptions.project,
     })
 
     t.nonNull.field('authState', {
diff --git a/packages/launchpad/cypress/e2e/global-mode.cy.ts b/packages/launchpad/cypress/e2e/global-mode.cy.ts
index 83549e8affab..ce4251ffecc5 100644
--- a/packages/launchpad/cypress/e2e/global-mode.cy.ts
+++ b/packages/launchpad/cypress/e2e/global-mode.cy.ts
@@ -6,6 +6,20 @@ import { getPathForPlatform } from './support/getPathForPlatform'
 const sep = Cypress.platform === 'win32' ? '\\' : '/'
 
 describe('Launchpad: Global Mode', () => {
+  describe('methods of opening global mode', () => {
+    it('shows global page when opened by --global flag', () => {
+      cy.openGlobalMode()
+      cy.visitLaunchpad()
+      cy.get('h1').should('contain', defaultMessages.globalPage.empty.title)
+    })
+
+    it('shows global page when opened by global install', () => {
+      cy.openGlobalMode({ byFlag: false })
+      cy.visitLaunchpad()
+      cy.get('h1').should('contain', defaultMessages.globalPage.empty.title)
+    })
+  })
+
   describe('when no projects have been added', () => {
     it('shows "Add Project" view', () => {
       cy.openGlobalMode()
@@ -71,7 +85,7 @@ describe('Launchpad: Global Mode', () => {
 
   describe('when projects have been added', () => {
     const setupAndValidateProjectsList = (projectList, globalModeOptions?: string[] | undefined) => {
-      cy.openGlobalMode(globalModeOptions)
+      cy.openGlobalMode({ argv: globalModeOptions })
 
       // Adding a project puts the project first in the list, so we reverse the list
       // to ensure the projectList in the UI matches what is passed in.