feat: Check for nightwatch.conf.js config (#4445)

lbennett-stacki · haoqunjiang · commit 8975d84ae38d · 2019-09-04T00:38:59.000+08:00
Nightwatch checks for `nightwatch.conf.js` instead
of the existing `nightwatch.config.js` user options
file, this adds a branch to check for the file
suggested by upstream as well.
diff --git a/packages/@vue/cli-plugin-e2e-nightwatch/index.js b/packages/@vue/cli-plugin-e2e-nightwatch/index.js
@@ -31,6 +31,8 @@ module.exports = (api, options) => {
           userOptions = require(userOptionsPath)
         } else if (fs.existsSync(userOptionsPath = api.resolve('nightwatch.json'))) {
           userOptions = require(userOptionsPath)
+        } else if (fs.existsSync(userOptionsPath = api.resolve('nightwatch.conf.js'))) {
+          userOptions = require(userOptionsPath)
         }
         process.env.VUE_NIGHTWATCH_USER_OPTIONS = JSON.stringify(userOptions || {})
 

Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@ module.exports = (api, options) => {`
`31`	`31`	`userOptions = require(userOptionsPath)`
`32`	`32`	`} else if (fs.existsSync(userOptionsPath = api.resolve('nightwatch.json'))) {`
`33`	`33`	`userOptions = require(userOptionsPath)`
	`34`	`+ } else if (fs.existsSync(userOptionsPath = api.resolve('nightwatch.conf.js'))) {`
	`35`	`+ userOptions = require(userOptionsPath)`
`34`	`36`	`}`
`35`	`37`	`process.env.VUE_NIGHTWATCH_USER_OPTIONS = JSON.stringify(userOptions \|\| {})`
`36`	`38`