Updated change and added trial test

vercel · Feb 19, 2020 · e104aef · e104aef
1 parent 4be2b2d
commit e104aef
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 3 deletions.
diff --git a/packages/next/next-server/lib/router/router.ts b/packages/next/next-server/lib/router/router.ts
@@ -235,9 +235,8 @@ export default class Router implements BaseRouter {
     if (
       e.state &&
       this.isSsr &&
-      // Remove the query portion of the URL when checking paths
-      e.state.url.replace(/\?(.)+/, '') === this.pathname &&
-      e.state.as === this.asPath
+      e.state.as === this.asPath &&
+      parse(e.state.url).pathname === this.pathname
     ) {
       return
     }

diff --git a/test/integration/production/test/index.test.js b/test/integration/production/test/index.test.js
@@ -310,6 +310,21 @@ describe('Production Usage', () => {
     expect(newText).toBe('server')
   })
 
+  it('should navigate back then forward', async () => {
+    const browser = await webdriver(appPort, '/external-and-back')
+    const initialText = await browser.elementByCss('p').text()
+    expect(initialText).toBe('server')
+
+    await browser
+      .elementByCss('a')
+      .click()
+      .waitForElementByCss('input')
+      .back()
+      .waitForElementByCss('p')
+      .forward()
+      .waitForElementByCss('input')
+  })
+
   it('should change query correctly', async () => {
     const browser = await webdriver(appPort, '/query?id=0')
     let id = await browser.elementByCss('#q0').text()