Unverified Commit d044c554 authored by Zack Tanner's avatar Zack Tanner Committed by GitHub

ci: fix javascript-urls test to account for React 18 (#88249)

This was caught by our React 18 tests which only run on `canary`. There
was a console error about breaking `javascript:` urls in an upcoming
React release but it didn't actually block them.
parent d99021e9
...@@ -7,6 +7,8 @@ import { ...@@ -7,6 +7,8 @@ import {
} from 'next-test-utils' } from 'next-test-utils'
import type { Page, Request } from 'playwright' import type { Page, Request } from 'playwright'
const isReact18 = parseInt(process.env.NEXT_TEST_REACT_VERSION) === 18
describe('javascript-urls', () => { describe('javascript-urls', () => {
const { next, isNextDev } = nextTestSetup({ const { next, isNextDev } = nextTestSetup({
files: __dirname, files: __dirname,
...@@ -247,40 +249,47 @@ describe('javascript-urls', () => { ...@@ -247,40 +249,47 @@ describe('javascript-urls', () => {
expect(safePageUrl).toContain('/app/safe') expect(safePageUrl).toContain('/app/safe')
}) })
it('should prevent javascript URLs in pages router Link component', async () => { // React 18 did not block JavaScript URLs, it was just a console error.
const { beforePageLoad, getNavigationRequests } = if (!isReact18) {
createNavigationInterceptor() it('should prevent javascript URLs in pages router Link component', async () => {
const { beforePageLoad, getNavigationRequests } =
const browser = await next.browser('/pages/link-href', { createNavigationInterceptor()
pushErrorAsConsoleLog: true,
beforePageLoad,
})
const initialUrl = await browser.url()
await browser.elementByCss('a').click() const browser = await next.browser('/pages/link-href', {
pushErrorAsConsoleLog: true,
beforePageLoad,
})
const initialUrl = await browser.url()
await expectJavascriptUrlBlocked(browser, initialUrl, getNavigationRequests) await browser.elementByCss('a').click()
if (isNextDev) { await expectJavascriptUrlBlocked(
await waitForRedbox(browser) browser,
expect(await getRedboxDescription(browser)).toMatchInlineSnapshot( initialUrl,
`"React has blocked a javascript: URL as a security precaution."` getNavigationRequests
) )
browser.keydown('Escape')
await waitForNoRedbox(browser)
}
// Click the safe page link
await browser.elementByCss('a[href="/pages/safe"]').click()
// Wait for navigation to complete if (isNextDev) {
await browser.waitForCondition( await waitForRedbox(browser)
'window.location.pathname.includes("/pages/safe")' expect(await getRedboxDescription(browser)).toMatchInlineSnapshot(
) `"React has blocked a javascript: URL as a security precaution."`
)
browser.keydown('Escape')
await waitForNoRedbox(browser)
}
// Click the safe page link
await browser.elementByCss('a[href="/pages/safe"]').click()
// Wait for navigation to complete
await browser.waitForCondition(
'window.location.pathname.includes("/pages/safe")'
)
const safePageUrl = await browser.url() const safePageUrl = await browser.url()
expect(safePageUrl).toContain('/pages/safe') expect(safePageUrl).toContain('/pages/safe')
}) })
}
it('should prevent javascript URLs in pages router Link as prop', async () => { it('should prevent javascript URLs in pages router Link as prop', async () => {
const { beforePageLoad, getNavigationRequests } = const { beforePageLoad, getNavigationRequests } =
......
...@@ -4,21 +4,19 @@ import { DANGEROUS_JAVASCRIPT_URL } from '../../bad-url' ...@@ -4,21 +4,19 @@ import { DANGEROUS_JAVASCRIPT_URL } from '../../bad-url'
export default function Page() { export default function Page() {
return ( return (
<html> <div>
<body> <main>
<main> <p>
<p> Clicking this link should result in an error where React blocks a
Clicking this link should result in an error where React blocks a javascript URL
javascript URL </p>
</p> <Link href="/" as={DANGEROUS_JAVASCRIPT_URL}>
<Link href="/" as={DANGEROUS_JAVASCRIPT_URL}> Link with javascript URL `as`
Link with javascript URL `as` </Link>
</Link> </main>
</main> <footer>
<footer> <Link href="/pages/safe">Safe Page</Link>
<Link href="/pages/safe">Safe Page</Link> </footer>
</footer> </div>
</body>
</html>
) )
} }
...@@ -4,21 +4,19 @@ import { DANGEROUS_JAVASCRIPT_URL } from '../../bad-url' ...@@ -4,21 +4,19 @@ import { DANGEROUS_JAVASCRIPT_URL } from '../../bad-url'
export default function Page() { export default function Page() {
return ( return (
<html> <div>
<body> <main>
<main> <p>
<p> Clicking this link should result in an error where React blocks a
Clicking this link should result in an error where React blocks a javascript URL
javascript URL </p>
</p> <Link href={DANGEROUS_JAVASCRIPT_URL}>
<Link href={DANGEROUS_JAVASCRIPT_URL}> Link with javascript URL `href`
Link with javascript URL `href` </Link>
</Link> </main>
</main> <footer>
<footer> <Link href="/pages/safe">Safe Page</Link>
<Link href="/pages/safe">Safe Page</Link> </footer>
</footer> </div>
</body>
</html>
) )
} }
...@@ -6,21 +6,19 @@ import { DANGEROUS_JAVASCRIPT_URL } from '../../bad-url' ...@@ -6,21 +6,19 @@ import { DANGEROUS_JAVASCRIPT_URL } from '../../bad-url'
export default function Page() { export default function Page() {
const router = useRouter() const router = useRouter()
return ( return (
<html> <div>
<body> <main>
<main> <p>
<p> Clicking this button should result in an error where Next.js blocks a
Clicking this button should result in an error where Next.js blocks javascript URL
a javascript URL </p>
</p> <button onClick={() => router.push(DANGEROUS_JAVASCRIPT_URL)}>
<button onClick={() => router.push(DANGEROUS_JAVASCRIPT_URL)}> push javascript URL
push javascript URL </button>
</button> </main>
</main> <footer>
<footer> <Link href="/pages/safe">Safe Page</Link>
<Link href="/pages/safe">Safe Page</Link> </footer>
</footer> </div>
</body>
</html>
) )
} }
...@@ -6,21 +6,19 @@ import { DANGEROUS_JAVASCRIPT_URL } from '../../bad-url' ...@@ -6,21 +6,19 @@ import { DANGEROUS_JAVASCRIPT_URL } from '../../bad-url'
export default function Page() { export default function Page() {
const router = useRouter() const router = useRouter()
return ( return (
<html> <div>
<body> <main>
<main> <p>
<p> Clicking this button should result in an error where Next.js blocks a
Clicking this button should result in an error where Next.js blocks javascript URL
a javascript URL </p>
</p> <button onClick={() => router.replace(DANGEROUS_JAVASCRIPT_URL)}>
<button onClick={() => router.replace(DANGEROUS_JAVASCRIPT_URL)}> replace javascript URL
replace javascript URL </button>
</button> </main>
</main> <footer>
<footer> <Link href="/pages/safe">Safe Page</Link>
<Link href="/pages/safe">Safe Page</Link> </footer>
</footer> </div>
</body>
</html>
) )
} }
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