From 2062dd3e25398c8ef54be678ef46c106e1f64f41 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Thu, 5 Mar 2020 23:41:39 -0500 Subject: [PATCH 1/2] Fix `getServerSideProps` Test Case --- test/integration/getserversideprops/test/index.test.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/getserversideprops/test/index.test.js b/test/integration/getserversideprops/test/index.test.js index 48df86696bb4149..613e58760a1c45f 100644 --- a/test/integration/getserversideprops/test/index.test.js +++ b/test/integration/getserversideprops/test/index.test.js @@ -295,10 +295,10 @@ const runTests = (dev = false) => { it('should reload page on failed data request', async () => { const browser = await webdriver(appPort, '/') await waitFor(500) - await browser.eval('window.beforeClick = true') + await browser.eval('window.beforeClick = "abc"') await browser.elementByCss('#broken-post').click() await waitFor(1000) - expect(await browser.eval('window.beforeClick')).not.toBe('true') + expect(await browser.eval('window.beforeClick')).not.toBe('abc') }) it('should always call getServerSideProps without caching', async () => { From a2adafddb093ef4c371f6044143a8be1063f9772 Mon Sep 17 00:00:00 2001 From: Joe Haddad Date: Fri, 6 Mar 2020 00:31:06 -0500 Subject: [PATCH 2/2] Data requests should fail instead of rendering --- packages/next/next-server/server/render.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/next/next-server/server/render.tsx b/packages/next/next-server/server/render.tsx index 4a112b313611df8..7cab9db04e25275 100644 --- a/packages/next/next-server/server/render.tsx +++ b/packages/next/next-server/server/render.tsx @@ -568,7 +568,7 @@ export async function renderToHTML( ;(renderOpts as any).pageData = props } } catch (err) { - if (!dev || !err) throw err + if (isDataReq || !dev || !err) throw err ctx.err = err renderOpts.err = err console.error(err)