@@ -2,26 +2,21 @@ const path = require('path');
22const waitOn = require ( 'wait-on' ) ;
33const ip = require ( 'ip' ) ;
44const getBrowser = require ( './utils/puppeteer' ) . getBrowser ;
5-
65const { viewports, themes, layouts } = require ( './constants' ) ;
76const DevServer = require ( './dev-server' ) ;
87
98const defaultLayout = 'side-nav-outer-toolbar' ;
109
11- module . exports = ( env , { port, urls } = { port : '8080' , urls : { } } ) => {
12- const appUrl = `http://${ ip . address ( ) } :${ port } /` ;
10+ module . exports = ( env , { port, urls, useDifferentPorts } = { port : '8080' , urls : { } , useDifferentPorts : false } ) => {
1311 const diffSnapshotsDir = path . join ( 'testing/__tests__/__diff_snapshots__' , env . engine ) ;
14-
1512 const pageUrls = {
1613 profile : 'profile' ,
1714 tasks : 'tasks' ,
1815 page : `${ ( env . engine === 'angular' ? 'pages/' : '' ) } new-page` ,
1916 'change-password' : 'change-password/123' ,
2017 ...urls ,
2118 } ;
22-
23- const getPageURL = ( name ) => `${ appUrl } ${ ( env . engine . indexOf ( 'nextjs' ) !== 0 ? '#/' : '' ) } ${ pageUrls [ name ] } ` ;
24- const devServer = new DevServer ( env , { port } ) ;
19+ let currentPort = port ;
2520
2621 describe ( `${ env . engine } app-template` , ( ) => {
2722 let browser ;
@@ -37,13 +32,14 @@ module.exports = (env, { port, urls } = { port: '8080', urls: {} }) => {
3732 } ) ;
3833
3934 Object . keys ( themes ) . forEach ( ( theme ) => {
40-
4135 describe ( theme , ( ) => {
4236 layouts . forEach ( ( layout ) => {
4337 const isDefaultLayout = layout === defaultLayout ;
4438
4539 describe ( layout , ( ) => {
46-
40+ const appUrl = `http://${ ip . address ( ) } :${ currentPort } /` ;
41+ const getPageURL = ( name ) => `${ appUrl } ${ ( env . engine . indexOf ( 'nextjs' ) !== 0 ? '#/' : '' ) } ${ pageUrls [ name ] } ` ;
42+ const devServer = new DevServer ( env , { currentPort } ) ;
4743
4844 beforeAll ( async ( ) => {
4945 try {
@@ -75,14 +71,16 @@ module.exports = (env, { port, urls } = { port: '8080', urls: {} }) => {
7571 console . log ( '----afterAll---before stop--->' ) ;
7672 await devServer . stop ( ) ;
7773 console . log ( '----afterAll---after stop--->' ) ;
74+ if ( useDifferentPorts ) {
75+ currentPort ++ ;
76+ }
7877
7978 } ) ;
8079
8180 Object . keys ( viewports ) . forEach ( ( viewportName ) => {
8281 const viewport = viewports [ viewportName ] ;
8382
8483 async function openPage ( url , options ) {
85- await new Promise ( ( resolve ) => setTimeout ( resolve , 1000 ) ) ;
8684 await page . goto ( 'about:blank' ) ;
8785 await page . setViewport ( viewport ) ;
8886 await page . goto ( url , {
0 commit comments