Unverified Commit 5c6b8ac3 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

Fix flaky css test and remove unused tests deps (#47806)

* use `check` to wait for css change
* remove unused swr deps and update them to latest
* remove swr esm test in `app-dir/app/` since it's already covered in
`app-dir/app-external/`

---------
parent 2a5c5589
......@@ -6,7 +6,6 @@ createNextDescribe(
files: __dirname,
skipDeployment: true,
dependencies: {
swr: '2.0.0-rc.0',
react: 'latest',
'react-dom': 'latest',
sass: 'latest',
......
......@@ -7,7 +7,6 @@ createNextDescribe(
files: __dirname,
skipDeployment: true,
dependencies: {
swr: '2.0.0-rc.0',
'@picocss/pico': '1.5.7',
react: 'latest',
'react-dom': 'latest',
......@@ -506,9 +505,9 @@ createNextDescribe(
const browser = await next.browser('/suspensey-css')
await browser.elementByCss('#slow').click()
await check(() => browser.eval(`document.body.innerText`), 'Get back')
expect(await browser.eval(`window.__log`)).toEqual(
'background = rgb(255, 255, 0)'
)
await check(async () => {
return await browser.eval(`window.__log`)
}, /background = rgb\(255, 255, 0\)/)
})
it('should timeout if the resource takes too long', async () => {
......
......@@ -21,7 +21,7 @@ createNextDescribe(
dependencies: {
react: 'latest',
'react-dom': 'latest',
swr: '2.0.0-rc.0',
swr: 'latest',
},
packageJson: {
scripts: {
......
......@@ -8,12 +8,6 @@ createNextDescribe(
'app dir',
{
files: __dirname,
dependencies: {
swr: '2.0.0-rc.0',
react: 'latest',
'react-dom': 'latest',
sass: 'latest',
},
},
({ next, isNextDev: isDev, isNextStart, isNextDeploy }) => {
if (!isDev) {
......@@ -215,9 +209,6 @@ createNextDescribe(
it('should serve from pages', async () => {
const html = await next.render('/')
expect(html).toContain('hello from pages/index')
// esm imports should work fine in pages/
expect(html).toContain('swr-index')
})
it('should serve dynamic route from pages', async () => {
......
import React from 'react'
import Link from 'next/link'
import useSWR from 'swr'
import styles from '../styles/shared.module.css'
export default function Page() {
const { data } = useSWR('swr-index', (v) => v, { fallbackData: 'swr-index' })
return (
<>
<p className={styles.content}>hello from pages/index</p>
<Link href="/dashboard">Dashboard</Link>
<div>{data}</div>
</>
)
}
......@@ -16,12 +16,6 @@ if (!(globalThis as any).isNextStart) {
'output: standalone with app dir',
{
files: __dirname,
dependencies: {
swr: '2.0.0-rc.0',
react: 'latest',
'react-dom': 'latest',
sass: 'latest',
},
skipStart: true,
},
({ next }) => {
......
......@@ -8,12 +8,6 @@ describe('useReportWebVitals hook', () => {
beforeAll(async () => {
next = await createNext({
files: __dirname,
dependencies: {
swr: '2.0.0-rc.0',
react: 'latest',
'react-dom': 'latest',
sass: 'latest',
},
skipStart: true,
env: {},
})
......
......@@ -16,12 +16,6 @@ describe('vercel analytics', () => {
beforeAll(async () => {
next = await createNext({
files: __dirname,
dependencies: {
swr: '2.0.0-rc.0',
react: 'latest',
'react-dom': 'latest',
sass: 'latest',
},
skipStart: true,
env: {
VERCEL_ANALYTICS_ID: 'fake-analytics-id',
......
......@@ -4,12 +4,6 @@ createNextDescribe(
'app dir - hooks',
{
files: __dirname,
dependencies: {
swr: 'latest',
react: 'latest',
'react-dom': 'latest',
sass: 'latest',
},
},
({ next, isNextDeploy }) => {
describe('from pages', () => {
......
......@@ -6,12 +6,6 @@ createNextDescribe(
'app dir - navigation',
{
files: __dirname,
dependencies: {
swr: 'latest',
react: 'latest',
'react-dom': 'latest',
sass: 'latest',
},
},
({ next, isNextDeploy }) => {
describe('query string', () => {
......
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