c6320ed87a
<!-- Thanks for opening a PR! Your contribution is much appreciated. To make sure your PR is handled as smoothly as possible we request that you follow the checklist sections below. Choose the right checklist for the change(s) that you're making: ## For Contributors ### Improving Documentation - Run `pnpm prettier-fix` to fix formatting issues before opening the PR. - Read the Docs Contribution Guide to ensure your contribution follows the docs guidelines: https://nextjs.org/docs/community/contribution-guide ### Adding or Updating Examples - The "examples guidelines" are followed from our contributing doc https://github.com/vercel/next.js/blob/canary/contributing/examples/adding-examples.md - Make sure the linting passes by running `pnpm build && pnpm lint`. See https://github.com/vercel/next.js/blob/canary/contributing/repository/linting.md ### Fixing a bug - Related issues linked using `fixes #number` - Tests added. See: https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ### Adding a feature - Implements an existing feature request or RFC. Make sure the feature request has been accepted for implementation before opening a PR. (A discussion must be opened, see https://github.com/vercel/next.js/discussions/new?category=ideas) - Related issues/discussions are linked using `fixes #number` - e2e tests added (https://github.com/vercel/next.js/blob/canary/contributing/core/testing.md#writing-tests-for-nextjs) - Documentation added - Telemetry added. In case of a feature if it's used or not. - Errors have a helpful link attached, see https://github.com/vercel/next.js/blob/canary/contributing.md ## For Maintainers - Minimal description (aim for explaining to someone not on the team to understand the PR) - When linking to a Slack thread, you might want to share details of the conclusion - Link both the Linear (Fixes NEXT-xxx) and the GitHub issues - Add review comments if necessary to explain to the reviewer the logic behind a change ### What? ### Why? ### How? Closes NEXT- Fixes # --> I took some time and [wrote a codemod](https://gist.github.com/wyattjoh/0d4464427506cb02062a4729ca906b62) that replaces the old usage of the `createNextDescribe` with the new `nextTestSetup`. You'll likely have to turn on hiding of whitespace in order to review, but this should primarily introduce no changes to the test structure other than using the new mechanism now. Closes NEXT-3178
63 lines
2.5 KiB
TypeScript
63 lines
2.5 KiB
TypeScript
import { nextTestSetup } from 'e2e-utils'
|
|
import { check } from 'next-test-utils'
|
|
|
|
describe('parallel-routes-catchall', () => {
|
|
const { next } = nextTestSetup({
|
|
files: __dirname,
|
|
})
|
|
|
|
it('should match correctly when defining an explicit page & slot', async () => {
|
|
const browser = await next.browser('/')
|
|
await check(() => browser.elementById('slot').text(), /@slot default/)
|
|
|
|
await browser.elementByCss('[href="/foo"]').click()
|
|
|
|
// foo has defined a page route and a corresponding parallel slot
|
|
// so we'd expect to see the custom slot content & the page content
|
|
await check(() => browser.elementById('children').text(), /foo/)
|
|
await check(() => browser.elementById('slot').text(), /foo slot/)
|
|
})
|
|
|
|
it('should match correctly when defining an explicit page but no slot', async () => {
|
|
const browser = await next.browser('/')
|
|
await check(() => browser.elementById('slot').text(), /@slot default/)
|
|
|
|
await browser.elementByCss('[href="/bar"]').click()
|
|
|
|
// bar has defined a slot but no page route
|
|
// so we'd expect to see the catch-all slot & the page content
|
|
await check(() => browser.elementById('children').text(), /bar/)
|
|
await check(() => browser.elementById('slot').text(), /slot catchall/)
|
|
await check(
|
|
() => browser.elementById('slot').text(),
|
|
/catchall slot client component/
|
|
)
|
|
})
|
|
|
|
it('should match correctly when defining an explicit slot but no page', async () => {
|
|
const browser = await next.browser('/')
|
|
await check(() => browser.elementById('slot').text(), /@slot default/)
|
|
|
|
await browser.elementByCss('[href="/baz"]').click()
|
|
|
|
// baz has defined a page route and a corresponding parallel slot
|
|
// so we'd expect to see the custom slot content & the page content
|
|
await check(() => browser.elementById('children').text(), /main catchall/)
|
|
await check(() => browser.elementById('slot').text(), /baz slot/)
|
|
})
|
|
|
|
it('should match both the catch-all page & slot', async () => {
|
|
const browser = await next.browser('/')
|
|
await check(() => browser.elementById('slot').text(), /@slot default/)
|
|
|
|
await browser.elementByCss('[href="/quux"]').click()
|
|
|
|
// quux doesn't have a page or slot defined. It should use the catch-all for both
|
|
await check(() => browser.elementById('children').text(), /main catchall/)
|
|
await check(() => browser.elementById('slot').text(), /slot catchall/)
|
|
await check(
|
|
() => browser.elementById('slot').text(),
|
|
/catchall slot client component/
|
|
)
|
|
})
|
|
})
|