Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test navigation between multiple root layouts #43762

Merged
merged 18 commits into from
Jan 5, 2023
Merged

Test navigation between multiple root layouts #43762

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
d83e4e4
wip
jankaifer Dec 6, 2022
e057293
fix root layout and test
jankaifer Dec 6, 2022
5fd9422
remove only from test
jankaifer Dec 6, 2022
5d2331a
Update test/e2e/app-dir/root-layout.test.ts
jankaifer Dec 7, 2022
add66f2
Update test/e2e/app-dir/root-layout.test.ts
jankaifer Dec 7, 2022
96393e9
Merge branch 'canary' into jankaifer/nex-96-add-test-for-multiple-roo…
timneutkens Dec 8, 2022
46ca1a6
Merge branch 'canary' into jankaifer/nex-96-add-test-for-multiple-roo…
jankaifer Dec 8, 2022
d274027
Merge branch 'canary' into jankaifer/nex-96-add-test-for-multiple-roo…
jankaifer Dec 9, 2022
ed65d75
Merge branch 'canary' into jankaifer/nex-96-add-test-for-multiple-roo…
timneutkens Dec 16, 2022
dd5dd73
fixed test to properly use chaining
jankaifer Dec 16, 2022
ccc0828
Move test to correct group
jankaifer Dec 16, 2022
00bb5e2
fix ids in test
jankaifer Dec 16, 2022
e47357e
Merge branch 'canary' into jankaifer/nex-96-add-test-for-multiple-roo…
jankaifer Dec 19, 2022
4ab62ce
Fix test broken after canary merge
jankaifer Dec 20, 2022
93ad04d
Merge remote-tracking branch 'origin/canary' into jankaifer/nex-96-ad…
jankaifer Dec 22, 2022
fa49514
Merge remote-tracking branch 'origin/canary' into jankaifer/nex-96-ad…
jankaifer Dec 22, 2022
b683651
Merge branch 'canary' into jankaifer/nex-96-add-test-for-multiple-roo…
jankaifer Jan 3, 2023
fca4034
Merge branch 'canary' into jankaifer/nex-96-add-test-for-multiple-roo…
kodiakhq[bot] Jan 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions test/e2e/app-dir/root-layout.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ describe('app-dir root layout', () => {
),
},
dependencies: {
react: 'experimental',
'react-dom': 'experimental',
react: 'latest',
'react-dom': 'latest',
jankaifer marked this conversation as resolved.
Show resolved Hide resolved
},
})
})
Expand Down Expand Up @@ -215,5 +215,16 @@ describe('app-dir root layout', () => {
)
expect(await browser.eval('window.__TEST_NO_RELOAD')).toBeUndefined()
})

it('should correctly handle navigation between multiple root layouts', async () => {
const browser = await webdriver(next.url, '/root-layout-a')
browser.elementById('root-a')
expect(await browser.hasElementByCssSelector('#root-b')).toBeFalse()

browser.elementById('to-layout-b').click()
jankaifer marked this conversation as resolved.
Show resolved Hide resolved

browser.elementById('root-b')
jankaifer marked this conversation as resolved.
Show resolved Hide resolved
expect(await browser.hasElementByCssSelector('#root-a')).toBeFalse()
})
})
})
12 changes: 12 additions & 0 deletions test/e2e/app-dir/root-layout/app/(multiple-root)/(root-a)/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'

export default function Layout({ children }) {
return (
<html>
<head></head>
<body>
<div id="root-a">{children}</div>
</body>
</html>
)
}
10 changes: 10 additions & 0 deletions test/e2e/app-dir/root-layout/app/(multiple-root)/(root-a)/root-layout-a/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react'
import Link from 'next/link'

export default function Page() {
return (
<Link href="../root-layout-b" id="link-to-b">
To b
</Link>
)
}
12 changes: 12 additions & 0 deletions test/e2e/app-dir/root-layout/app/(multiple-root)/(root-b)/layout.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import React from 'react'

export default function Layout({ children }) {
return (
<html>
<head></head>
<body>
<div id="root-b">{children}</div>
</body>
</html>
)
}
10 changes: 10 additions & 0 deletions test/e2e/app-dir/root-layout/app/(multiple-root)/(root-b)/root-layout-b/page.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
import React from 'react'
import Link from 'next/link'

export default function Page() {
return (
<Link href="../root-layout-a" id="link-to-a">
To a
</Link>
)
}