From f17292dda02f9d703e7a48c464ea5d8b0e3ccd96 Mon Sep 17 00:00:00 2001 From: Bart Ledoux Date: Sat, 3 Mar 2018 10:54:39 -0600 Subject: [PATCH 1/3] fix(typescript): when using router e2e fail When using typescript and router, the pag return "Welcome to Your Vue.js App" instead of the "+ TypeScript" phrase. --- .../cli-plugin-typescript/generator/template/src/views/Home.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue b/packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue index 5102c698f2..485ed7e624 100644 --- a/packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue +++ b/packages/@vue/cli-plugin-typescript/generator/template/src/views/Home.vue @@ -2,7 +2,7 @@ From adaf2f16e16b7fe21976f20e17319581de2df00c Mon Sep 17 00:00:00 2001 From: Bart Ledoux Date: Sat, 3 Mar 2018 11:17:28 -0600 Subject: [PATCH 2/3] feat(typescript e2e tests): tested cypress and nightwatch --- .../__tests__/tsPluginE2e.spec.js | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 packages/@vue/cli-plugin-typescript/__tests__/tsPluginE2e.spec.js diff --git a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginE2e.spec.js b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginE2e.spec.js new file mode 100644 index 0000000000..2c8f7217a6 --- /dev/null +++ b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginE2e.spec.js @@ -0,0 +1,34 @@ +jest.setTimeout(20000) + +const create = require('@vue/cli-test-utils/createTestProject') + +test('cypress', async () => { + const project = await create('ts-e2e-cypress', { + plugins: { + '@vue/cli-plugin-typescript': {}, + '@vue/cli-plugin-e2e-cypress': {} + } + }) + await project.run(`vue-cli-service e2e`) +}) + +test('cypress with router', async () => { + const project = await create('ts-e2e-cypress', { + router: true, + plugins: { + '@vue/cli-plugin-typescript': {}, + '@vue/cli-plugin-e2e-cypress': {} + } + }) + await project.run(`vue-cli-service e2e`) +}) + +test('nightwatch', async () => { + const project = await create('ts-e2e-nightwatch', { + plugins: { + '@vue/cli-plugin-typescript': {}, + '@vue/cli-plugin-e2e-cypress': {} + } + }) + await project.run(`vue-cli-service e2e`) +}) From 3bde81790a229307fc8b1a39e4c2527dd37de868 Mon Sep 17 00:00:00 2001 From: Bart Ledoux Date: Sat, 3 Mar 2018 11:36:51 -0600 Subject: [PATCH 3/3] fix(typescript e2e test): timeout issue --- .../@vue/cli-plugin-typescript/__tests__/tsPluginE2e.spec.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginE2e.spec.js b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginE2e.spec.js index 2c8f7217a6..75f9bc1adb 100644 --- a/packages/@vue/cli-plugin-typescript/__tests__/tsPluginE2e.spec.js +++ b/packages/@vue/cli-plugin-typescript/__tests__/tsPluginE2e.spec.js @@ -1,4 +1,4 @@ -jest.setTimeout(20000) +jest.setTimeout(40000) const create = require('@vue/cli-test-utils/createTestProject')