Merge branch 'develop' into zachw/angular-ct-source-root

Author: ZachJW34

cli/types/cypress.d.ts

@@ -362,7 +362,7 @@ declare namespace Cypress {
 
     /**
      * Utility functions for ensuring various properties about a subject.
-     * @see https://on.cypress.io/custom-queries
+     * @see https://on.cypress.io/api/custom-queries
      */
     ensure: Ensure
 
@@ -1613,7 +1613,7 @@ declare namespace Cypress {
     /**
      * Invoke a command synchronously, without using the command queue.
      *
-     * @see https://on.cypress.io/custom-queries
+     * @see https://on.cypress.io/api/custom-queries
      */
     now(name: string, ...args: any[]): Promise<any> | ((subject: any) => any)
 

guides/building-release-artifacts.md

@@ -35,4 +35,6 @@ The npm package requires a corresponding binary of the same version. In producti
 
 You can build the Cypress binary locally by running `yarn binary-build`. You can use Linux to build the Cypress binary (just like it is in CI) by running `yarn binary-build` inside of `yarn docker`.
 
-`yarn binary-zip` can be used to zip the built binary together.
+If you're on macOS and building locally, you'll need a code-signing certificate in your keychain, which you can get by following the [instructions on Apple's website](https://developer.apple.com/library/archive/documentation/Security/Conceptual/CodeSigningGuide/Procedures/Procedures.html#//apple_ref/doc/uid/TP40005929-CH4-SW30). Also, you'll also most likely want to skip notarization since it requires an Apple Developer Program account - set `SKIP_NOTARIZATION=1` when building locally to do this. [More info about code signing in CI](./code-signing.md).
+
+`yarn binary-zip` can be used to zip the built binary together.

npm/grep/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/grep-v3.1.2](https://github.com/cypress-io/cypress/compare/@cypress/grep-v3.1.1...@cypress/grep-v3.1.2) (2022-12-09)
+
+
+### Bug Fixes
+
+* declare used babel dependencies ([#24842](https://github.com/cypress-io/cypress/issues/24842)) ([910f912](https://github.com/cypress-io/cypress/commit/910f912373bf857a196e2a0d1a73606e3ee199be))
+
 # [@cypress/grep-v3.1.1](https://github.com/cypress-io/cypress/compare/@cypress/grep-v3.1.0...@cypress/grep-v3.1.1) (2022-12-08)
 
 

npm/grep/cypress/e2e/unit.js

@@ -14,6 +14,7 @@ describe('utils', () => {
   context('parseTitleGrep', () => {
     it('grabs the positive title', () => {
       const parsed = parseTitleGrep('hello w')
+
       expect(parsed).to.deep.equal({
         title: 'hello w',
         invert: false,
@@ -22,6 +23,7 @@ describe('utils', () => {
 
     it('trims the string', () => {
       const parsed = parseTitleGrep('   hello w  ')
+
       expect(parsed).to.deep.equal({
         title: 'hello w',
         invert: false,
@@ -30,6 +32,7 @@ describe('utils', () => {
 
     it('inverts the string', () => {
       const parsed = parseTitleGrep('-hello w')
+
       expect(parsed).to.deep.equal({
         title: 'hello w',
         invert: true,
@@ -38,6 +41,7 @@ describe('utils', () => {
 
     it('trims the inverted the string', () => {
       const parsed = parseTitleGrep('  -hello w  ')
+
       expect(parsed).to.deep.equal({
         title: 'hello w',
         invert: true,
@@ -46,13 +50,15 @@ describe('utils', () => {
 
     it('returns null for undefined input', () => {
       const parsed = parseTitleGrep()
+
       expect(parsed).to.equal(null)
     })
   })
 
   context('parseFullTitleGrep', () => {
     it('returns list of title greps', () => {
       const parsed = parseFullTitleGrep('hello; one; -two')
+
       expect(parsed).to.deep.equal([
         { title: 'hello', invert: false },
         { title: 'one', invert: false },
@@ -65,6 +71,7 @@ describe('utils', () => {
     it('parses AND tags', () => {
       // run only the tests with all 3 tags
       const parsed = parseTagsGrep('@tag1+@tag2+@tag3')
+
       expect(parsed).to.deep.equal([
         // single OR part
         [
@@ -78,6 +85,7 @@ describe('utils', () => {
 
     it('handles dashes in the tag', () => {
       const parsed = parseTagsGrep('@smoke+@screen-b')
+
       expect(parsed).to.deep.equal([
         [
           { tag: '@smoke', invert: false },
@@ -89,6 +97,7 @@ describe('utils', () => {
     it('parses OR tags spaces', () => {
       // run tests with tag1 OR tag2 or tag3
       const parsed = parseTagsGrep('@tag1 @tag2 @tag3')
+
       expect(parsed).to.deep.equal([
         [{ tag: '@tag1', invert: false }],
         [{ tag: '@tag2', invert: false }],
@@ -99,6 +108,7 @@ describe('utils', () => {
     it('parses OR tags commas', () => {
       // run tests with tag1 OR tag2 or tag3
       const parsed = parseTagsGrep('@tag1,@tag2,@tag3')
+
       expect(parsed).to.deep.equal([
         [{ tag: '@tag1', invert: false }],
         [{ tag: '@tag2', invert: false }],
@@ -108,11 +118,13 @@ describe('utils', () => {
 
     it('parses inverted tag', () => {
       const parsed = parseTagsGrep('-@tag1')
+
       expect(parsed).to.deep.equal([[{ tag: '@tag1', invert: true }]])
     })
 
     it('parses tag1 but not tag2 with space', () => {
       const parsed = parseTagsGrep('@tag1 -@tag2')
+
       expect(parsed).to.deep.equal([
         [{ tag: '@tag1', invert: false }],
         [{ tag: '@tag2', invert: true }],
@@ -121,6 +133,7 @@ describe('utils', () => {
 
     it('forgives extra spaces', () => {
       const parsed = parseTagsGrep('  @tag1   -@tag2 ')
+
       expect(parsed).to.deep.equal([
         [{ tag: '@tag1', invert: false }],
         [{ tag: '@tag2', invert: true }],
@@ -129,6 +142,7 @@ describe('utils', () => {
 
     it('parses tag1 but not tag2 with comma', () => {
       const parsed = parseTagsGrep('@tag1,-@tag2')
+
       expect(parsed).to.deep.equal([
         [{ tag: '@tag1', invert: false }],
         [{ tag: '@tag2', invert: true }],
@@ -137,15 +151,17 @@ describe('utils', () => {
 
     it('filters out empty tags', () => {
       const parsed = parseTagsGrep(',, @tag1,-@tag2,, ,, ,')
+
       expect(parsed).to.deep.equal([
         [{ tag: '@tag1', invert: false }],
         [{ tag: '@tag2', invert: true }],
       ])
     })
 
-    // would need to change the tokenizer
+    // TODO: would need to change the tokenizer
     it.skip('parses tag1 but not tag2', () => {
       const parsed = parseTagsGrep('@tag1-@tag2')
+
       expect(parsed).to.deep.equal([
         [
           { tag: '@tag1', invert: false },
@@ -156,8 +172,9 @@ describe('utils', () => {
 
     it('allows all tags to be inverted', () => {
       const parsed = parseTagsGrep('--@tag1,--@tag2')
+
       expect(parsed).to.deep.equal([
-        [ { tag: '@tag1', invert: true }, { tag: '@tag2', invert: true } ]
+        [{ tag: '@tag1', invert: true }, { tag: '@tag2', invert: true }],
       ])
     })
   })
@@ -170,6 +187,7 @@ describe('utils', () => {
 
     it('creates just the title grep', () => {
       const parsed = parseGrep('hello w')
+
       expect(parsed).to.deep.equal({
         title: [
           {
@@ -183,6 +201,7 @@ describe('utils', () => {
 
     it('creates object from the grep string only', () => {
       const parsed = parseGrep('hello w')
+
       expect(parsed).to.deep.equal({
         title: [
           {
@@ -224,6 +243,7 @@ describe('utils', () => {
 
     it('creates object from the grep string and tags', () => {
       const parsed = parseGrep('hello w', '@tag1+@tag2+@tag3')
+
       expect(parsed).to.deep.equal({
         title: [
           {
@@ -251,6 +271,7 @@ describe('utils', () => {
       expect(
         shouldTestRun(parsed, ['@tag1', '@tag2', '@tag3', '@tag4']),
       ).to.equal(true)
+
       // title matches, but tags do not
       expect(shouldTestRun(parsed, 'hello w', ['@tag1', '@tag2'])).to.equal(
         false,
@@ -269,6 +290,7 @@ describe('utils', () => {
     // our parsing and decision logic computes the expected result
     const shouldIt = (used, tags, expected) => {
       const parsedTags = parseTagsGrep(used)
+
       expect(
         shouldTestRunTags(parsedTags, tags),
         `"${used}" against "${tags}"`,
@@ -308,36 +330,42 @@ describe('utils', () => {
     // and apply the first argument in shouldTestRun
     const checkName = (grep, grepTags) => {
       const parsed = parseGrep(grep, grepTags)
+
       expect(parsed).to.be.an('object')
 
       return (testName, testTags = []) => {
         expect(testName, 'test title').to.be.a('string')
         expect(testTags, 'test tags').to.be.an('array')
+
         return shouldTestRun(parsed, testName, testTags)
       }
     }
 
     it('simple tag', () => {
       const parsed = parseGrep('@tag1')
+
       expect(shouldTestRun(parsed, 'no tag1 here')).to.be.false
       expect(shouldTestRun(parsed, 'has @tag1 in the name')).to.be.true
     })
 
     it('with invert title', () => {
       const t = checkName('-hello')
+
       expect(t('no greetings')).to.be.true
       expect(t('has hello world')).to.be.false
     })
 
     it('with invert option', () => {
       const t = checkName(null, '-@tag1')
+
       expect(t('no tags here')).to.be.true
       expect(t('has tag1', ['@tag1'])).to.be.false
       expect(t('has other tags', ['@tag2'])).to.be.true
     })
 
     it('with AND option', () => {
       const t = checkName('', '@tag1+@tag2')
+
       expect(t('no tag1 here')).to.be.false
       expect(t('has only @tag1', ['@tag1'])).to.be.false
       expect(t('has only @tag2', ['@tag2'])).to.be.false
@@ -346,20 +374,23 @@ describe('utils', () => {
 
     it('with OR option', () => {
       const t = checkName(null, '@tag1 @tag2')
+
       expect(t('no tag1 here')).to.be.false
       expect(t('has only @tag1 in the name', ['@tag1'])).to.be.true
       expect(t('has only @tag2 in the name', ['@tag2'])).to.be.true
       expect(t('has @tag1 and @tag2 in the name', ['@tag1', '@tag2'])).to.be
-        .true
+      .true
     })
 
     it('OR with AND option', () => {
       const t = checkName(null, '@tag1 @tag2+@tag3')
+
       expect(t('no tag1 here')).to.be.false
       expect(t('has only @tag1 in the name', ['@tag1'])).to.be.true
       expect(t('has only @tag2 in the name', ['@tag2'])).to.be.false
       expect(t('has only @tag2 in the name and also @tag3', ['@tag2', '@tag3']))
-        .to.be.true
+      .to.be.true
+
       expect(
         t('has @tag1 and @tag2 and @tag3 in the name', [
           '@tag1',
@@ -371,8 +402,9 @@ describe('utils', () => {
 
     it('Multiple invert strings and a simple one', () => {
       const t = checkName('-name;-hey;number')
+
       expect(t('number should only be matches without a n-a-m-e')).to.be.true
-      expect(t("number can't be name")).to.be.false
+      expect(t('number can\'t be name')).to.be.false
       expect(t('The man needs a name')).to.be.false
       expect(t('number hey name')).to.be.false
       expect(t('numbers hey name')).to.be.false
@@ -382,15 +414,17 @@ describe('utils', () => {
 
     it('Only inverted strings', () => {
       const t = checkName('-name;-hey')
-      expect(t("I'm matched")).to.be.true
-      expect(t("hey! I'm not")).to.be.false
+
+      expect(t('I\'m matched')).to.be.true
+      expect(t('hey! I\'m not')).to.be.false
       expect(t('My name is weird')).to.be.false
     })
   })
 
   context('parseFullTitleGrep', () => {
     const shouldIt = (search, testName, expected) => {
       const parsed = parseFullTitleGrep(search)
+
       expect(
         shouldTestRunTitle(parsed, testName),
         `"${search}" against title "${testName}"`,

npm/vite-dev-server/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/vite-dev-server-v5.0.2](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v5.0.1...@cypress/vite-dev-server-v5.0.2) (2022-12-09)
+
+
+### Bug Fixes
+
+* **vite-dev-server:** ensure assets are correctly reloaded ([#24965](https://github.com/cypress-io/cypress/issues/24965)) ([89c013f](https://github.com/cypress-io/cypress/commit/89c013fcedc2509850ec820f938d33f08f9cbb42))
+
 # [@cypress/vite-dev-server-v5.0.1](https://github.com/cypress-io/cypress/compare/@cypress/vite-dev-server-v5.0.0...@cypress/vite-dev-server-v5.0.1) (2022-12-08)
 
 

npm/webpack-preprocessor/CHANGELOG.md

@@ -1,3 +1,10 @@
+# [@cypress/webpack-preprocessor-v5.15.7](https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.15.6...@cypress/webpack-preprocessor-v5.15.7) (2022-12-09)
+
+
+### Bug Fixes
+
+* declare used babel dependencies ([#24842](https://github.com/cypress-io/cypress/issues/24842)) ([910f912](https://github.com/cypress-io/cypress/commit/910f912373bf857a196e2a0d1a73606e3ee199be))
+
 # [@cypress/webpack-preprocessor-v5.15.6](https://github.com/cypress-io/cypress/compare/@cypress/webpack-preprocessor-v5.15.5...@cypress/webpack-preprocessor-v5.15.6) (2022-12-02)
 
 

npm/webpack-preprocessor/package.json

@@ -21,7 +21,10 @@
     "lint": "eslint --ext .js,.jsx,.ts,.tsx,.json, ."
   },
   "dependencies": {
-    "@babel/parser": "7.13.0",
+    "@babel/core": "^7.0.1",
+    "@babel/generator": "^7.17.9",
+    "@babel/parser": "^7.13.0",
+    "@babel/traverse": "^7.17.9",
     "bluebird": "3.7.1",
     "debug": "^4.3.2",
     "fs-extra": "^10.1.0",
@@ -32,7 +35,6 @@
     "webpack-virtual-modules": "^0.4.4"
   },
   "devDependencies": {
-    "@babel/core": "^7.0.1",
     "@babel/plugin-proposal-nullish-coalescing-operator": "7.8.3",
     "@babel/preset-env": "^7.0.0",
     "@fellow/eslint-plugin-coffee": "0.4.13",

packages/app/cypress/e2e/cypress-in-cypress-component.cy.ts

@@ -147,7 +147,7 @@ describe('Cypress In Cypress CT', { viewportWidth: 1500, defaultCommandTimeout:
         expect(ctx.actions.browser.setActiveBrowserById).to.have.been.calledWith(browserId)
         expect(genId).to.eql('firefox-firefox-stable')
         expect(ctx.actions.project.launchProject).to.have.been.calledWith(
-          ctx.coreData.currentTestingType, undefined, o.sinon.match(new RegExp('cypress\-in\-cypress\/src\/TestComponent\.spec\.jsx$')),
+          ctx.coreData.currentTestingType, { shouldLaunchNewTab: false }, o.sinon.match(new RegExp('cypress\-in\-cypress\/src\/TestComponent\.spec\.jsx$')),
         )
       })
     })

packages/app/cypress/e2e/run-all-specs.cy.ts

@@ -45,9 +45,10 @@ describe('run-all-specs', () => {
 
     cy.waitForSpecToFinish({ passCount: 2 })
 
-    cy.withCtx((ctx, { specs }) => {
+    cy.withCtx((ctx, { specs, RUN_ALL_SPECS_KEY }) => {
+      expect(ctx.actions.project.launchProject).to.have.been.calledWith('e2e', { shouldLaunchNewTab: true }, RUN_ALL_SPECS_KEY)
       expect(ctx.project.runAllSpecs).to.include.members(specs.map((spec) => spec.relative))
-    }, { specs: subDirectorySpecs })
+    }, { specs: subDirectorySpecs, RUN_ALL_SPECS_KEY })
 
     for (const spec of subDirectorySpecs) {
       cy.get('.runnable-title').contains(spec.name)
@@ -100,10 +101,9 @@ describe('run-all-specs', () => {
 
     clickRunAllSpecs('all')
 
-    cy.withCtx((ctx, { specs, runAllSpecsKey }) => {
-      expect(ctx.actions.project.launchProject).to.have.been.calledWith('e2e', undefined, runAllSpecsKey)
+    cy.withCtx((ctx, { specs }) => {
       expect(ctx.project.runAllSpecs).to.include.members(specs.map((spec) => spec.relative))
-    }, { specs: Object.values(ALL_SPECS), runAllSpecsKey: RUN_ALL_SPECS_KEY })
+    }, { specs: Object.values(ALL_SPECS) })
 
     cy.waitForSpecToFinish({ passCount: 6 })