test: Fix basePath cases

Author: franky47

packages/e2e/next/cypress/e2e/persist-across-navigation.cy.js packages/e2e/next/cypress/e2e/persist-across-navigation.cy.ts

@@ -1,15 +1,12 @@
-/// <reference types="cypress" />
+import { expectPathname } from 'e2e-shared/lib/assertions'
 
 it('Persists search params across navigation using a generated Link href', () => {
   cy.visit('/app/persist-across-navigation/a')
   cy.contains('#hydration-marker', 'hydrated').should('be.hidden')
   cy.get('input[type=text]').type('foo', { delay: 0 })
   cy.get('input[type=checkbox]').check()
   cy.get('a').click()
-  cy.location('pathname').should(
-    'eq',
-    `${Cypress.env('basePath')}/app/persist-across-navigation/b`
-  )
+  expectPathname('/app/persist-across-navigation/b')
   cy.location('search').should('eq', '?q=foo&checked=true')
   cy.get('input[type=text]').should('have.value', 'foo')
   cy.get('input[type=checkbox]').should('be.checked')

packages/e2e/next/cypress/e2e/routing-tour.cy.js packages/e2e/next/cypress/e2e/routing-tour.cy.ts

@@ -1,14 +1,10 @@
-/// <reference types="cypress" />
+import { expectPathname } from 'e2e-shared/lib/assertions'
 
 function waitForHydration() {
   cy.contains('#hydration-marker', 'hydrated').should('be.hidden')
   cy.wait(50)
 }
 
-function expectPathname(pathname) {
-  cy.location('pathname').should('eq', Cypress.env('basePath') + pathname)
-}
-
 describe('routing-tour', () => {
   it('server -> a', () => {
     cy.visit('/app/routing-tour/start/server')

packages/e2e/shared/lib/assertions.ts

@@ -0,0 +1,5 @@
+export function expectPathname(pathname: string) {
+  const basePath = Cypress.env('basePath')
+  const expected = basePath === undefined ? pathname : basePath + pathname
+  cy.location('pathname').should('eq', expected)
+}

packages/e2e/shared/specs/flush-after-navigate.cy.ts

@@ -1,4 +1,5 @@
 import { createTest } from '../create-test'
+import { expectPathname } from '../lib/assertions'
 import { getUrl } from './flush-after-navigate.defs'
 
 export const testFlushAfterNavigate = createTest(
@@ -9,7 +10,7 @@ export const testFlushAfterNavigate = createTest(
       cy.contains('#hydration-marker', 'hydrated').should('be.hidden')
       cy.get('#test').click()
       cy.get('a').click()
-      cy.location('pathname').should('eq', path + '/end')
+      expectPathname(path + '/end')
       cy.get('#client-state').should('have.text', 'pass')
       cy.location('search').should('be.empty')
       cy.location('search').should('eq', '?test=pass') // Then it flushes
@@ -19,7 +20,7 @@ export const testFlushAfterNavigate = createTest(
       cy.contains('#hydration-marker', 'hydrated').should('be.hidden')
       cy.get('#test').click()
       cy.get('a').click()
-      cy.location('pathname').should('eq', path + '/end')
+      expectPathname(path + '/end')
       cy.get('#client-state').should('have.text', 'pass')
       cy.location('search').should('eq', '?test=nav')
       cy.location('search').should('eq', '?test=pass') // Then it flushes
@@ -30,7 +31,7 @@ export const testFlushAfterNavigate = createTest(
       cy.get('#preflush').click() // Trigger an immediate flush to enable the throttling queue
       cy.get('#test').click() // Queue the change
       cy.get('a').click() // Navigate
-      cy.location('pathname').should('eq', path + '/end')
+      expectPathname(path + '/end')
       cy.get('#client-state').should('have.text', 'pass')
       cy.location('search').should('be.empty')
       cy.location('search').should('eq', '?test=pass') // Then it flushes again
@@ -41,7 +42,7 @@ export const testFlushAfterNavigate = createTest(
       cy.get('#preflush').click() // Trigger an immediate flush to enable the throttling queue
       cy.get('#test').click() // Queue the change
       cy.get('a').click() // Navigate
-      cy.location('pathname').should('eq', path + '/end')
+      expectPathname(path + '/end')
       cy.get('#client-state').should('have.text', 'pass')
       cy.location('search').should('eq', '?test=nav')
       cy.location('search').should('eq', '?test=pass') // Then it flushes again