Fix broken BrowserInterface type (vercel#66461)

ducmilano99 · Jun 3, 2024 · 994d8ee · 994d8ee
1 parent 48e9cd9
commit 994d8ee
Show file tree

Hide file tree

Showing 21 changed files with 112 additions and 133 deletions.
diff --git a/...development/app-dir/strict-mode-enabled-by-default/strict-mode-enabled-by-default.test.ts b/...development/app-dir/strict-mode-enabled-by-default/strict-mode-enabled-by-default.test.ts
@@ -1,4 +1,3 @@
-import { type BrowserInterface } from 'next-webdriver'
 import { nextTestSetup } from 'e2e-utils'
 import { check } from 'next-test-utils'
 
@@ -8,7 +7,7 @@ describe('Strict Mode enabled by default', () => {
   })
   // TODO: modern StrictMode does not double invoke effects during hydration: https://github.com/facebook/react/pull/28951
   it.skip('should work using browser', async () => {
-    const browser: BrowserInterface = await next.browser('/')
+    const browser = await next.browser('/')
     await check(async () => {
       const text = await browser.elementByCss('p').text()
       // FIXME: Bug in React. Strict Effects no longer work in current beta.

diff --git a/test/development/basic/define-class-fields/define-class-fields.test.ts b/test/development/basic/define-class-fields/define-class-fields.test.ts
@@ -48,7 +48,7 @@ describe('useDefineForClassFields SWC option', () => {
     let data_foundLog = false
     let name_foundLog = false
 
-    const browserLogs = await browser.log('browser')
+    const browserLogs = await browser.log()
 
     browserLogs.forEach((log) => {
       if (log.message.includes('data changed')) {

diff --git a/test/development/basic/misc.test.ts b/test/development/basic/misc.test.ts
@@ -85,7 +85,7 @@ describe.each([[''], ['/docs']])(
       let browser
       try {
         browser = await webdriver(next.url, path)
-        const browserLogs = await browser.log('browser')
+        const browserLogs = await browser.log()
 
         browserLogs.forEach((log) => {
           if (log.message.includes('Next.js auto-prefetches automatically')) {

diff --git a/test/development/basic/next-dynamic/next-dynamic.test.ts b/test/development/basic/next-dynamic/next-dynamic.test.ts
@@ -119,7 +119,7 @@ describe('next/dynamic', () => {
           )
 
           if ((global as any).browserName === 'chrome') {
-            const logs = await browser.log('browser')
+            const logs = await browser.log()
 
             logs.forEach((logItem) => {
               expect(logItem.message).not.toMatch(

diff --git a/test/development/basic/styled-components/styled-components.test.ts b/test/development/basic/styled-components/styled-components.test.ts
@@ -12,7 +12,7 @@ describe('styled-components SWC transform', () => {
   async function matchLogs$(browser) {
     let foundLog = false
 
-    const browserLogs = await browser.log('browser')
+    const browserLogs = await browser.log()
 
     browserLogs.forEach((log) => {
       if (log.message.includes('Warning: Prop `%s` did not match.')) {

diff --git a/test/development/pages-dir/client-navigation/index.test.ts b/test/development/pages-dir/client-navigation/index.test.ts
@@ -565,7 +565,7 @@ describe('Client Navigation', () => {
     describe('check hydration mis-match', () => {
       it('should not have hydration mis-match for hash link', async () => {
         const browser = await webdriver(next.appPort, '/nav/hash-changes')
-        const browserLogs = await browser.log('browser')
+        const browserLogs = await browser.log()
         let found = false
         browserLogs.forEach((log) => {
           console.log('log.message', log.message)
@@ -1717,7 +1717,7 @@ describe.each([[false], [true]])(
 
         await browser.waitForElementByCss('h1')
         await waitFor(1000)
-        const browserLogs = await browser.log('browser')
+        const browserLogs = await browser.log()
         let foundStyles = false
         let foundScripts = false
         const logs = []
@@ -1750,7 +1750,7 @@ describe.each([[false], [true]])(
         browser = await webdriver(next.appPort, '/head')
         await browser.waitForElementByCss('h1')
         await waitFor(1000)
-        const browserLogs = await browser.log('browser')
+        const browserLogs = await browser.log()
         let found = false
         browserLogs.forEach((log) => {
           if (log.message.includes('Use next/script instead')) {
@@ -1771,7 +1771,7 @@ describe.each([[false], [true]])(
         browser = await webdriver(next.appPort, '/head-with-json-ld-snippet')
         await browser.waitForElementByCss('h1')
         await waitFor(1000)
-        const browserLogs = await browser.log('browser')
+        const browserLogs = await browser.log()
         let found = false
         browserLogs.forEach((log) => {
           if (log.message.includes('Use next/script instead')) {

diff --git a/test/e2e/app-dir/autoscroll-with-css-modules/index.test.ts b/test/e2e/app-dir/autoscroll-with-css-modules/index.test.ts
@@ -36,7 +36,7 @@ describe('router autoscrolling on navigation with css modules', () => {
 
   describe('vertical scroll when page imports css modules', () => {
     it('should scroll to top of document when navigating between to pages without layout when', async () => {
-      const browser: BrowserInterface = await next.browser('/1')
+      const browser = await next.browser('/1')
 
       await scrollTo(browser, { x: 0, y: 1000 })
       expect(await getTopScroll(browser)).toBe(1000)
@@ -46,7 +46,7 @@ describe('router autoscrolling on navigation with css modules', () => {
     })
 
     it('should scroll when clicking in JS', async () => {
-      const browser: BrowserInterface = await next.browser('/1')
+      const browser = await next.browser('/1')
 
       await scrollTo(browser, { x: 0, y: 1000 })
       expect(await getTopScroll(browser)).toBe(1000)

diff --git a/test/e2e/app-dir/next-after-app/index.test.ts b/test/e2e/app-dir/next-after-app/index.test.ts
@@ -8,7 +8,6 @@ import * as fs from 'fs'
 import * as path from 'path'
 import * as os from 'os'
 import * as Log from './utils/log'
-import { BrowserInterface } from '../../../lib/next-webdriver'
 
 const runtimes = ['nodejs', 'edge']
 
@@ -257,7 +256,7 @@ describe.each(runtimes)('unstable_after() in %s runtime', (runtimeValue) => {
     const EXPECTED_ERROR =
       /An error occurred in a function passed to `unstable_after\(\)`: .+?: Cookies can only be modified in a Server Action or Route Handler\./
 
-    const browser: BrowserInterface = await next.browser('/123/setting-cookies')
+    const browser = await next.browser('/123/setting-cookies')
     // after() from render
     expect(next.cliOutput).toMatch(EXPECTED_ERROR)
 

diff --git a/test/e2e/app-dir/root-layout-redirect/root-layout-redirect.test.ts b/test/e2e/app-dir/root-layout-redirect/root-layout-redirect.test.ts
@@ -16,7 +16,7 @@ describe('root-layout-redirect', () => {
         .text()
     ).toBe('Result Page')
 
-    const browserLogs = await browser.log('browser')
+    const browserLogs = await browser.log()
 
     let foundErrors = false
 

diff --git a/test/e2e/app-dir/search-params-react-key/layout-params.test.ts b/test/e2e/app-dir/search-params-react-key/layout-params.test.ts
@@ -9,7 +9,10 @@ describe('app dir - search params keys', () => {
   it('should keep the React router instance the same when changing the search params', async () => {
     const browser = await next.browser('/')
 
-    const searchParams = browser.waitForElementByCss('#search-params').text()
+    const searchParams = await browser
+      .waitForElementByCss('#search-params')
+      .text()
+
     await browser.elementByCss('#increment').click()
     await browser.elementByCss('#increment').click()
 

diff --git a/test/e2e/new-link-behavior/index.test.ts b/test/e2e/new-link-behavior/index.test.ts
@@ -8,7 +8,7 @@ import path from 'path'
 async function matchLogs(browser, includes: string) {
   let found = false
 
-  const browserLogs = await browser.log('browser')
+  const browserLogs = await browser.log()
 
   browserLogs.forEach((log) => {
     if (log.message.includes(includes)) {

diff --git a/test/integration/app-document/test/csp.js b/test/integration/app-document/test/csp.js
@@ -6,7 +6,7 @@ export default (context, render) => {
     it('should load inline script by hash', async () => {
       const browser = await webdriver(context.appPort, '/?withCSP=hash')
       if (global.browserName === 'chrome') {
-        const errLog = await browser.log('browser')
+        const errLog = await browser.log()
         expect(errLog.filter((e) => e.source === 'security')).toEqual([])
       }
       await browser.close()
@@ -15,7 +15,7 @@ export default (context, render) => {
     it('should load inline script by nonce', async () => {
       const browser = await webdriver(context.appPort, '/?withCSP=nonce')
       if (global.browserName === 'chrome') {
-        const errLog = await browser.log('browser')
+        const errLog = await browser.log()
         expect(errLog.filter((e) => e.source === 'security')).toEqual([])
       }
       await browser.close()

diff --git a/test/integration/next-image-new/app-dir/test/index.test.ts b/test/integration/next-image-new/app-dir/test/index.test.ts
@@ -238,7 +238,7 @@ function runTests(mode) {
         await browser.elementById('belowthefold').getAttribute('loading')
       ).toBe(null)
 
-      const warnings = (await browser.log('browser'))
+      const warnings = (await browser.log())
         .map((log) => log.message)
         .join('\n')
       expect(warnings).not.toMatch(
@@ -381,7 +381,7 @@ function runTests(mode) {
     )
 
     if (mode === 'dev') {
-      const warnings = (await browser.log('browser'))
+      const warnings = (await browser.log())
         .map((log) => log.message)
         .join('\n')
       expect(warnings).toMatch(
@@ -657,7 +657,7 @@ function runTests(mode) {
       )
       if (mode === 'dev') {
         await waitFor(1000)
-        const warnings = (await browser.log('browser'))
+        const warnings = (await browser.log())
           .map((log) => log.message)
           .join('\n')
         expect(warnings).toMatch(
@@ -1064,7 +1064,7 @@ function runTests(mode) {
           return 'done'
         }, 'done')
         await waitFor(1000)
-        const warnings = (await browser.log('browser'))
+        const warnings = (await browser.log())
           .map((log) => log.message)
           .join('\n')
         expect(await hasRedbox(browser)).toBe(false)
@@ -1353,7 +1353,7 @@ function runTests(mode) {
     if (mode === 'dev') {
       it('should not log incorrect warnings', async () => {
         await waitFor(1000)
-        const warnings = (await browser.log('browser'))
+        const warnings = (await browser.log())
           .map((log) => log.message)
           .join('\n')
         expect(warnings).not.toMatch(/Image with src (.*) has "fill"/gm)
@@ -1364,7 +1364,7 @@ function runTests(mode) {
       it('should log warnings when using fill mode incorrectly', async () => {
         browser = await webdriver(appPort, '/fill-warnings')
         await waitFor(1000)
-        const warnings = (await browser.log('browser'))
+        const warnings = (await browser.log())
           .map((log) => log.message)
           .join('\n')
         expect(warnings).toContain(
@@ -1383,7 +1383,7 @@ function runTests(mode) {
       it('should not log warnings when image unmounts', async () => {
         browser = await webdriver(appPort, '/should-not-warn-unmount')
         await waitFor(1000)
-        const warnings = (await browser.log('browser'))
+        const warnings = (await browser.log())
           .map((log) => log.message)
           .join('\n')
         expect(warnings).not.toContain(

diff --git a/test/integration/next-image-new/base-path/test/index.test.js b/test/integration/next-image-new/base-path/test/index.test.js
@@ -133,9 +133,7 @@ function runTests(mode) {
       expect(await hasRedbox(browser)).toBe(false)
 
       await check(async () => {
-        return (await browser.log('browser'))
-          .map((log) => log.message)
-          .join('\n')
+        return (await browser.log()).map((log) => log.message).join('\n')
       }, /Image is missing required "src" property/gm)
     })
 

diff --git a/test/integration/next-image-new/default/test/index.test.ts b/test/integration/next-image-new/default/test/index.test.ts
@@ -239,7 +239,7 @@ function runTests(mode) {
         await browser.elementById('belowthefold').getAttribute('loading')
       ).toBe(null)
 
-      const warnings = (await browser.log('browser'))
+      const warnings = (await browser.log())
         .map((log) => log.message)
         .join('\n')
       expect(warnings).not.toMatch(
@@ -382,7 +382,7 @@ function runTests(mode) {
     )
 
     if (mode === 'dev') {
-      const warnings = (await browser.log('browser'))
+      const warnings = (await browser.log())
         .map((log) => log.message)
         .join('\n')
       expect(warnings).toMatch(
@@ -658,7 +658,7 @@ function runTests(mode) {
       )
       if (mode === 'dev') {
         await waitFor(1000)
-        const warnings = (await browser.log('browser'))
+        const warnings = (await browser.log())
           .map((log) => log.message)
           .join('\n')
         expect(warnings).toMatch(
@@ -1355,7 +1355,7 @@ function runTests(mode) {
     if (mode === 'dev') {
       it('should not log incorrect warnings', async () => {
         await waitFor(1000)
-        const warnings = (await browser.log('browser'))
+        const warnings = (await browser.log())
           .map((log) => log.message)
           .join('\n')
         expect(warnings).not.toMatch(/Image with src (.*) has "fill"/gm)
@@ -1366,7 +1366,7 @@ function runTests(mode) {
       it('should log warnings when using fill mode incorrectly', async () => {
         browser = await webdriver(appPort, '/fill-warnings')
         await waitFor(1000)
-        const warnings = (await browser.log('browser'))
+        const warnings = (await browser.log())
           .map((log) => log.message)
           .join('\n')
         expect(warnings).toContain(
@@ -1385,7 +1385,7 @@ function runTests(mode) {
       it('should not log warnings when image unmounts', async () => {
         browser = await webdriver(appPort, '/should-not-warn-unmount')
         await waitFor(1000)
-        const warnings = (await browser.log('browser'))
+        const warnings = (await browser.log())
           .map((log) => log.message)
           .join('\n')
         expect(warnings).not.toContain(

diff --git a/test/integration/script-loader/test/index.test.js b/test/integration/script-loader/test/index.test.js
@@ -61,7 +61,7 @@ const runTests = (isDev) => {
       await browser.waitForElementByCss('#onload-div')
       await waitFor(1000)
 
-      const logs = await browser.log('browser')
+      const logs = await browser.log()
       const filteredLogs = logs.filter(
         (log) =>
           !log.message.includes('Failed to load resource') &&