e2e-tests/development-runtime/cypress/integration/navigation/redirect.js

@@ -1,26 +1,10 @@
-let spy
-Cypress.on(`window:before:load`, win => {
-  spy = cy.spy(win.console, `error`).as(`spyWinConsoleError`)
-})
-
 const runTests = () => {
   it(`should redirect page to index page when there is no such page`, () => {
     cy.visit(`/redirect-without-page`, {
       failOnStatusCode: false,
     }).waitForRouteChange()
 
     cy.location(`pathname`).should(`equal`, `/`)
-    cy.then(() => {
-      const calls = spy.getCalls()
-
-      const callsAboutRedirectMatchingPage = calls.filter(call =>
-        call.args[0].includes(
-          `matches both a page and a redirect; this is probably not intentional.`
-        )
-      )
-
-      expect(callsAboutRedirectMatchingPage.length).to.equal(0)
-    })
   })
 
   it(`should redirect page to index page even there is a such page`, () => {
@@ -29,20 +13,6 @@ const runTests = () => {
     }).waitForRouteChange()
 
     cy.location(`pathname`).should(`equal`, `/`)
-    cy.then(() => {
-      const calls = spy.getCalls()
-
-      const callsAboutRedirectMatchingPage = calls.filter(call =>
-        call.args[0].includes(
-          `matches both a page and a redirect; this is probably not intentional.`
-        )
-      )
-
-      expect(callsAboutRedirectMatchingPage.length).not.to.equal(0)
-      expect(spy).to.be.calledWith(
-        `The route "/redirect" matches both a page and a redirect; this is probably not intentional.`
-      )
-    })
   })
 
   it(`should redirect to a dynamically-created replacement page`, () => {
@@ -51,15 +21,6 @@ const runTests = () => {
     }).waitForRouteChange()
 
     cy.location(`pathname`).should(`equal`, `/pt/redirect-me/`)
-    cy.then(() => {
-      expect(spy).not.to.be.calledWith(
-        `The route "/redirect" matches both a page and a redirect; this is probably not intentional.`
-      )
-
-      cy.findByText(`This should be at /pt/redirect-me/`, {
-        exact: false,
-      }).should(`exist`)
-    })
   })
 }
 

e2e-tests/production-runtime/cypress/integration/redirects.js

@@ -1,3 +1,8 @@
+let spy
+Cypress.on(`window:before:load`, win => {
+  spy = cy.spy(win.console, `error`).as(`spyWinConsoleError`)
+})
+
 describe(`Redirects`, () => {
   it(`are case insensitive when ignoreCase is set to true`, () => {
     cy.visit(`/Longue-PAGE`, { failOnStatusCode: false }).waitForRouteChange()
@@ -9,4 +14,47 @@ describe(`Redirects`, () => {
 
     cy.get(`h1`).invoke(`text`).should(`contain`, `NOT FOUND`)
   })
+
+  it(`use redirects when preloading page-data`, () => {
+    const expectedLinks = [`/Longue-PAGE`, `/pagina-larga`]
+
+    // we should not hit those routes
+    cy.intercept("GET", "/page-data/Longue-PAGE/page-data.json").as(
+      "page-data-for-redirected-page-a"
+    )
+    cy.intercept("GET", "/page-data/pagina-larga/page-data.json").as(
+      "page-data-for-redirected-page-b"
+    )
+
+    cy.intercept("GET", "/page-data/long-page/page-data.json").as(
+      "redirected-page-data"
+    )
+
+    cy.visit(`/redirect-links/`).waitForRouteChange()
+
+    cy.get("a").each(($el, index, $list) => {
+      cy.then(() => {
+        expect($el[0].href.replace(`http://localhost:9000`, ``)).to.be.oneOf(
+          expectedLinks
+        )
+      })
+      // focus / hover links to force trigger preload
+      cy.wrap($el).trigger("mouseover")
+    })
+
+    cy.then(() => {
+      // those requests should not happen
+      cy.get("@page-data-for-redirected-page-a").should(networkCall => {
+        expect(networkCall).to.be.null
+      })
+      cy.get("@page-data-for-redirected-page-b").should(networkCall => {
+        expect(networkCall).to.be.null
+      })
+
+      // instead we want links to use redirects
+      cy.get("@redirected-page-data").should(networkCall => {
+        expect(networkCall.response.statusCode).to.be.oneOf([304, 200])
+      })
+    })
+  })
 })

e2e-tests/production-runtime/src/pages/redirect-links.js

@@ -0,0 +1,15 @@
+import * as React from "react"
+import { Link } from "gatsby"
+
+export default function RedirectLinks() {
+  return (
+    <ul>
+      <li>
+        <Link to="/Longue-PAGE">/Longue-PAGE</Link>
+      </li>
+      <li>
+        <Link to="/pagina-larga">/pagina-larga</Link>
+      </li>
+    </ul>
+  )
+}