[test] fix skipping a page if it is not matching

Signed-off-by: Anton Kosyakov <anton.kosyakov@typefox.io>
eclipse-theia · Jan 31, 2020 · a920c01 · a920c01
1 parent 4f6ff90
commit a920c01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/dev-packages/cli/src/run-test.ts b/dev-packages/cli/src/run-test.ts
@@ -33,6 +33,7 @@ export default async function runTest(options: TestOptions): Promise<void> {
 
     const testPage = await newTestPage({
         files: options.files,
+        matchAppUrl: () => true, // all urls are application urls
         newPage: async () => {
             const browser = await puppeteer.launch(launch);
             return browser.newPage();

diff --git a/dev-packages/cli/src/test-page.ts b/dev-packages/cli/src/test-page.ts
@@ -59,7 +59,7 @@ export default async function newTestPage(options: TestPageOptions): Promise<pup
     page.exposeFunction('fireDidUnloadTheia', () => theiaLoaded = false);
     const preLoad = (frame: puppeteer.Frame) => {
         const frameUrl = frame.url();
-        if (matchAppUrl && matchAppUrl(frameUrl)) {
+        if (matchAppUrl && !matchAppUrl(frameUrl)) {
             return;
         }
         if (theiaLoaded) {
@@ -76,7 +76,7 @@ export default async function newTestPage(options: TestPageOptions): Promise<pup
     page.on('framenavigated', preLoad);
 
     page.on('load', async () => {
-        if (matchAppUrl && matchAppUrl(page.url())) {
+        if (matchAppUrl && !matchAppUrl(page.url())) {
             return;
         }
         console.log('loading mocha...');