Merge pull request #3298 from bmf-ribeiro/feat/2714-start-server-on-integration-tests
Fix #2714 - Start demo server before running integration tests
This commit is contained in:
@@ -7,7 +7,7 @@ import WebSocket = require('ws');
|
|||||||
import { openTerminal, pollFor, getBrowserType } from '../../../out-test/api/TestUtils';
|
import { openTerminal, pollFor, getBrowserType } from '../../../out-test/api/TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { assert } from 'chai';
|
|||||||
import { openTerminal, getBrowserType } from '../../../out-test/api/TestUtils';
|
import { openTerminal, getBrowserType } from '../../../out-test/api/TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { resolve } from 'path';
|
|||||||
import { openTerminal, writeSync, getBrowserType } from '../../../out-test/api/TestUtils';
|
import { openTerminal, writeSync, getBrowserType } from '../../../out-test/api/TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { assert } from 'chai';
|
|||||||
import { openTerminal, writeSync, getBrowserType } from '../../../out-test/api/TestUtils';
|
import { openTerminal, writeSync, getBrowserType } from '../../../out-test/api/TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { assert } from 'chai';
|
|||||||
import { openTerminal, getBrowserType } from '../../../out-test/api/TestUtils';
|
import { openTerminal, getBrowserType } from '../../../out-test/api/TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { assert } from 'chai';
|
|||||||
import { openTerminal, pollFor, writeSync, getBrowserType } from '../../../out-test/api/TestUtils';
|
import { openTerminal, pollFor, writeSync, getBrowserType } from '../../../out-test/api/TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -9,7 +9,7 @@ import { assert } from 'chai';
|
|||||||
import { openTerminal, pollFor, writeSync, getBrowserType } from '../../../out-test/api/TestUtils';
|
import { openTerminal, pollFor, writeSync, getBrowserType } from '../../../out-test/api/TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -100,10 +100,6 @@ jobs:
|
|||||||
displayName: 'Install Yarn'
|
displayName: 'Install Yarn'
|
||||||
- script: yarn --frozen-lockfile
|
- script: yarn --frozen-lockfile
|
||||||
displayName: 'Install dependencies and build'
|
displayName: 'Install dependencies and build'
|
||||||
- script: |
|
|
||||||
yarn start &
|
|
||||||
sleep 10
|
|
||||||
displayName: 'Start test server'
|
|
||||||
- script: yarn test-api-chromium --headless --forbid-only
|
- script: yarn test-api-chromium --headless --forbid-only
|
||||||
displayName: 'Integration tests (Chromium)'
|
displayName: 'Integration tests (Chromium)'
|
||||||
- script: xvfb-run --auto-servernum -- bash -c "yarn test-api-firefox --headless --forbid-only"
|
- script: xvfb-run --auto-servernum -- bash -c "yarn test-api-firefox --headless --forbid-only"
|
||||||
@@ -119,10 +115,6 @@ jobs:
|
|||||||
displayName: 'Install Node.js'
|
displayName: 'Install Node.js'
|
||||||
- script: yarn --frozen-lockfile
|
- script: yarn --frozen-lockfile
|
||||||
displayName: 'Install dependencies and build'
|
displayName: 'Install dependencies and build'
|
||||||
- script: |
|
|
||||||
yarn start &
|
|
||||||
sleep 10
|
|
||||||
displayName: 'Start test server'
|
|
||||||
- script: yarn test-api-chromium --headless --forbid-only
|
- script: yarn test-api-chromium --headless --forbid-only
|
||||||
displayName: 'Integration tests (Chromium)'
|
displayName: 'Integration tests (Chromium)'
|
||||||
- script: yarn test-api-firefox --headless --forbid-only
|
- script: yarn test-api-firefox --headless --forbid-only
|
||||||
|
|||||||
+26
-14
@@ -34,19 +34,31 @@ if (process.argv.length > 2) {
|
|||||||
|
|
||||||
|
|
||||||
env.DEBUG = flagArgs.indexOf('--debug') >= 0 ? 'debug' : '';
|
env.DEBUG = flagArgs.indexOf('--debug') >= 0 ? 'debug' : '';
|
||||||
|
env.PORT = 3001;
|
||||||
|
|
||||||
const run = cp.spawnSync(
|
const server = cp.spawn('node', ['demo/start'], {
|
||||||
npmBinScript('mocha'),
|
cwd: path.resolve(__dirname, '..'),
|
||||||
[...testFiles, ...flagArgs],
|
env,
|
||||||
{
|
stdio: 'pipe'
|
||||||
cwd: path.resolve(__dirname, '..'),
|
})
|
||||||
env,
|
|
||||||
stdio: 'inherit'
|
server.stdout.on('data', (data) => {
|
||||||
|
// await for the server to fully start
|
||||||
|
if (data.indexOf("successfully") !== -1) {
|
||||||
|
const run = cp.spawnSync(
|
||||||
|
npmBinScript('mocha'),
|
||||||
|
[...testFiles, ...flagArgs], {
|
||||||
|
cwd: path.resolve(__dirname, '..'),
|
||||||
|
env,
|
||||||
|
stdio: 'inherit'
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
|
function npmBinScript(script) {
|
||||||
|
return path.resolve(__dirname, `../node_modules/.bin/` + (process.platform === 'win32' ?
|
||||||
|
`${script}.cmd` : script));
|
||||||
|
}
|
||||||
|
|
||||||
|
process.exit(run.status);
|
||||||
}
|
}
|
||||||
);
|
});
|
||||||
|
|
||||||
function npmBinScript(script) {
|
|
||||||
return path.resolve(__dirname, `../node_modules/.bin/` + (process.platform === 'win32' ? `${script}.cmd` : script));
|
|
||||||
}
|
|
||||||
|
|
||||||
process.exit(run.status);
|
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
import { pollFor, openTerminal, getBrowserType } from './TestUtils';
|
import { pollFor, openTerminal, getBrowserType } from './TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ import { pollFor, openTerminal, getBrowserType } from './TestUtils';
|
|||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
import { IRenderDimensions } from 'browser/renderer/Types';
|
import { IRenderDimensions } from 'browser/renderer/Types';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
import { pollFor, writeSync, openTerminal, getBrowserType } from './TestUtils';
|
import { pollFor, writeSync, openTerminal, getBrowserType } from './TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { assert } from 'chai';
|
|||||||
import { writeSync, openTerminal, getBrowserType } from './TestUtils';
|
import { writeSync, openTerminal, getBrowserType } from './TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ import { assert } from 'chai';
|
|||||||
import { pollFor, timeout, writeSync, openTerminal, getBrowserType } from './TestUtils';
|
import { pollFor, timeout, writeSync, openTerminal, getBrowserType } from './TestUtils';
|
||||||
import { Browser, Page } from 'playwright';
|
import { Browser, Page } from 'playwright';
|
||||||
|
|
||||||
const APP = 'http://127.0.0.1:3000/test';
|
const APP = 'http://127.0.0.1:3001/test';
|
||||||
|
|
||||||
let browser: Browser;
|
let browser: Browser;
|
||||||
let page: Page;
|
let page: Page;
|
||||||
|
|||||||
Reference in New Issue
Block a user