wip. check test

Author: GoodDayForSurf

packages/devextreme-cli/testing/__tests__/nextjs-ts.test.js

@@ -2,7 +2,6 @@ const { nextjsTs } = require('../env.nextjs');
 const testAppTemplate = require('../app-template.test.shared.js');
 testAppTemplate(nextjsTs, {
     port: 3001,
-    useDifferentPorts: true,
     urls: {
         profile: 'pages/profile',
         tasks: 'pages/tasks',

packages/devextreme-cli/testing/app-template.test.shared.js

@@ -7,7 +7,7 @@ const DevServer = require('./dev-server');
 
 const defaultLayout = 'side-nav-outer-toolbar';
 
-module.exports = (env, { port, urls, useDifferentPorts } = { port: '8080', urls: {}, useDifferentPorts: false }) => {
+module.exports = (env, { port, urls } = { port: '8080', urls: {} }) => {
     const diffSnapshotsDir = path.join('testing/__tests__/__diff_snapshots__', env.engine);
     const pageUrls = {
         profile: 'profile',
@@ -16,42 +16,30 @@ module.exports = (env, { port, urls, useDifferentPorts } = { port: '8080', urls:
         'change-password': 'change-password/123',
         ...urls,
     };
-    let currentPort = port;
 
     describe(`${env.engine} app-template`, () => {
-        let browser;
-        let page;
-
-        /* beforeAll(async() => {
-            browser = await getBrowser();
-            page = await browser.newPage();
-        });
-
-        afterAll(async() => {
-            console.log('-----afterAll---CLOSE-->', Boolean(process.env.LAUNCH_BROWSER));
-            await (Boolean(process.env.LAUNCH_BROWSER) ? browser : page).close();
-        }); */
-
         Object.keys(themes).forEach((theme) => {
             describe(theme, () => {
                 layouts.forEach((layout) => {
                     const isDefaultLayout = layout === defaultLayout;
 
                     describe(layout, () => {
+                        let browser;
+                        let page;
                         const getPageURL = (name) => `${appUrl}${(env.engine.indexOf('nextjs') !== 0 ? '#/' : '')}${pageUrls[name]}`;
-                        console.log('----currentPort------>', currentPort);
+                        console.log('----currentPort------>', port);
                         let devServer;
                         let appUrl;
 
                         beforeAll(async() => {
-                            appUrl = `http://${ip.address()}:${currentPort}/`;
-                            devServer = new DevServer(env, { port: currentPort });
+                            appUrl = `http://${ip.address()}:${port}/`;
+                            devServer = new DevServer(env, { port });
 
                             browser = await getBrowser();
                             page = await browser.newPage();
 
                             try {
-                                console.log('----beforeAll--wait-->', currentPort);
+                                console.log('----beforeAll--wait-->', port);
                                 await waitOn({
                                     reverse: true,
                                     resources: [appUrl],
@@ -76,12 +64,7 @@ module.exports = (env, { port, urls, useDifferentPorts } = { port: '8080', urls:
                         });
 
                         afterAll(async() => {
-                            console.log('----afterAll---before stop--->');
                             await devServer.stop();
-                            console.log('----afterAll---after stop--->');
-                            if(useDifferentPorts) {
-                                // currentPort++;
-                            }
                             await (Boolean(process.env.LAUNCH_BROWSER) ? browser : page).close();
                         });