Skip to content

fix: fix nightwatch cli option (--url) handling #4627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 29, 2019
Merged

fix: fix nightwatch cli option (--url) handling #4627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions packages/@vue/cli-plugin-e2e-nightwatch/__tests__/nightwatchPlugin.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ jest.setTimeout(process.env.APPVEYOR ? 300000 : 120000)
const fs = require('fs-extra')
const path = require('path')
const create = require('@vue/cli-test-utils/createTestProject')
const createServer = require('@vue/cli-test-utils/createServer')

describe('nightwatch e2e plugin', () => {
let project
Expand Down Expand Up @@ -34,6 +35,26 @@ describe('nightwatch e2e plugin', () => {
])
})

test('should accept the --url cli option', async () => {
await project.run(`vue-cli-service build`)
const server = createServer({ root: path.join(project.dir, 'dist') })
await new Promise((resolve, reject) => {
server.listen(8080, err => {
if (err) return reject(err)
resolve()
})
})
await project.run(`vue-cli-service test:e2e --headless --url http://127.0.0.1:8080/`)
server.close()

let results = await project.read('test_results.json')
results = JSON.parse(results)
expect(Object.keys(results.modules)).toEqual([
'test-with-pageobjects',
'test'
])
})

test('should run single test with custom nightwatch.json', async () => {
await project.run(`vue-cli-service test:e2e --headless -t tests/e2e/specs/test.js`)
let results = await project.read('test_results.json')
Expand Down
15 changes: 8 additions & 7 deletions packages/@vue/cli-plugin-e2e-nightwatch/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,10 @@ module.exports = (api, options) => {
}
}

const argsToRemove = ['url', 'mode', 'headless', 'use-selenium', 'parallel']
argsToRemove.forEach((toRemove) => removeArg(rawArgs, toRemove))
// remove args
;['url', 'mode'].forEach(toRemove => removeArg(rawArgs, toRemove))
// remove flags
;['headless', 'use-selenium', 'parallel'].forEach(toRemove => removeArg(rawArgs, toRemove, 0))

return Promise.all([
startDevServer(args, api),
Expand Down Expand Up @@ -169,11 +171,10 @@ function checkPath (source) {
}

function removeArg (rawArgs, argToRemove, offset = 1) {
const matchRE = new RegExp(`^--${argToRemove}$`)
const matchRE = new RegExp(`^--${argToRemove}`)
const equalRE = new RegExp(`^--${argToRemove}=`)

const index = rawArgs.findIndex(arg => matchRE.test(arg))
if (index > -1) {
rawArgs.splice(index, offset + (equalRE.test(rawArgs[index]) ? 1 : 0))
const i = rawArgs.findIndex(arg => matchRE.test(arg))
if (i > -1) {
rawArgs.splice(i, offset + (equalRE.test(rawArgs[i]) ? 0 : 1))
}
}