Unverified Commit 139bc40f authored by Tim Neutkens's avatar Tim Neutkens Committed by GitHub

More reliable error-recovery tests (#5281)

As they were failing intermittently, this PR tries to solve that.
parent bb06f507
/* global describe, it, expect */ /* global describe, it, expect */
import webdriver from 'next-webdriver' import webdriver from 'next-webdriver'
import { join } from 'path' import { join } from 'path'
import { check, File, waitFor, getReactErrorOverlayContent } from 'next-test-utils' import { check, File, getReactErrorOverlayContent } from 'next-test-utils'
export default (context, render) => { export default (context, render) => {
describe('Error Recovery', () => { describe('Error Recovery', () => {
...@@ -13,9 +13,6 @@ export default (context, render) => { ...@@ -13,9 +13,6 @@ export default (context, render) => {
try { try {
browser = await webdriver(context.appPort, '/hmr/about') browser = await webdriver(context.appPort, '/hmr/about')
// Wait for react-error-overlay
await browser.waitForElementByCss('iframe', 2000)
// react-error-overlay uses the following inline style if an editorHandler is installed // react-error-overlay uses the following inline style if an editorHandler is installed
expect(await getReactErrorOverlayContent(browser)).toMatch(/style="cursor: pointer;"/) expect(await getReactErrorOverlayContent(browser)).toMatch(/style="cursor: pointer;"/)
...@@ -45,8 +42,6 @@ export default (context, render) => { ...@@ -45,8 +42,6 @@ export default (context, render) => {
aboutPage.replace('</div>', 'div') aboutPage.replace('</div>', 'div')
await waitFor(10000)
expect(await getReactErrorOverlayContent(browser)).toMatch(/Unterminated JSX contents/) expect(await getReactErrorOverlayContent(browser)).toMatch(/Unterminated JSX contents/)
aboutPage.restore() aboutPage.restore()
...@@ -64,34 +59,6 @@ export default (context, render) => { ...@@ -64,34 +59,6 @@ export default (context, render) => {
} }
}) })
it('should not show the default HMR error overlay', async () => {
let browser
const aboutPage = new File(join(__dirname, '../', 'pages', 'hmr', 'about.js'))
try {
browser = await webdriver(context.appPort, '/hmr/about')
const text = await browser
.elementByCss('p').text()
expect(text).toBe('This is the about page.')
aboutPage.replace('</div>', 'div')
await waitFor(10000)
expect(await getReactErrorOverlayContent(browser)).toMatch(/Unterminated JSX contents/)
await waitFor(10000)
// Check for the error overlay
const bodyHtml = await browser.elementByCss('body').getAttribute('innerHTML')
expect(bodyHtml.includes('webpack-hot-middleware-clientOverlay')).toBeFalsy()
} finally {
aboutPage.restore()
if (browser) {
browser.close()
}
}
})
it('should show the error on all pages', async () => { it('should show the error on all pages', async () => {
const aboutPage = new File(join(__dirname, '../', 'pages', 'hmr', 'about.js')) const aboutPage = new File(join(__dirname, '../', 'pages', 'hmr', 'about.js'))
let browser let browser
...@@ -100,8 +67,6 @@ export default (context, render) => { ...@@ -100,8 +67,6 @@ export default (context, render) => {
browser = await webdriver(context.appPort, '/hmr/contact') browser = await webdriver(context.appPort, '/hmr/contact')
await waitFor(10000)
expect(await getReactErrorOverlayContent(browser)).toMatch(/Unterminated JSX contents/) expect(await getReactErrorOverlayContent(browser)).toMatch(/Unterminated JSX contents/)
aboutPage.restore() aboutPage.restore()
...@@ -129,8 +94,6 @@ export default (context, render) => { ...@@ -129,8 +94,6 @@ export default (context, render) => {
aboutPage.replace('export', 'aa=20;\nexport') aboutPage.replace('export', 'aa=20;\nexport')
await waitFor(10000)
expect(await getReactErrorOverlayContent(browser)).toMatch(/aa is not defined/) expect(await getReactErrorOverlayContent(browser)).toMatch(/aa is not defined/)
aboutPage.restore() aboutPage.restore()
...@@ -156,8 +119,6 @@ export default (context, render) => { ...@@ -156,8 +119,6 @@ export default (context, render) => {
const aboutPage = new File(join(__dirname, '../', 'pages', 'hmr', 'about.js')) const aboutPage = new File(join(__dirname, '../', 'pages', 'hmr', 'about.js'))
aboutPage.replace('return', 'throw new Error("an-expected-error");\nreturn') aboutPage.replace('return', 'throw new Error("an-expected-error");\nreturn')
await waitFor(10000)
expect(await getReactErrorOverlayContent(browser)).toMatch(/an-expected-error/) expect(await getReactErrorOverlayContent(browser)).toMatch(/an-expected-error/)
aboutPage.restore() aboutPage.restore()
...@@ -179,9 +140,10 @@ export default (context, render) => { ...@@ -179,9 +140,10 @@ export default (context, render) => {
const aboutPage = new File(join(__dirname, '../', 'pages', 'hmr', 'about.js')) const aboutPage = new File(join(__dirname, '../', 'pages', 'hmr', 'about.js'))
aboutPage.replace('export default', 'export default "not-a-page"\nexport const fn = ') aboutPage.replace('export default', 'export default "not-a-page"\nexport const fn = ')
await waitFor(10000) await check(
() => browser.elementByCss('body').text(),
expect(await browser.elementByCss('body').text()).toMatch(/The default export is not a React Component/) /The default export is not a React Component/
)
aboutPage.restore() aboutPage.restore()
...@@ -221,8 +183,6 @@ export default (context, render) => { ...@@ -221,8 +183,6 @@ export default (context, render) => {
const browser = await webdriver(context.appPort, '/hmr') const browser = await webdriver(context.appPort, '/hmr')
await browser.elementByCss('#error-in-gip-link').click() await browser.elementByCss('#error-in-gip-link').click()
await waitFor(10000)
expect(await getReactErrorOverlayContent(browser)).toMatch(/an-expected-error-in-gip/) expect(await getReactErrorOverlayContent(browser)).toMatch(/an-expected-error-in-gip/)
const erroredPage = new File(join(__dirname, '../', 'pages', 'hmr', 'error-in-gip.js')) const erroredPage = new File(join(__dirname, '../', 'pages', 'hmr', 'error-in-gip.js'))
...@@ -240,8 +200,6 @@ export default (context, render) => { ...@@ -240,8 +200,6 @@ export default (context, render) => {
it('should recover after an error reported via SSR', async () => { it('should recover after an error reported via SSR', async () => {
const browser = await webdriver(context.appPort, '/hmr/error-in-gip') const browser = await webdriver(context.appPort, '/hmr/error-in-gip')
await waitFor(10000)
expect(await getReactErrorOverlayContent(browser)).toMatch(/an-expected-error-in-gip/) expect(await getReactErrorOverlayContent(browser)).toMatch(/an-expected-error-in-gip/)
const erroredPage = new File(join(__dirname, '../', 'pages', 'hmr', 'error-in-gip.js')) const erroredPage = new File(join(__dirname, '../', 'pages', 'hmr', 'error-in-gip.js'))
......
...@@ -216,6 +216,8 @@ export async function getReactErrorOverlayContent (browser) { ...@@ -216,6 +216,8 @@ export async function getReactErrorOverlayContent (browser) {
}, 1000 * 30) }, 1000 * 30)
while (!found) { while (!found) {
try { try {
await browser.waitForElementByCss('iframe', 10000)
const hasIframe = await browser.hasElementByCssSelector('iframe') const hasIframe = await browser.hasElementByCssSelector('iframe')
if (!hasIframe) { if (!hasIframe) {
throw new Error('Waiting for iframe') throw new Error('Waiting for iframe')
......
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