@@ -4,15 +4,21 @@ const path = require('path')
4
4
const portfinder = require ( 'portfinder' )
5
5
const createServer = require ( '@vue/cli-test-utils/createServer' )
6
6
const create = require ( '@vue/cli-test-utils/createTestProject' )
7
+ const createOutside = require ( '@vue/cli-test-utils/createUpgradableProject' )
7
8
const serve = require ( '@vue/cli-test-utils/serveWithPuppeteer' )
8
9
const launchPuppeteer = require ( '@vue/cli-test-utils/launchPuppeteer' )
9
10
10
- exports . assertServe = async ( name , options ) => {
11
+ exports . assertServe = async ( name , options , outside = false ) => {
11
12
test ( 'serve' , async ( ) => {
12
- const project = await create ( name , options )
13
+ let project
14
+ if ( outside ) {
15
+ project = await createOutside ( name , options )
16
+ } else {
17
+ project = await create ( name , options )
18
+ }
13
19
14
20
await serve (
15
- ( ) => project . run ( 'vue-cli-service serve' ) ,
21
+ ( ) => project . run ( 'yarn serve' ) ,
16
22
async ( { page, nextUpdate, helpers } ) => {
17
23
const msg = `Welcome to Your Vue.js + TypeScript App`
18
24
expect ( await helpers . getText ( 'h1' ) ) . toMatch ( msg )
@@ -40,12 +46,17 @@ exports.assertServe = async (name, options) => {
40
46
} )
41
47
}
42
48
43
- exports . assertBuild = async ( name , options , customAssert ) => {
49
+ exports . assertBuild = async ( name , options , customAssert , outside = false ) => {
44
50
let browser , server , page
45
51
test ( 'build' , async ( ) => {
46
- const project = await create ( name , options )
52
+ let project
53
+ if ( outside ) {
54
+ project = await createOutside ( name , options )
55
+ } else {
56
+ project = await create ( name , options )
57
+ }
47
58
48
- const { stdout } = await project . run ( 'vue-cli-service build' )
59
+ const { stdout } = await project . run ( 'yarn build' )
49
60
expect ( stdout ) . toMatch ( 'Build complete.' )
50
61
51
62
const port = await portfinder . getPortPromise ( )
0 commit comments