From 77a99852e9429eb4c342afccfb49eb1ed328774a Mon Sep 17 00:00:00 2001 From: Justin Halsall Date: Mon, 30 Nov 2020 16:24:05 +0100 Subject: [PATCH 1/3] Configure e2e tests with Nuxt configuration End to end tests should be as close to the real thing as possible, re-creating a whole separate Nuxt configuration from scratch adds potential for inconsistencies. --- .../template/frameworks/ava/test/e2e/index.spec.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js b/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js index 01d599325..0b5ee6c37 100644 --- a/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js +++ b/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js @@ -1,6 +1,7 @@ import { resolve } from 'path' import test from 'ava' import { Nuxt, Builder } from 'nuxt' +import config from '../../nuxt.config' // We keep the nuxt and server instance // So we can close them at the end of the test @@ -8,11 +9,12 @@ let nuxt = null // Init Nuxt.js and create a server listening on localhost:4000 test.before(async () => { - const config = { + nuxt = new Nuxt({ + ...config, dev: false, - rootDir: resolve(__dirname, '../../') - } - nuxt = new Nuxt(config) + rootDir: resolve(__dirname, '../../'), + }) + await new Builder(nuxt).build() await new Builder(nuxt).build() await nuxt.server.listen(4000, 'localhost') }, 30000) From 4fdf74c15df1b21e3a9a7069913e6d6281209873 Mon Sep 17 00:00:00 2001 From: Justin Halsall Date: Mon, 30 Nov 2020 16:26:30 +0100 Subject: [PATCH 2/3] Update index.spec.js --- .../cna-template/template/frameworks/ava/test/e2e/index.spec.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js b/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js index 0b5ee6c37..94d3878a0 100644 --- a/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js +++ b/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js @@ -15,7 +15,6 @@ test.before(async () => { rootDir: resolve(__dirname, '../../'), }) await new Builder(nuxt).build() - await new Builder(nuxt).build() await nuxt.server.listen(4000, 'localhost') }, 30000) From 20b3fc10b94869e8a4f1eb6e8dfd18c18a5b75e7 Mon Sep 17 00:00:00 2001 From: Justin Halsall Date: Mon, 30 Nov 2020 16:37:05 +0100 Subject: [PATCH 3/3] Update packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js --- .../cna-template/template/frameworks/ava/test/e2e/index.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js b/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js index 94d3878a0..f190b2490 100644 --- a/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js +++ b/packages/cna-template/template/frameworks/ava/test/e2e/index.spec.js @@ -12,7 +12,7 @@ test.before(async () => { nuxt = new Nuxt({ ...config, dev: false, - rootDir: resolve(__dirname, '../../'), + rootDir: resolve(__dirname, '../../') }) await new Builder(nuxt).build() await nuxt.server.listen(4000, 'localhost')