account for unspecified sameSite which is now available in firefox 140

Author: AtofStryker

cli/types/cypress.d.ts

@@ -3815,7 +3815,7 @@ declare namespace Cypress {
     validate?: () => Promise<false | void> | void
   }
 
-  type SameSiteStatus = 'no_restriction' | 'strict' | 'lax'
+  type SameSiteStatus = 'no_restriction' | 'strict' | 'lax' | 'unspecified'
 
   interface SelectFileOptions extends Loggable, Timeoutable, ActionableOptions {
     /**
@@ -3866,8 +3866,8 @@ declare namespace Cypress {
      */
     expiry: number
     /**
-     * The cookie's SameSite value. If set, should be one of `lax`, `strict`, or `no_restriction`.
-     * `no_restriction` is the equivalent of `SameSite=None`. Pass `undefined` to use the browser's default.
+     * The cookie's SameSite value. If set, should be one of `lax`, `strict`, `no_restriction`, or `unspecified`.
+     * `no_restriction` is the equivalent of `SameSite=None`. Pass `undefined` to use the browser's default ('unspecified' is the default for Firefox 140 and up).
      * Note: `no_restriction` can only be used if the secure flag is set to `true`.
      * @default undefined
      */

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

@@ -1377,7 +1377,7 @@ describe('src/cy/commands/cookies', () => {
       // @see https://bugzilla.mozilla.org/show_bug.cgi?id=1624668
       // TODO(webkit): pw webkit has the same issue as firefox (no "unspecified" state), need a patched binary
       if (Cypress.isBrowser('firefox') || Cypress.isBrowser('webkit')) {
-        cy.getCookie('five').should('include', { sameSite: 'no_restriction' })
+        cy.getCookie('five').should('include', { sameSite: 'unspecified' })
       } else {
         cy.getCookie('five').should('not.have.property', 'sameSite')
       }

packages/driver/cypress/e2e/e2e/e2e_cookies.cy.js

@@ -8,7 +8,7 @@ const cleanse = (cookies) => {
   })
 }
 
-const firefoxDefaultSameSite = Cypress.isBrowser({ family: 'firefox' }) ? { sameSite: 'no_restriction' } : {}
+const firefoxDefaultSameSite = Cypress.isBrowser({ family: 'firefox' }) ? { sameSite: 'unspecified' } : {}
 
 describe('e2e cookies spec', () => {
   it('simple cookie', () => {

packages/driver/cypress/e2e/e2e/origin/cookie_login.cy.ts

@@ -192,8 +192,7 @@ describe('cy.origin - cookie login', { browser: '!webkit' }, () => {
       verifyIdpNotLoggedIn({ expectNullCookie: false })
     })
 
-    // FIXME: Currently in Firefox, the default cookie setting in the extension is no_restriction, which can be set with Secure=false.
-    it('SameSite=None -> not logged in', { browser: '!firefox' }, () => {
+    it('SameSite=None -> not logged in', () => {
       cy.origin('http://www.foobar.com:3500', { args: { username } }, ({ username }) => {
         cy.get('[data-cy="username"]').type(username)
         cy.get('[data-cy="cookieProps"]').type('SameSite=None')

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

@@ -21,7 +21,7 @@ function pickCookieProps (cookie) {
 // different defaults, and Firefox lacks support for `unspecified`, so
 // `undefined` is used in lieu of `unspecified`
 // @see https://bugzilla.mozilla.org/show_bug.cgi?id=1624668
-const VALID_SAMESITE_VALUES = ['no_restriction', 'lax', 'strict']
+const VALID_SAMESITE_VALUES = ['no_restriction', 'lax', 'strict', 'unspecified']
 
 function normalizeSameSite (sameSite?: string) {
   if (_.isUndefined(sameSite)) {

system-tests/projects/e2e/cypress/e2e/cookies_spec_baseurl.cy.js

@@ -11,9 +11,9 @@ const otherHttpsUrl = Cypress.env('otherHttpsUrl')
 let defaultSameSite = undefined
 
 if (Cypress.isBrowser('firefox')) {
-  // firefox will default to "no_restriction"
+  // firefox will default to "unspecified"
   // @see https://bugzilla.mozilla.org/show_bug.cgi?id=1624668
-  defaultSameSite = 'no_restriction'
+  defaultSameSite = 'unspecified'
 }
 
 describe('cookies', () => {