From 385e3f038016eee6085afe9b445f403a2cff66a5 Mon Sep 17 00:00:00 2001 From: Tim Neutkens Date: Wed, 14 Sep 2022 11:09:01 +0200 Subject: [PATCH] Wrap parallel routes tests in describe (#40546) Small changes: - Group parallel routes tests - Upgrade tests to latest react experimental --- package.json | 4 ++-- pnpm-lock.yaml | 24 ++++++++++++------------ test/e2e/app-dir/index.test.ts | 34 ++++++++++++++++++---------------- 3 files changed, 32 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index a0c2544af4b4..4703f015ee00 100644 --- a/package.json +++ b/package.json @@ -178,8 +178,8 @@ "react-17": "npm:react@17.0.2", "react-dom": "18.2.0", "react-dom-17": "npm:react-dom@17.0.2", - "react-dom-exp": "npm:react-dom@0.0.0-experimental-c739cef2f-20220912", - "react-exp": "npm:react@0.0.0-experimental-c739cef2f-20220912", + "react-dom-exp": "npm:react-dom@0.0.0-experimental-e6a062bd2-20220913", + "react-exp": "npm:react@0.0.0-experimental-e6a062bd2-20220913", "react-ssr-prepass": "1.0.8", "react-virtualized": "9.22.3", "relay-compiler": "13.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 389ef955d102..18e87087aa3a 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -140,8 +140,8 @@ importers: react-17: npm:react@17.0.2 react-dom: 18.2.0 react-dom-17: npm:react-dom@17.0.2 - react-dom-exp: npm:react-dom@0.0.0-experimental-c739cef2f-20220912 - react-exp: npm:react@0.0.0-experimental-c739cef2f-20220912 + react-dom-exp: npm:react-dom@0.0.0-experimental-e6a062bd2-20220913 + react-exp: npm:react@0.0.0-experimental-e6a062bd2-20220913 react-ssr-prepass: 1.0.8 react-virtualized: 9.22.3 relay-compiler: 13.0.2 @@ -295,8 +295,8 @@ importers: react-17: /react/17.0.2 react-dom: 18.2.0_react@18.2.0 react-dom-17: /react-dom/17.0.2_react@18.2.0 - react-dom-exp: /react-dom/0.0.0-experimental-c739cef2f-20220912_react@18.2.0 - react-exp: /react/0.0.0-experimental-c739cef2f-20220912 + react-dom-exp: /react-dom/0.0.0-experimental-e6a062bd2-20220913_react@18.2.0 + react-exp: /react/0.0.0-experimental-e6a062bd2-20220913 react-ssr-prepass: 1.0.8_qncsgtzehe3fgiqp6tr7lwq6fm react-virtualized: 9.22.3_biqbaboplfbrettd7655fr4n2y relay-compiler: 13.0.2 @@ -24369,17 +24369,17 @@ packages: strip-json-comments: 2.0.1 dev: true - /react-dom/0.0.0-experimental-c739cef2f-20220912_react@18.2.0: + /react-dom/0.0.0-experimental-e6a062bd2-20220913_react@18.2.0: resolution: { - integrity: sha512-RbKxCHjX+H/n9yRvB2LFVhHUsFxWOiOlnhSGQ/JO45odUVreNVw0W7hez3biBF1r32f+0dp8RDVfvvKcF1sQyg==, + integrity: sha512-4e/0ZV5I4gUWRw6EohI9lEglfGYcSxPWoUcAXVLvRxzLTfFqnuLFplu33Z6Bvrs9Jnr6skDdskyyzFn0rRSJnQ==, } peerDependencies: - react: 0.0.0-experimental-c739cef2f-20220912 + react: 0.0.0-experimental-e6a062bd2-20220913 dependencies: loose-envify: 1.4.0 react: 18.2.0 - scheduler: 0.0.0-experimental-c739cef2f-20220912 + scheduler: 0.0.0-experimental-e6a062bd2-20220913 dev: true /react-dom/17.0.2_react@18.2.0: @@ -24493,10 +24493,10 @@ packages: react-lifecycles-compat: 3.0.4 dev: true - /react/0.0.0-experimental-c739cef2f-20220912: + /react/0.0.0-experimental-e6a062bd2-20220913: resolution: { - integrity: sha512-K3T+R0lw7LzA3HSPHtI4CIYXw6tXKV5ewvuvuY7vfom/0rDvgoUkWHpdkykFUiEaShMKrQyeK6+faq41LeucKA==, + integrity: sha512-osFjPYWDSg98xRjj0RDMF9gLczBcixdsC3vb1+vq6tw99Po31KgkiIfLtLMYGjD6qmASXlMVKZgFDbYDNGGC9Q==, } engines: { node: '>=0.10.0' } dependencies: @@ -25838,10 +25838,10 @@ packages: xmlchars: 2.2.0 dev: true - /scheduler/0.0.0-experimental-c739cef2f-20220912: + /scheduler/0.0.0-experimental-e6a062bd2-20220913: resolution: { - integrity: sha512-6HcdQoIp5PENl8IWJfCkIHcMx9Z+PVYxiTzFURS58bdkYhF8vsl65w/z6dpq6Ii/05miYi16VzrLc9T61EmexQ==, + integrity: sha512-Rv+woqQhdMt6JaiDCHpRsbG0f3LxIYKX/eo3tK+KIqi4TiTYZAYTxO5HJXvJgKPHegAtKMcjm2D3HXDWl2m/nw==, } dependencies: loose-envify: 1.4.0 diff --git a/test/e2e/app-dir/index.test.ts b/test/e2e/app-dir/index.test.ts index 0bf456d2dbdc..00ece1b3d71b 100644 --- a/test/e2e/app-dir/index.test.ts +++ b/test/e2e/app-dir/index.test.ts @@ -266,23 +266,25 @@ describe('app dir', () => { } }) - it('should match parallel routes', async () => { - const html = await renderViaHTTP(next.url, '/parallel/nested') - expect(html).toContain('parallel/layout') - expect(html).toContain('parallel/@foo/nested/layout') - expect(html).toContain('parallel/@foo/nested/@a/page') - expect(html).toContain('parallel/@foo/nested/@b/page') - expect(html).toContain('parallel/@bar/nested/layout') - expect(html).toContain('parallel/@bar/nested/@a/page') - expect(html).toContain('parallel/@bar/nested/@b/page') - expect(html).toContain('parallel/nested/page') - }) + describe('parallel routes', () => { + it('should match parallel routes', async () => { + const html = await renderViaHTTP(next.url, '/parallel/nested') + expect(html).toContain('parallel/layout') + expect(html).toContain('parallel/@foo/nested/layout') + expect(html).toContain('parallel/@foo/nested/@a/page') + expect(html).toContain('parallel/@foo/nested/@b/page') + expect(html).toContain('parallel/@bar/nested/layout') + expect(html).toContain('parallel/@bar/nested/@a/page') + expect(html).toContain('parallel/@bar/nested/@b/page') + expect(html).toContain('parallel/nested/page') + }) - it('should match parallel routes in route groups', async () => { - const html = await renderViaHTTP(next.url, '/parallel/nested-2') - expect(html).toContain('parallel/layout') - expect(html).toContain('parallel/(new)/layout') - expect(html).toContain('parallel/(new)/@baz/nested/page') + it('should match parallel routes in route groups', async () => { + const html = await renderViaHTTP(next.url, '/parallel/nested-2') + expect(html).toContain('parallel/layout') + expect(html).toContain('parallel/(new)/layout') + expect(html).toContain('parallel/(new)/@baz/nested/page') + }) }) describe('', () => {