Merge branch 'develop' into release/15.0.0

Author: jennifer-shehane

.circleci/workflows.yml

@@ -3064,6 +3064,9 @@ linux-x64-workflow: &linux-x64-workflow
     - npm-mount-utils:
         requires:
           - build
+    - npm-grep:
+        requires:
+          - build
     - npm-eslint-plugin-dev:
         requires:
           - build
@@ -3084,6 +3087,7 @@ linux-x64-workflow: &linux-x64-workflow
           - npm-puppeteer-cypress-tests
           - npm-react
           - npm-mount-utils
+          - npm-grep
           - npm-vue
           - npm-webpack-batteries-included-preprocessor
           - npm-webpack-preprocessor
@@ -3461,6 +3465,9 @@ linux-x64-contributor-workflow: &linux-x64-contributor-workflow
     - npm-mount-utils:
         requires:
           - build
+    - npm-grep:
+        requires:
+          - build
     - npm-eslint-plugin-dev:
         requires:
           - build
@@ -3480,6 +3487,7 @@ linux-x64-contributor-workflow: &linux-x64-contributor-workflow
           - npm-puppeteer-cypress-tests
           - npm-react
           - npm-mount-utils
+          - npm-grep
           - npm-vue
           - npm-webpack-batteries-included-preprocessor
           - npm-webpack-preprocessor

cli/CHANGELOG.md

@@ -33,6 +33,8 @@ _Released 07/29/2025 (PENDING)_
 - Fixed an issue where `isSecureContext` would be `false` on localhost when testing with Cypress. Addresses [#18217](https://github.com/cypress-io/cypress/issues/18217).
 - Fixed an issue where Angular legacy `Output()` decorators were broken when making component instance field references safe. Fixes [#32137](https://github.com/cypress-io/cypress/issues/32137).
 - Upgraded `tmp` from `~0.2.3` to `~0.2.4`. This removes the [CVE-2025-54798](https://github.com/advisories/GHSA-52f5-9888-hmc6) vulnerability being reported in security scans. Addresses [#32176](https://github.com/cypress-io/cypress/issues/32176).
+- Fixed an issue where `.fixture()` calls with a specified encoding would sometimes still attempt to parse the file based on its extension. Files with an explicit encoding are now always treated as raw content. Fixes [#32139](https://github.com/cypress-io/cypress/issues/32139).
+- Fixed an issue where `.fixture()` calls with different encoding options would return inconsistent content based on execution order. Fixes [#32138](https://github.com/cypress-io/cypress/issues/32138).
 
 **Misc:**
 

packages/driver/cypress/e2e/commands/fixtures.cy.js

@@ -265,6 +265,26 @@ describe('src/cy/commands/fixtures', () => {
           })
         })
       })
+
+      it('should respect encoding specification', () => {
+        const fixture = 'comma-separated.csv'
+
+        cy.fixture(fixture, 'base64').then((content) => {
+          cy.wrap(content).should('eq', 'T25lLFR3byxUaHJlZQoxLDIsMwo=')
+          cy.wrap(content).as('base64')
+        })
+
+        cy.fixture(fixture).then((content) => {
+          cy.wrap(content).should('eq', 'One,Two,Three\n1,2,3\n')
+          cy.wrap(content).as('utf8')
+        })
+
+        cy.get('@base64').then((base64) => {
+          cy.get('@utf8').then((utf8) => {
+            cy.wrap(base64).should('not.eq', utf8)
+          })
+        })
+      })
     })
   })
 })

packages/driver/src/cy/commands/fixtures.ts

@@ -28,20 +28,6 @@ export default (Commands, Cypress, cy, state, config) => {
         $errUtils.throwErrByPath('fixture.set_to_false')
       }
 
-      // if we already have cached
-      // this fixture then just return it
-
-      // always return a promise here
-      // to make our interface consistent
-      // for use by other code
-      const resp = cache[fixture]
-
-      if (resp) {
-        // clone the object first to prevent
-        // accidentally mutating the one in the cache
-        return Promise.resolve(clone(resp))
-      }
-
       let options: Record<string, any> = {}
 
       if (_.isObject(args[0])) {
@@ -54,6 +40,14 @@ export default (Commands, Cypress, cy, state, config) => {
         options.encoding = args[0]
       }
 
+      const cacheKey = `${fixture}\u0000${options.encoding || ''}`
+      const cachedContent = cache[cacheKey]
+
+      if (cachedContent) {
+        // Clone the cached content to prevent accidental mutation.
+        return Promise.resolve(clone(cachedContent))
+      }
+
       const timeout = options.timeout ?? Cypress.config('responseTimeout')
 
       // need to remove the current timeout
@@ -81,7 +75,7 @@ export default (Commands, Cypress, cy, state, config) => {
 
         // add the fixture to the cache
         // so it can just be returned next time
-        cache[fixture] = response
+        cache[cacheKey] = response
 
         // Add the filename as a symbol, in case we need it later (such as when storing an alias)
         state('current').set('fileName', basename(fixture))

packages/server/lib/fixture.js

@@ -125,13 +125,10 @@ module.exports = {
   },
 
   parseFileByExtension (p, fixture, ext, options = {}) {
-    // https://github.com/cypress-io/cypress/issues/1558
-    // If the user explicitly specifies `null` as the encoding, we treat the
-    // file as binary regardless of extension. We base64 encode them for
-    // transmission over the websocket. There is a matching Buffer.from()
-    // in packages/driver/src/cy/commands/fixtures.ts
-    if (options.encoding === null) {
-      return this.parse(p, fixture)
+    // If an encoding is specified, return the raw file content instead of
+    // parsing.
+    if (typeof options.encoding !== 'undefined') {
+      return this.parse(p, fixture, options.encoding)
     }
 
     switch (ext) {

packages/server/test/unit/fixture_spec.js

@@ -167,6 +167,22 @@ describe('lib/fixture', () => {
         })
       })
     })
+
+    it('should return encoded JSON', async function () {
+      const fixtures = [
+        { encoding: '', content: Buffer.from('[{"json": true}]') },
+        { encoding: 'base64', content: 'W3sianNvbiI6IHRydWV9XQ==' },
+        { encoding: 'utf8', content: '[{"json": true}]' },
+        { encoding: null, content: Buffer.from('[{"json": true}]') },
+        { encoding: undefined, content: [{ json: true }] },
+      ]
+
+      for (const { encoding, content } of fixtures) {
+        const result = await fixture.get(this.fixturesFolder, 'foo', { encoding })
+
+        expect(result).to.deep.equal(content)
+      }
+    })
   })
 
   context('js files', () => {