Skip to content

Commit 795b277

Browse files
authored
fix(nightwatch): should not install corresponding webdriver if the browser is unselected (#5528)
1 parent a41cac2 commit 795b277

File tree

1 file changed

+17
-14
lines changed
  • packages/@vue/cli-plugin-e2e-nightwatch/generator

1 file changed

+17
-14
lines changed
Lines changed: 17 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,33 @@
11
const { installedBrowsers } = require('@vue/cli-shared-utils')
22

3-
module.exports = api => {
3+
module.exports = (api, { webdrivers }) => {
44
api.render('./template', {
55
hasTS: api.hasPlugin('typescript'),
66
hasESLint: api.hasPlugin('eslint')
77
})
88

9+
const devDependencies = {}
10+
911
// Use devDependencies to store latest version number so as to automate update
10-
const devDeps = require('../package.json').devDependencies
11-
const geckodriver = devDeps.geckodriver
12+
const pluginDeps = require('../package.json').devDependencies
1213

13-
// chromedriver major version bumps every 6 weeks following Chrome
14-
// so there may be a mismatch between
15-
// user's installed browser version and the default provided version
16-
// fallback to the devDependencies version in case detection fails
17-
const chromedriver = installedBrowsers.chrome
18-
? installedBrowsers.chrome.match(/^(\d+)\./)[1]
19-
: devDeps.chromedriver
14+
if (webdrivers && webdrivers.includes('firefox')) {
15+
devDependencies.geckodriver = pluginDeps.geckodriver
16+
}
17+
if (webdrivers && webdrivers.includes('chrome')) {
18+
// chromedriver major version bumps every 6 weeks following Chrome
19+
// so there may be a mismatch between
20+
// user's installed browser version and the default provided version
21+
// fallback to the devDependencies version in case detection fails
22+
devDependencies.chromedriver = installedBrowsers.chrome
23+
? installedBrowsers.chrome.match(/^(\d+)\./)[1]
24+
: pluginDeps.chromedriver
25+
}
2026

2127
api.extendPackage({
2228
scripts: {
2329
'test:e2e': 'vue-cli-service test:e2e'
2430
},
25-
devDependencies: {
26-
chromedriver,
27-
geckodriver
28-
}
31+
devDependencies
2932
})
3033
}

0 commit comments

Comments
 (0)