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

Jump to bottom

Enable passing tests #41241

Merged
merged 2 commits into from Oct 7, 2022
Merged

Enable passing tests #41241

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef30f46
Enable passing tests
timneutkens Oct 7, 2022
f6dfccc
Enable test in prod
timneutkens Oct 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
53 changes: 32 additions & 21 deletions test/e2e/app-dir/index.test.ts
View file
Open in desktop
Expand Up @@ -259,7 +259,7 @@ describe('app dir', () => {

describe('rewrites', () => {
// TODO-APP: rewrite url is broken
it.skip('should support rewrites on initial load', async () => {
it('should support rewrites on initial load', async () => {
const browser = await webdriver(next.url, '/rewritten-to-dashboard')
expect(await browser.elementByCss('h1').text()).toBe('Dashboard')
expect(await browser.url()).toBe(`${next.url}/rewritten-to-dashboard`)
Expand Down Expand Up @@ -826,7 +826,7 @@ describe('app dir', () => {

describe('next/router', () => {
// `useRouter` should not be accessible in server components.
it.skip('should always return null when accessed from /app', async () => {
it('should always return null when accessed from /app', async () => {
const browser = await webdriver(next.url, '/old-router')

try {
Expand Down Expand Up @@ -1436,31 +1436,42 @@ describe('app dir', () => {
})

// TODO-APP: disable failing test and investigate later
it.skip('should render the template that is a server component and rerender on navigation', async () => {
const browser = await webdriver(next.url, '/template/servercomponent')
expect(await browser.elementByCss('h1').text()).toStartWith('Template')
;(isDev ? it.skip : it)(
'should render the template that is a server component and rerender on navigation',
async () => {
const browser = await webdriver(next.url, '/template/servercomponent')
// eslint-disable-next-line jest/no-standalone-expect
expect(await browser.elementByCss('h1').text()).toStartWith(
'Template'
)

const currentTime = await browser
.elementByCss('#performance-now')
.text()
const currentTime = await browser
.elementByCss('#performance-now')
.text()

await browser.elementByCss('#link').click()
await browser.waitForElementByCss('#other-page')
await browser.elementByCss('#link').click()
await browser.waitForElementByCss('#other-page')

expect(await browser.elementByCss('h1').text()).toStartWith('Template')
// eslint-disable-next-line jest/no-standalone-expect
expect(await browser.elementByCss('h1').text()).toStartWith(
'Template'
)

// template should rerender on navigation even when it's a server component
expect(await browser.elementByCss('#performance-now').text()).toBe(
currentTime
)
// template should rerender on navigation even when it's a server component
// eslint-disable-next-line jest/no-standalone-expect
expect(await browser.elementByCss('#performance-now').text()).toBe(
currentTime
)

await browser.elementByCss('#link').click()
await browser.waitForElementByCss('#page')
await browser.elementByCss('#link').click()
await browser.waitForElementByCss('#page')

expect(await browser.elementByCss('#performance-now').text()).toBe(
currentTime
)
})
// eslint-disable-next-line jest/no-standalone-expect
expect(await browser.elementByCss('#performance-now').text()).toBe(
currentTime
)
}
)
})

// TODO-APP: This is disabled for development as the error overlay needs to be reworked.
Expand Down