Unverified Commit 8ab62613 authored by Balázs Orbán's avatar Balázs Orbán Committed by GitHub

chore(test): fix false-positive tests (#63242)

<!-- 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 #

-->


Closes NEXT-2798
parent c0f9d246
...@@ -137,7 +137,7 @@ createNextDescribe( ...@@ -137,7 +137,7 @@ createNextDescribe(
}) })
// Test hot reloading only in development // Test hot reloading only in development
;((global as any).isDev ? it : it.skip)( ;(isNextDev ? it : it.skip)(
'should not scroll the page when we hot reload', 'should not scroll the page when we hot reload',
async () => { async () => {
const browser = await webdriver(next.url, '/10/10000/100/1000/page1') const browser = await webdriver(next.url, '/10/10000/100/1000/page1')
...@@ -148,14 +148,18 @@ createNextDescribe( ...@@ -148,14 +148,18 @@ createNextDescribe(
'app/[layoutPaddingWidth]/[layoutPaddingHeight]/[pageWidth]/[pageHeight]/[param]/page.tsx' 'app/[layoutPaddingWidth]/[layoutPaddingHeight]/[pageWidth]/[pageHeight]/[param]/page.tsx'
await browser.eval(`window.router.refresh()`) await browser.eval(`window.router.refresh()`)
await next.patchFile( let originalContent: string
pagePath, await next.patchFile(pagePath, (content) => {
(await next.readFile(pagePath)) + originalContent = content
return (
content +
` `
\\\\ Add this meaningless comment to force refresh \\\\ Add this meaningless comment to force refresh
` `
) )
})
await waitForScrollToComplete(browser, { x: 0, y: 12000 }) await waitForScrollToComplete(browser, { x: 0, y: 12000 })
await next.patchFile(pagePath, originalContent)
} }
) )
}) })
......
import { createNext, FileRef } from 'e2e-utils' import { createNext, FileRef, isNextDev } from 'e2e-utils'
import { getRedboxSource, hasRedbox } from 'next-test-utils' import { getRedboxDescription, hasRedbox } from 'next-test-utils'
import { NextInstance } from 'test/lib/next-modes/base' import { NextInstance } from 'test/lib/next-modes/base'
import webdriver from 'next-webdriver' import webdriver from 'next-webdriver'
import path from 'path' import path from 'path'
...@@ -30,13 +30,13 @@ describe('New Link Behavior with <a> child', () => { ...@@ -30,13 +30,13 @@ describe('New Link Behavior with <a> child', () => {
const msg = const msg =
'Error: Invalid <Link> with <a> child. Please remove <a> or use <Link legacyBehavior>' 'Error: Invalid <Link> with <a> child. Please remove <a> or use <Link legacyBehavior>'
if ((global as any).isDev) { if (isNextDev) {
expect(next.cliOutput).toContain(msg) expect(next.cliOutput).toContain(msg)
expect(await hasRedbox(browser)).toBe(true) expect(await hasRedbox(browser)).toBe(true)
expect(await getRedboxSource(browser)).toContain(msg) expect(await getRedboxDescription(browser)).toContain(msg)
expect(link).not.toBeDefined() expect(link.length).toBe(0)
} else { } else {
expect(link).toBeDefined() expect(link.length).toBeGreaterThan(0)
} }
}) })
}) })
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