Unverified Commit cac2dd80 authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

[test] Disallow custom `RegExp`-like implementations in `check` (#85537)

parent 6deb31e4
...@@ -126,33 +126,26 @@ describe('basePath', () => { ...@@ -126,33 +126,26 @@ describe('basePath', () => {
'/gssp' '/gssp'
) )
await check( await check(async () => {
async () => { const links = await browser.elementsByCss('link[rel=prefetch]')
const links = await browser.elementsByCss('link[rel=prefetch]')
for (const link of links) {
for (const link of links) { const href = await link.getAttribute('href')
const href = await link.getAttribute('href') if (href.includes(chunk)) {
if (href.includes(chunk)) { return true
return true
}
} }
}
const scripts = await browser.elementsByCss('script') const scripts = await browser.elementsByCss('script')
for (const script of scripts) { for (const script of scripts) {
const src = await script.getAttribute('src') const src = await script.getAttribute('src')
if (src.includes(chunk)) { if (src.includes(chunk)) {
return true return true
}
} }
return false
},
{
test(result) {
return result === true
},
} }
) return false
}, true)
}) })
it('should prefetch pages correctly in viewport with <Link>', async () => { it('should prefetch pages correctly in viewport with <Link>', async () => {
......
import webdriver from 'next-webdriver' import webdriver from 'next-webdriver'
import { nextTestSetup } from 'e2e-utils' import { nextTestSetup } from 'e2e-utils'
import { check, renderViaHTTP } from 'next-test-utils' import { check, renderViaHTTP, retry } from 'next-test-utils'
describe('basePath', () => { describe('basePath', () => {
const basePath = '/docs' const basePath = '/docs'
...@@ -121,10 +121,8 @@ describe('basePath', () => { ...@@ -121,10 +121,8 @@ describe('basePath', () => {
await browser.eval('window.beforeNav = "hi"') await browser.eval('window.beforeNav = "hi"')
await browser.elementByCss('#other-page-link').click() await browser.elementByCss('#other-page-link').click()
await check(() => browser.eval('window.beforeNav'), { await retry(async () => {
test(content) { expect(await browser.eval('window.beforeNav')).not.toEqual('hi')
return content !== 'hi'
},
}) })
await check( await check(
...@@ -138,10 +136,8 @@ describe('basePath', () => { ...@@ -138,10 +136,8 @@ describe('basePath', () => {
await browser.eval('window.beforeNav = "hi"') await browser.eval('window.beforeNav = "hi"')
await browser.eval(`window.next.router.push("${basePath}/other-page")`) await browser.eval(`window.next.router.push("${basePath}/other-page")`)
await check(() => browser.eval('window.beforeNav'), { await retry(async () => {
test(content) { expect(await browser.eval('window.beforeNav')).not.toEqual('hi')
return content !== 'hi'
},
}) })
const html = await browser.eval('document.documentElement.innerHTML') const html = await browser.eval('document.documentElement.innerHTML')
...@@ -153,10 +149,8 @@ describe('basePath', () => { ...@@ -153,10 +149,8 @@ describe('basePath', () => {
await browser.eval('window.beforeNav = "hi"') await browser.eval('window.beforeNav = "hi"')
await browser.eval(`window.next.router.replace("${basePath}/other-page")`) await browser.eval(`window.next.router.replace("${basePath}/other-page")`)
await check(() => browser.eval('window.beforeNav'), { await retry(async () => {
test(content) { expect(await browser.eval('window.beforeNav')).not.toEqual('hi')
return content !== 'hi'
},
}) })
const html = await browser.eval('document.documentElement.innerHTML') const html = await browser.eval('document.documentElement.innerHTML')
......
...@@ -638,13 +638,9 @@ const runTests = (isDev = false, isDeploy = false) => { ...@@ -638,13 +638,9 @@ const runTests = (isDev = false, isDeploy = false) => {
await waitFor(500) await waitFor(500)
await browser.eval('window.beforeClick = "abc"') await browser.eval('window.beforeClick = "abc"')
await browser.elementByCss('#broken-post').click() await browser.elementByCss('#broken-post').click()
expect( await retry(async () => {
await check(() => browser.eval('window.beforeClick'), { expect(await browser.eval('window.beforeClick')).not.toEqual('abc')
test(v) { })
return v !== 'abc'
},
})
).toBe(true)
}) })
it('should always call getServerSideProps without caching', async () => { it('should always call getServerSideProps without caching', async () => {
......
import { createNext, FileRef } from 'e2e-utils' import { createNext, FileRef } from 'e2e-utils'
import { NextInstance } from 'e2e-utils' import { NextInstance } from 'e2e-utils'
import { check } from 'next-test-utils' import { retry } from 'next-test-utils'
import { join } from 'path' import { join } from 'path'
import webdriver from 'next-webdriver' import webdriver from 'next-webdriver'
...@@ -27,8 +27,8 @@ describe('link-with-api-rewrite', () => { ...@@ -27,8 +27,8 @@ describe('link-with-api-rewrite', () => {
// unset). // unset).
await browser.eval('window.beforeNav = "hi"') await browser.eval('window.beforeNav = "hi"')
await browser.elementById('rewrite').click() await browser.elementById('rewrite').click()
await check(() => browser.eval('window.beforeNav'), { await retry(async () => {
test: (content) => content !== 'hi', expect(await browser.eval('window.beforeNav')).not.toEqual('hi')
}) })
// Check to see that we were in fact navigated to the correct page. // Check to see that we were in fact navigated to the correct page.
...@@ -54,8 +54,8 @@ describe('link-with-api-rewrite', () => { ...@@ -54,8 +54,8 @@ describe('link-with-api-rewrite', () => {
// unset). // unset).
await browser.eval('window.beforeNav = "hi"') await browser.eval('window.beforeNav = "hi"')
await browser.elementById('direct').click() await browser.elementById('direct').click()
await check(() => browser.eval('window.beforeNav'), { await retry(async () => {
test: (content) => content !== 'hi', expect(await browser.eval('window.beforeNav')).not.toEqual('hi')
}) })
// Check to see that we were in fact navigated to the correct page. // Check to see that we were in fact navigated to the correct page.
......
...@@ -772,13 +772,9 @@ describe('Prerender', () => { ...@@ -772,13 +772,9 @@ describe('Prerender', () => {
const browser = await webdriver(next.url, '/') const browser = await webdriver(next.url, '/')
await browser.eval('window.beforeClick = "abc"') await browser.eval('window.beforeClick = "abc"')
await browser.elementByCss('#broken-post').click() await browser.elementByCss('#broken-post').click()
expect( await retry(async () => {
await check(() => browser.eval('window.beforeClick'), { expect(await browser.eval('window.beforeClick')).not.toEqual('abc')
test(v) { })
return v !== 'abc'
},
})
).toBe(true)
}) })
it('should SSR dynamic page with brackets in param as object', async () => { it('should SSR dynamic page with brackets in param as object', async () => {
...@@ -906,13 +902,9 @@ describe('Prerender', () => { ...@@ -906,13 +902,9 @@ describe('Prerender', () => {
const browser = await webdriver(next.url, '/') const browser = await webdriver(next.url, '/')
await browser.eval('window.beforeClick = "abc"') await browser.eval('window.beforeClick = "abc"')
await browser.elementByCss('#broken-at-first-post').click() await browser.elementByCss('#broken-at-first-post').click()
expect( await retry(async () => {
await check(() => browser.eval('window.beforeClick'), { expect(await browser.eval('window.beforeClick')).not.toEqual('abc')
test(v) { })
return v !== 'abc'
},
})
).toBe(true)
const text = await browser.elementByCss('#params').text() const text = await browser.elementByCss('#params').text()
expect(text).toMatch(/post.*?post-999/) expect(text).toMatch(/post.*?post-999/)
......
...@@ -700,7 +700,7 @@ export async function startCleanStaticServer(dir: string) { ...@@ -700,7 +700,7 @@ export async function startCleanStaticServer(dir: string) {
*/ */
export async function check( export async function check(
contentFn: () => unknown | Promise<unknown>, contentFn: () => unknown | Promise<unknown>,
regex: any regex: boolean | number | string | RegExp
): Promise<boolean> { ): Promise<boolean> {
let content: unknown let content: unknown
let lastErr: unknown let lastErr: unknown
...@@ -712,7 +712,7 @@ export async function check( ...@@ -712,7 +712,7 @@ export async function check(
if (regex === content) { if (regex === content) {
return true return true
} }
} else if (regex.test(content)) { } else if (regex.test('' + content)) {
// found the content // found the content
return true return true
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment