From ff200943d1decd3e1d12b32e5dd93909e9d58293 Mon Sep 17 00:00:00 2001
From: Haoqun Jiang <haoqunjiang@gmail.com>
Date: Thu, 6 Aug 2020 15:25:53 +0800
Subject: [PATCH] refactor: output webdriverio logs to `tests/e2e/logs`

This allows us to have a more accurate path to specify in .gitignore
---
 .../generator/template/{ => tests/e2e}/logs/.gitkeep         | 0
 .../generator/template/wdio.shared.conf.js                   | 2 +-
 packages/@vue/cli-service/generator/template/_gitignore      | 5 +++++
 3 files changed, 6 insertions(+), 1 deletion(-)
 rename packages/@vue/cli-plugin-e2e-webdriverio/generator/template/{ => tests/e2e}/logs/.gitkeep (100%)

diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/generator/template/logs/.gitkeep b/packages/@vue/cli-plugin-e2e-webdriverio/generator/template/tests/e2e/logs/.gitkeep
similarity index 100%
rename from packages/@vue/cli-plugin-e2e-webdriverio/generator/template/logs/.gitkeep
rename to packages/@vue/cli-plugin-e2e-webdriverio/generator/template/tests/e2e/logs/.gitkeep
diff --git a/packages/@vue/cli-plugin-e2e-webdriverio/generator/template/wdio.shared.conf.js b/packages/@vue/cli-plugin-e2e-webdriverio/generator/template/wdio.shared.conf.js
index 80cb76006f..d04d96d26b 100644
--- a/packages/@vue/cli-plugin-e2e-webdriverio/generator/template/wdio.shared.conf.js
+++ b/packages/@vue/cli-plugin-e2e-webdriverio/generator/template/wdio.shared.conf.js
@@ -31,7 +31,7 @@ exports.config = {
   logLevel: 'trace',
   //
   // Set directory to store all logs into
-  outputDir: path.join(__dirname, '/logs'),
+  outputDir: path.join(__dirname, 'test/e2e/logs'),
   //
   // If you only want to run your tests until a specific amount of tests have failed use
   // bail (default is 0 - don't bail, run all tests).
diff --git a/packages/@vue/cli-service/generator/template/_gitignore b/packages/@vue/cli-service/generator/template/_gitignore
index 195f84a0f5..53b0add31a 100644
--- a/packages/@vue/cli-service/generator/template/_gitignore
+++ b/packages/@vue/cli-service/generator/template/_gitignore
@@ -14,6 +14,11 @@ geckodriver.log
 /tests/e2e/screenshots/
 <%_ } _%>
 
+<%_ if (rootOptions.plugins && rootOptions.plugins['@vue/cli-plugin-e2e-webdriverio']) { _%>
+
+/tests/e2e/logs/
+<%_ } _%>
+
 # local env files
 .env.local
 .env.*.local