test(gatsby): Trailing slash client only splat (#34538)

gatsbyjs · Jan 24, 2022 · dd8cc06 · dd8cc06
1 parent 159969b
commit dd8cc06
Show file tree

Hide file tree

Showing 9 changed files with 227 additions and 74 deletions.
diff --git a/e2e-tests/trailing-slash/cypress/integration/always.js b/e2e-tests/trailing-slash/cypress/integration/always.js
@@ -26,6 +26,16 @@ describe(`always`, () => {
     cy.getTestElement(`fs-api-without`).click()
     cy.waitForRouteChange().assertRoute(`/fs-api/without/`)
   })
+  it(`fs-api client only splat without slash`, () => {
+    cy.getTestElement(`fs-api-client-only-without`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/without/without/`)
+    cy.getTestElement(`title`).should(`have.text`, `without`)
+  })
+  it(`fs-api client only splat with slash`, () => {
+    cy.getTestElement(`fs-api-client-only-with`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/with/with/`)
+    cy.getTestElement(`title`).should(`have.text`, `with`)
+  })
   it(`fs-api-simple with slash`, () => {
     cy.getTestElement(`fs-api-simple-with`).click()
     cy.waitForRouteChange().assertRoute(`/fs-api-simple/with/`)
@@ -62,25 +72,25 @@ describe(`always`, () => {
     cy.getTestElement(`query-param-hash`).click()
     cy.waitForRouteChange().assertRoute(`/page-2/?query_param=hello#anchor`)
   })
-  it(`client-only-simple without slash`, () => {
+  it(`client-only without slash`, () => {
     cy.getTestElement(`client-only-simple-without`).click()
     cy.waitForRouteChange().assertRoute(`/client-only/without/`)
     cy.getTestElement(`title`).should(`have.text`, `without`)
   })
-  it(`client-only-simple with slash`, () => {
+  it(`client-only with slash`, () => {
     cy.getTestElement(`client-only-simple-with`).click()
     cy.waitForRouteChange().assertRoute(`/client-only/with/`)
     cy.getTestElement(`title`).should(`have.text`, `with`)
   })
-  it(`client-only without slash`, () => {
-    cy.getTestElement(`client-only-without`).click()
-    cy.waitForRouteChange().assertRoute(`/fs-api/without/without/`)
-    cy.getTestElement(`title`).should(`have.text`, `without`)
+  it(`client-only-splat without slash`, () => {
+    cy.getTestElement(`client-only-splat-without`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only-splat/without/without/`)
+    cy.getTestElement(`title`).should(`have.text`, `without/without`)
   })
-  it(`client-only with slash`, () => {
-    cy.getTestElement(`client-only-with`).click()
-    cy.waitForRouteChange().assertRoute(`/fs-api/with/with/`)
-    cy.getTestElement(`title`).should(`have.text`, `with`)
+  it(`client-only-splat with slash`, () => {
+    cy.getTestElement(`client-only-splat-with`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only-splat/with/with/`)
+    cy.getTestElement(`title`).should(`have.text`, `with/with`)
   })
 })
 
@@ -111,25 +121,35 @@ describe(`always (direct visits)`, () => {
       .waitForRouteChange()
       .assertRoute(`/fs-api-simple/without/`)
   })
-  it(`client-only-simple with`, () => {
+  it(`fs-api client only splat with`, () => {
+    cy.visit(`/fs-api/with/with/`)
+      .waitForRouteChange()
+      .assertRoute(`/fs-api/with/with/`)
+  })
+  it(`fs-api client only splat without`, () => {
+    cy.visit(`/fs-api/without/without`)
+      .waitForRouteChange()
+      .assertRoute(`/fs-api/without/without/`)
+  })
+  it(`client-only with`, () => {
     cy.visit(`/client-only/with/`)
       .waitForRouteChange()
       .assertRoute(`/client-only/with/`)
   })
-  it(`client-only-simple without`, () => {
+  it(`client-only without`, () => {
     cy.visit(`/client-only/without`)
       .waitForRouteChange()
       .assertRoute(`/client-only/without/`)
   })
-  it(`client-only with`, () => {
-    cy.visit(`/fs-api/with/with/`)
+  it(`client-only-splat with`, () => {
+    cy.visit(`/client-only-splat/with/with/`)
       .waitForRouteChange()
-      .assertRoute(`/fs-api/with/with/`)
+      .assertRoute(`/client-only-splat/with/with/`)
   })
-  it(`client-only without`, () => {
-    cy.visit(`/fs-api/without/without`)
+  it(`client-only-splat without`, () => {
+    cy.visit(`/client-only-splat/without/without`)
       .waitForRouteChange()
-      .assertRoute(`/fs-api/without/without/`)
+      .assertRoute(`/client-only-splat/without/without/`)
   })
   it(`query-param-hash with`, () => {
     cy.visit(`/page-2/?query_param=hello#anchor`)

diff --git a/e2e-tests/trailing-slash/cypress/integration/ignore.js b/e2e-tests/trailing-slash/cypress/integration/ignore.js
@@ -18,13 +18,23 @@ describe(`ignore`, () => {
     cy.getTestElement(`create-page-without`).click()
     cy.waitForRouteChange().assertRoute(`/create-page/without`)
   })
-  it(`fs-api-simple with slash`, () => {
-    cy.getTestElement(`fs-api-simple-with`).click()
-    cy.waitForRouteChange().assertRoute(`/fs-api-simple/with/`)
+  it(`fs-api with slash`, () => {
+    cy.getTestElement(`fs-api-with`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/with/`)
   })
-  it(`fs-api-simple without slash`, () => {
-    cy.getTestElement(`fs-api-simple-without`).click()
-    cy.waitForRouteChange().assertRoute(`/fs-api-simple/without`)
+  it(`fs-api without slash`, () => {
+    cy.getTestElement(`fs-api-without`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/without`)
+  })
+  it(`fs-api client only splat without slash`, () => {
+    cy.getTestElement(`fs-api-client-only-without`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/without/without`)
+    cy.getTestElement(`title`).should(`have.text`, `without`)
+  })
+  it(`fs-api client only splat with slash`, () => {
+    cy.getTestElement(`fs-api-client-only-with`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/with/with/`)
+    cy.getTestElement(`title`).should(`have.text`, `with`)
   })
   it(`fs-api-simple with slash`, () => {
     cy.getTestElement(`fs-api-simple-with`).click()
@@ -62,6 +72,26 @@ describe(`ignore`, () => {
     cy.getTestElement(`query-param-hash`).click()
     cy.waitForRouteChange().assertRoute(`/page-2?query_param=hello#anchor`)
   })
+  it(`client-only without slash`, () => {
+    cy.getTestElement(`client-only-simple-without`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only/without`)
+    cy.getTestElement(`title`).should(`have.text`, `without`)
+  })
+  it(`client-only with slash`, () => {
+    cy.getTestElement(`client-only-simple-with`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only/with/`)
+    cy.getTestElement(`title`).should(`have.text`, `with`)
+  })
+  it(`client-only-splat without slash`, () => {
+    cy.getTestElement(`client-only-splat-without`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only-splat/without/without`)
+    cy.getTestElement(`title`).should(`have.text`, `without/without`)
+  })
+  it(`client-only-splat with slash`, () => {
+    cy.getTestElement(`client-only-splat-with`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only-splat/with/with/`)
+    cy.getTestElement(`title`).should(`have.text`, `with/with`)
+  })
 })
 
 const IS_BUILD = Cypress.env(`IS_BUILD`)
@@ -96,25 +126,35 @@ describe(`ignore (direct visits)`, () => {
       .waitForRouteChange()
       .assertRoute(`/fs-api-simple/without`)
   })
-  it(`client-only-simple with`, () => {
+  it(`fs-api client only splat with`, () => {
+    cy.visit(`/fs-api/with/with/`)
+      .waitForRouteChange()
+      .assertRoute(`/fs-api/with/with/`)
+  })
+  it(`fs-api client only splat without`, () => {
+    cy.visit(`/fs-api/without/without`)
+      .waitForRouteChange()
+      .assertRoute(`/fs-api/without/without`)
+  })
+  it(`client-only with`, () => {
     cy.visit(`/client-only/with/`)
       .waitForRouteChange()
       .assertRoute(`/client-only/with/`)
   })
-  it(`client-only-simple without`, () => {
+  it(`client-only without`, () => {
     cy.visit(`/client-only/without`)
       .waitForRouteChange()
       .assertRoute(`/client-only/without`)
   })
-  it(`client-only with`, () => {
-    cy.visit(`/fs-api/with/with/`)
+  it(`client-only-splat with`, () => {
+    cy.visit(`/client-only-splat/with/with/`)
       .waitForRouteChange()
-      .assertRoute(`/fs-api/with/with/`)
+      .assertRoute(`/client-only-splat/with/with/`)
   })
-  it(`client-only without`, () => {
-    cy.visit(`/fs-api/without/without`)
+  it(`client-only-splat without`, () => {
+    cy.visit(`/client-only-splat/without/without`)
       .waitForRouteChange()
-      .assertRoute(`/fs-api/without/without`)
+      .assertRoute(`/client-only-splat/without/without`)
   })
   it(`query-param-hash with`, () => {
     cy.visit(`/page-2/?query_param=hello#anchor`)

diff --git a/e2e-tests/trailing-slash/cypress/integration/legacy.js b/e2e-tests/trailing-slash/cypress/integration/legacy.js
@@ -18,13 +18,23 @@ describe(`legacy`, () => {
     cy.getTestElement(`create-page-without`).click()
     cy.waitForRouteChange().assertRoute(`/create-page/without`)
   })
-  it(`fs-api-simple with slash`, () => {
-    cy.getTestElement(`fs-api-simple-with`).click()
-    cy.waitForRouteChange().assertRoute(`/fs-api-simple/with/`)
+  it(`fs-api with slash`, () => {
+    cy.getTestElement(`fs-api-with`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/with/`)
   })
-  it(`fs-api-simple without slash`, () => {
-    cy.getTestElement(`fs-api-simple-without`).click()
-    cy.waitForRouteChange().assertRoute(`/fs-api-simple/without`)
+  it(`fs-api without slash`, () => {
+    cy.getTestElement(`fs-api-without`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/without`)
+  })
+  it(`fs-api client only splat without slash`, () => {
+    cy.getTestElement(`fs-api-client-only-without`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/without/without`)
+    cy.getTestElement(`title`).should(`have.text`, `without`)
+  })
+  it(`fs-api client only splat with slash`, () => {
+    cy.getTestElement(`fs-api-client-only-with`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/with/with/`)
+    cy.getTestElement(`title`).should(`have.text`, `with`)
   })
   it(`fs-api-simple with slash`, () => {
     cy.getTestElement(`fs-api-simple-with`).click()
@@ -62,6 +72,26 @@ describe(`legacy`, () => {
     cy.getTestElement(`query-param-hash`).click()
     cy.waitForRouteChange().assertRoute(`/page-2?query_param=hello#anchor`)
   })
+  it(`client-only without slash`, () => {
+    cy.getTestElement(`client-only-simple-without`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only/without`)
+    cy.getTestElement(`title`).should(`have.text`, `without`)
+  })
+  it(`client-only with slash`, () => {
+    cy.getTestElement(`client-only-simple-with`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only/with/`)
+    cy.getTestElement(`title`).should(`have.text`, `with`)
+  })
+  it(`client-only-splat without slash`, () => {
+    cy.getTestElement(`client-only-splat-without`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only-splat/without/without`)
+    cy.getTestElement(`title`).should(`have.text`, `without/without`)
+  })
+  it(`client-only-splat with slash`, () => {
+    cy.getTestElement(`client-only-splat-with`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only-splat/with/with/`)
+    cy.getTestElement(`title`).should(`have.text`, `with/with`)
+  })
 })
 
 const IS_BUILD = Cypress.env(`IS_BUILD`)
@@ -97,25 +127,35 @@ describe(`legacy (direct visits)`, () => {
         IS_BUILD ? `/fs-api-simple/without/` : `/fs-api-simple/without`
       )
   })
-  it(`client-only-simple with`, () => {
+  it(`fs-api client only splat with`, () => {
+    cy.visit(`/fs-api/with/with/`)
+      .waitForRouteChange()
+      .assertRoute(`/fs-api/with/with/`)
+  })
+  it(`fs-api client only splat without`, () => {
+    cy.visit(`/fs-api/without/without`)
+      .waitForRouteChange()
+      .assertRoute(`/fs-api/without/without`)
+  })
+  it(`client-only with`, () => {
     cy.visit(`/client-only/with/`)
       .waitForRouteChange()
       .assertRoute(`/client-only/with/`)
   })
-  it(`client-only-simple without`, () => {
+  it(`client-only without`, () => {
     cy.visit(`/client-only/without`)
       .waitForRouteChange()
       .assertRoute(`/client-only/without`)
   })
-  it(`client-only with`, () => {
-    cy.visit(`/fs-api/with/with/`)
+  it(`client-only-splat with`, () => {
+    cy.visit(`/client-only-splat/with/with/`)
       .waitForRouteChange()
-      .assertRoute(`/fs-api/with/with/`)
+      .assertRoute(`/client-only-splat/with/with/`)
   })
-  it(`client-only without`, () => {
-    cy.visit(`/fs-api/without/without`)
+  it(`client-only-splat without`, () => {
+    cy.visit(`/client-only-splat/without/without`)
       .waitForRouteChange()
-      .assertRoute(`/fs-api/without/without`)
+      .assertRoute(`/client-only-splat/without/without`)
   })
   it(`query-param-hash with`, () => {
     cy.visit(`/page-2/?query_param=hello#anchor`)

diff --git a/e2e-tests/trailing-slash/cypress/integration/never.js b/e2e-tests/trailing-slash/cypress/integration/never.js
@@ -26,6 +26,16 @@ describe(`never`, () => {
     cy.getTestElement(`fs-api-without`).click()
     cy.waitForRouteChange().assertRoute(`/fs-api/without`)
   })
+  it(`fs-api client only splat without slash`, () => {
+    cy.getTestElement(`fs-api-client-only-without`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/without/without`)
+    cy.getTestElement(`title`).should(`have.text`, `without`)
+  })
+  it(`fs-api client only splat with slash`, () => {
+    cy.getTestElement(`fs-api-client-only-with`).click()
+    cy.waitForRouteChange().assertRoute(`/fs-api/with/with`)
+    cy.getTestElement(`title`).should(`have.text`, `with`)
+  })
   it(`fs-api-simple with slash`, () => {
     cy.getTestElement(`fs-api-simple-with`).click()
     cy.waitForRouteChange().assertRoute(`/fs-api-simple/with`)
@@ -62,25 +72,25 @@ describe(`never`, () => {
     cy.getTestElement(`query-param-hash`).click()
     cy.waitForRouteChange().assertRoute(`/page-2?query_param=hello#anchor`)
   })
-  it(`client-only-simple without slash`, () => {
+  it(`client-only without slash`, () => {
     cy.getTestElement(`client-only-simple-without`).click()
     cy.waitForRouteChange().assertRoute(`/client-only/without`)
     cy.getTestElement(`title`).should(`have.text`, `without`)
   })
-  it(`client-only-simple with slash`, () => {
+  it(`client-only with slash`, () => {
     cy.getTestElement(`client-only-simple-with`).click()
     cy.waitForRouteChange().assertRoute(`/client-only/with`)
     cy.getTestElement(`title`).should(`have.text`, `with`)
   })
-  it(`client-only without slash`, () => {
-    cy.getTestElement(`client-only-without`).click()
-    cy.waitForRouteChange().assertRoute(`/fs-api/without/without`)
-    cy.getTestElement(`title`).should(`have.text`, `without`)
+  it(`client-only-splat without slash`, () => {
+    cy.getTestElement(`client-only-splat-without`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only-splat/without/without`)
+    cy.getTestElement(`title`).should(`have.text`, `without/without`)
   })
-  it(`client-only with slash`, () => {
-    cy.getTestElement(`client-only-with`).click()
-    cy.waitForRouteChange().assertRoute(`/fs-api/with/with`)
-    cy.getTestElement(`title`).should(`have.text`, `with`)
+  it(`client-only-splat with slash`, () => {
+    cy.getTestElement(`client-only-splat-with`).click()
+    cy.waitForRouteChange().assertRoute(`/client-only-splat/with/with`)
+    cy.getTestElement(`title`).should(`have.text`, `with/with`)
   })
 })
 
@@ -114,25 +124,35 @@ describe(`never (direct visits)`, () => {
       .waitForRouteChange()
       .assertRoute(`/fs-api-simple/without`)
   })
-  it(`client-only-simple with`, () => {
+  it(`fs-api client only splat with`, () => {
+    cy.visit(`/fs-api/with/with/`)
+      .waitForRouteChange()
+      .assertRoute(`/fs-api/with/with`)
+  })
+  it(`fs-api client only splat without`, () => {
+    cy.visit(`/fs-api/without/without`)
+      .waitForRouteChange()
+      .assertRoute(`/fs-api/without/without`)
+  })
+  it(`client-only with`, () => {
     cy.visit(`/client-only/with/`)
       .waitForRouteChange()
       .assertRoute(`/client-only/with`)
   })
-  it(`client-only-simple without`, () => {
+  it(`client-only without`, () => {
     cy.visit(`/client-only/without`)
       .waitForRouteChange()
       .assertRoute(`/client-only/without`)
   })
-  it(`client-only with`, () => {
-    cy.visit(`/fs-api/with/with/`)
+  it(`client-only-splat with`, () => {
+    cy.visit(`/client-only-splat/with/with/`)
       .waitForRouteChange()
-      .assertRoute(`/fs-api/with/with`)
+      .assertRoute(`/client-only-splat/with/with`)
   })
-  it(`client-only without`, () => {
-    cy.visit(`/fs-api/without/without`)
+  it(`client-only-splat without`, () => {
+    cy.visit(`/client-only-splat/without/without`)
       .waitForRouteChange()
-      .assertRoute(`/fs-api/without/without`)
+      .assertRoute(`/client-only-splat/without/without`)
   })
   it(`query-param-hash with`, () => {
     cy.visit(`/page-2/?query_param=hello#anchor`)