Merge branch 'develop' into issues/23552-regression

Author: lmiller1990

circle.yml

@@ -35,7 +35,7 @@ macWorkflowFilters: &darwin-workflow-filters
   when:
     or:
     - equal: [ develop, << pipeline.git.branch >> ]
-    - equal: [ 'tbiethman/22272-globbing-working-dir', << pipeline.git.branch >> ]
+    - equal: [ 'correct-dashboard-results', << pipeline.git.branch >> ]
     - equal: [ 'skip-or-fix-flaky-tests-2', << pipeline.git.branch >> ]
     - matches:
           pattern: "-release$"
@@ -132,7 +132,7 @@ commands:
       - run:
           name: Check current branch to persist artifacts
           command: |
-            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "tbiethman/23380-root-spec-pattern" ]]; then
+            if [[ "$CIRCLE_BRANCH" != "develop" && "$CIRCLE_BRANCH" != "correct-dashboard-results" ]]; then
               echo "Not uploading artifacts or posting install comment for this branch."
               circleci-agent step halt
             fi

cli/types/cypress.d.ts

@@ -2720,6 +2720,13 @@ declare namespace Cypress {
      * @default 60000
      */
     pageLoadTimeout: number
+    /**
+     * Whether Cypress will search for and replace
+     * obstructive JS code in .js or .html files.
+     *
+     * @see https://on.cypress.io/configuration#modifyObstructiveCode
+     */
+    modifyObstructiveCode: boolean
     /**
      * Time, in milliseconds, to wait for an XHR request to go out in a [cy.wait()](https://on.cypress.io/wait) command
      * @default 5000
@@ -2968,13 +2975,6 @@ declare namespace Cypress {
      * Whether Cypress was launched via 'cypress open' (interactive mode)
      */
     isInteractive: boolean
-    /**
-     * Whether Cypress will search for and replace
-     * obstructive JS code in .js or .html files.
-     *
-     * @see https://on.cypress.io/configuration#modifyObstructiveCode
-     */
-    modifyObstructiveCode: boolean
     /**
      * The platform Cypress is running on.
      */

cli/types/tests/cypress-npm-api-test.ts

@@ -1,6 +1,6 @@
 // type tests for Cypress NPM module
 // https://on.cypress.io/module-api
-import cypress from 'cypress'
+import cypress, { defineConfig } from 'cypress'
 
 cypress.run // $ExpectType (options?: Partial<CypressRunOptions> | undefined) => Promise<CypressRunResult | CypressFailedRunResult>
 cypress.open // $ExpectType (options?: Partial<CypressOpenOptions> | undefined) => Promise<void>
@@ -51,6 +51,10 @@ cypress.run().then(results => {
   }
 })
 
+const config = defineConfig({
+  modifyObstructiveCode: true
+})
+
 // component options
 const componentConfigNextWebpack: Cypress.ConfigOptions = {
   component: {

packages/launcher/lib/browsers.ts

@@ -166,7 +166,7 @@ export function launch (
   debuggingPort: number,
   args: string[] = [],
   defaultBrowserEnv = {},
-): LaunchedBrowser {
+) {
   debug('launching browser %o', { browser, url })
 
   if (!browser.path) {

packages/server/lib/browsers/firefox.ts

@@ -531,12 +531,12 @@ export async function open (browser: Browser, url: string, options: BrowserLaunc
 
   debug('launch in firefox', { url, args: launchOptions.args })
 
-  const browserInstance = await launch(browser, 'about:blank', remotePort, launchOptions.args, {
+  const browserInstance = launch(browser, 'about:blank', remotePort, launchOptions.args, {
     // sets headless resolution to 1280x720 by default
     // user can overwrite this default with these env vars or --height, --width arguments
     MOZ_HEADLESS_WIDTH: '1280',
     MOZ_HEADLESS_HEIGHT: '721',
-  }) as unknown as BrowserInstance
+  })
 
   try {
     browserCriClient = await firefoxUtil.setup({ automation, extensions: launchOptions.extensions, url, foxdriverPort, marionettePort, remotePort, onError: options.onError, options })
@@ -561,7 +561,7 @@ export async function open (browser: Browser, url: string, options: BrowserLaunc
 
       debug('closing firefox')
 
-      originalBrowserKill.apply(browserInstance, args)
+      return originalBrowserKill.apply(browserInstance, args)
     }
   } catch (err) {
     errors.throwErr('FIREFOX_COULD_NOT_CONNECT', err)

packages/server/lib/modes/run.ts

@@ -621,6 +621,11 @@ async function waitForTestsToFinishRunning (options: { project: Project, screens
 
   results.shouldUploadVideo = shouldUploadVideo
 
+  if (!shouldUploadVideo) {
+    debug(`Spec run had no failures and config.videoUploadOnPasses=false. Skip processing video. Video path: ${videoName}`)
+    results.video = null
+  }
+
   if (!quiet && !skippedSpec) {
     printResults.displayResults(results, estimated)
   }
@@ -660,10 +665,15 @@ async function waitForTestsToFinishRunning (options: { project: Project, screens
         },
       })
     } catch (err) {
+      videoCaptureFailed = true
       warnVideoRecordingFailed(err)
     }
   }
 
+  if (videoCaptureFailed) {
+    results.video = null
+  }
+
   return results
 }
 
@@ -866,7 +876,6 @@ async function runSpec (config, spec: SpecWithRelativeRoot, options: { project:
       quiet: options.quiet,
       shouldKeepTabOpen: !isLastSpec,
     }),
-
     waitForBrowserToConnect({
       spec,
       project,

packages/server/test/unit/browsers/firefox_spec.ts

@@ -145,7 +145,7 @@ describe('lib/browsers/firefox', () => {
 
       sinon.stub(plugins, 'has')
       sinon.stub(plugins, 'execute')
-      sinon.stub(launch, 'launch').resolves(this.browserInstance)
+      sinon.stub(launch, 'launch').returns(this.browserInstance)
       sinon.stub(utils, 'writeExtension').resolves('/path/to/ext')
       sinon.spy(FirefoxProfile.prototype, 'setPreference')
       sinon.spy(FirefoxProfile.prototype, 'updatePreferences')