Merge branch 'canary' into fix/webpack5-deprecation-warning-profiling

vercel · Jan 18, 2021 · 1b79027 · 1b79027
2 parents 769854d + 699a7ae
commit 1b79027
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 67 deletions.
diff --git a/test/integration/client-navigation/test/index.test.js b/test/integration/client-navigation/test/index.test.js
@@ -550,6 +550,21 @@ describe('Client Navigation', () => {
   })
 
   describe('with hash changes', () => {
+    describe('check hydration mis-match', () => {
+      it('should not have hydration mis-match for hash link', async () => {
+        const browser = await webdriver(context.appPort, '/nav/hash-changes')
+        const browserLogs = await browser.log('browser')
+        let found = false
+        browserLogs.forEach((log) => {
+          console.log('log.message', log.message)
+          if (log.message.includes('Warning: Prop')) {
+            found = true
+          }
+        })
+        expect(found).toEqual(false)
+      })
+    })
+
     describe('when hash change via Link', () => {
       it('should not run getInitialProps', async () => {
         const browser = await webdriver(context.appPort, '/nav/hash-changes')

diff --git a/test/integration/link-with-hash/pages/index.js b/test/integration/link-with-hash/pages/index.js
diff --git a/test/integration/link-with-hash/test/index.test.js b/test/integration/link-with-hash/test/index.test.js