Do not leak client functions into global scope

mantoni · Sep 6, 2021 · e55763d · e55763d
1 parent 85e1eec
commit e55763d
Show file tree

Hide file tree

Showing 5 changed files with 231 additions and 212 deletions.
diff --git a/cli/test/fixture/client-leak.js b/cli/test/fixture/client-leak.js
@@ -0,0 +1,10 @@
+/*eslint-env mocha*/
+'use strict';
+
+describe('test', () => {
+  it('does not leak client functions into global scope', () => {
+    if (typeof MochifyReporter !== 'undefined') {
+      throw new Error('MochifyReporter leaked');
+    }
+  });
+});
diff --git a/cli/test/jsdom.integration.js b/cli/test/jsdom.integration.js
@@ -5,14 +5,18 @@ const { assert } = require('@sinonjs/referee-sinon');
 const execa = require('execa');
 
 describe('jsdom', () => {
-  it('passes', async () => {
-    const result = await execa(
-      '../../index.js',
-      ['--driver', 'jsdom', 'passes.js'],
-      {
+  async function run(file) {
+    try {
+      return await execa('../../index.js', ['--driver', 'jsdom', file], {
         cwd: path.join(__dirname, 'fixture')
-      }
-    );
+      });
+    } catch (error) {
+      return error;
+    }
+  }
+
+  it('passes', async () => {
+    const result = await run('passes.js');
 
     assert.isFalse(result.failed);
     const json = JSON.parse(result.stdout);
@@ -21,22 +25,23 @@ describe('jsdom', () => {
   });
 
   it('fails', async () => {
-    let result;
-    try {
-      result = await execa(
-        '../../index.js',
-        ['--driver', 'jsdom', 'fails.js'],
-        {
-          cwd: path.join(__dirname, 'fixture')
-        }
-      );
-    } catch (error) {
-      result = error;
-    }
+    const result = await run('fails.js');
 
     assert.isTrue(result.failed);
     const json = JSON.parse(result.stdout);
     assert.equals(json.tests.length, 1);
     assert.equals(json.tests[0].fullTitle, 'test fails');
   });
+
+  it('does not leak client functions into global scope', async () => {
+    const result = await run('client-leak.js');
+
+    assert.isFalse(result.failed);
+    const json = JSON.parse(result.stdout);
+    assert.equals(json.tests.length, 1);
+    assert.equals(
+      json.tests[0].fullTitle,
+      'test does not leak client functions into global scope'
+    );
+  });
 });
diff --git a/cli/test/playwright.integration.js b/cli/test/playwright.integration.js
@@ -5,20 +5,22 @@ const { assert } = require('@sinonjs/referee-sinon');
 const execa = require('execa');
 
 describe('playwright', () => {
+  async function run(file) {
+    try {
+      return await execa(
+        '../../index.js',
+        ['--driver', 'playwright', '--driver-option.engine', 'chromium', file],
+        {
+          cwd: path.join(__dirname, 'fixture')
+        }
+      );
+    } catch (error) {
+      return error;
+    }
+  }
+
   it('passes', async () => {
-    const result = await execa(
-      '../../index.js',
-      [
-        '--driver',
-        'playwright',
-        '--driver-option.engine',
-        'chromium',
-        'passes.js'
-      ],
-      {
-        cwd: path.join(__dirname, 'fixture')
-      }
-    );
+    const result = await run('passes.js');
 
     assert.isFalse(result.failed);
     const json = JSON.parse(result.stdout);
@@ -27,28 +29,23 @@ describe('playwright', () => {
   });
 
   it('fails', async () => {
-    let result;
-    try {
-      result = await execa(
-        '../../index.js',
-        [
-          '--driver',
-          'playwright',
-          '--driver-option.engine',
-          'chromium',
-          'fails.js'
-        ],
-        {
-          cwd: path.join(__dirname, 'fixture')
-        }
-      );
-    } catch (error) {
-      result = error;
-    }
+    const result = await run('fails.js');
 
     assert.isTrue(result.failed);
     const json = JSON.parse(result.stdout);
     assert.equals(json.tests.length, 1);
     assert.equals(json.tests[0].fullTitle, 'test fails');
   });
+
+  it('does not leak client functions into global scope', async () => {
+    const result = await run('client-leak.js');
+
+    assert.isFalse(result.failed);
+    const json = JSON.parse(result.stdout);
+    assert.equals(json.tests.length, 1);
+    assert.equals(
+      json.tests[0].fullTitle,
+      'test does not leak client functions into global scope'
+    );
+  });
 });
diff --git a/cli/test/puppeteer.integration.js b/cli/test/puppeteer.integration.js
@@ -5,14 +5,18 @@ const { assert } = require('@sinonjs/referee-sinon');
 const execa = require('execa');
 
 describe('puppeteer', () => {
-  it('passes', async () => {
-    const result = await execa(
-      '../../index.js',
-      ['--driver', 'puppeteer', 'passes.js'],
-      {
+  async function run(file) {
+    try {
+      return await execa('../../index.js', ['--driver', 'puppeteer', file], {
         cwd: path.join(__dirname, 'fixture')
-      }
-    );
+      });
+    } catch (error) {
+      return error;
+    }
+  }
+
+  it('passes', async () => {
+    const result = await run('passes.js');
 
     assert.isFalse(result.failed);
     const json = JSON.parse(result.stdout);
@@ -21,22 +25,23 @@ describe('puppeteer', () => {
   });
 
   it('fails', async () => {
-    let result;
-    try {
-      result = await execa(
-        '../../index.js',
-        ['--driver', 'puppeteer', 'fails.js'],
-        {
-          cwd: path.join(__dirname, 'fixture')
-        }
-      );
-    } catch (error) {
-      result = error;
-    }
+    const result = await run('fails.js');
 
     assert.isTrue(result.failed);
     const json = JSON.parse(result.stdout);
     assert.equals(json.tests.length, 1);
     assert.equals(json.tests[0].fullTitle, 'test fails');
   });
+
+  it('does not leak client functions into global scope', async () => {
+    const result = await run('client-leak.js');
+
+    assert.isFalse(result.failed);
+    const json = JSON.parse(result.stdout);
+    assert.equals(json.tests.length, 1);
+    assert.equals(
+      json.tests[0].fullTitle,
+      'test does not leak client functions into global scope'
+    );
+  });
 });