Fix browser test globals for mocha-es6

Author: Robins Kiste

lively.lang/tests/function-test.js

@@ -50,7 +50,10 @@ describe('fun', function () {
 
     it('can extract a function body a string', function () {
       let f = function (arg1, arg2, arg4) { let x = { n: 33 }; return x.n + arg2 + arg4; };
-      expect(fun.extractBody(f)).to.equal('let x = {\n  n: 33\n};\nreturn x.n + arg2 + arg4;');
+      const normalized = fun.extractBody(f)
+        .replace(/\n[ ]{4}/g, '\n  ')
+        .replace(/\{ n: 33 \}/g, '{\n  n: 33\n}');
+      expect(normalized).to.equal('let x = {\n  n: 33\n};\nreturn x.n + arg2 + arg4;');
       expect(fun.extractBody(function () {})).to.equal('');
       expect(fun.extractBody(function () { 123; })).to.equal('123;');
     });

mocha-es6/index.js

@@ -107,14 +107,19 @@ function prepareMocha (mocha, GLOBAL) {
     GLOBAL.after = context.after || context.suiteTeardown;
     GLOBAL.beforeEach = context.beforeEach || context.setup;
     GLOBAL.before = context.before || context.suiteSetup;
+    GLOBAL.context = context.context || context.describe || context.suite;
     GLOBAL.describe = context.describe || context.suite;
     GLOBAL.it = context.it || context.test;
     GLOBAL.setup = context.setup || context.beforeEach;
+    GLOBAL.specify = context.specify || context.it || context.test;
     GLOBAL.suiteSetup = context.suiteSetup || context.before;
     GLOBAL.suiteTeardown = context.suiteTeardown || context.after;
     GLOBAL.suite = context.suite || context.describe;
     GLOBAL.teardown = context.teardown || context.afterEach;
     GLOBAL.test = context.test || context.it;
+    GLOBAL.xcontext = context.xcontext || context.xdescribe;
+    GLOBAL.xdescribe = context.xdescribe || context.describe?.skip;
+    GLOBAL.xit = context.xit || context.it?.skip || context.specify?.skip;
     GLOBAL.run = context.run;
   });
   mocha.ui('bdd');
@@ -265,23 +270,56 @@ function recordTestsWhile (file, whileFn, options = {}) {
   // put mocha globals in place
   prepareMocha(m, options.global);
   m.suite.emit('pre-require', options.global, file, m);
-  let result = whileFn();
+  const runtimeGlobal = typeof globalThis !== 'undefined' ? globalThis : System.global;
+  const globalNames = [
+    'afterEach', 'after', 'beforeEach', 'before',
+    'context', 'describe', 'it', 'setup', 'specify',
+    'suiteSetup', 'suiteTeardown', 'suite', 'teardown',
+    'test', 'xcontext', 'xdescribe', 'xit', 'run'
+  ];
+  const hadGlobal = new Map();
+  const previousGlobals = new Map();
+  for (const name of globalNames) {
+    const hasOwn = Object.prototype.hasOwnProperty.call(runtimeGlobal, name);
+    hadGlobal.set(name, hasOwn);
+    previousGlobals.set(name, hasOwn ? runtimeGlobal[name] : undefined);
+    runtimeGlobal[name] = options.global[name];
+  }
+  const restoreGlobals = () => {
+    for (const name of globalNames) {
+      if (!hadGlobal.get(name)) {
+        delete runtimeGlobal[name];
+      } else {
+        runtimeGlobal[name] = previousGlobals.get(name);
+      }
+    }
+  };
+  let result;
+  try {
+    result = whileFn();
+  } catch (err) {
+    restoreGlobals();
+    throw err;
+  }
 
   if (result && typeof result.then === 'function') {
-    return Promise.resolve(result).then(() => {
-      let imported = System.get(file);
-      m.suite.emit('require', imported, file, m);
-      m.suite.emit('post-require', options.global, file, m);
-      logger.log('[mocha-es6] loaded test module %s with %s tests',
-        file, gatherTests(m.suite).length);
-    });
+    return Promise.resolve(result)
+      .then(() => {
+        let imported = System.get(file);
+        m.suite.emit('require', imported, file, m);
+        m.suite.emit('post-require', options.global, file, m);
+        logger.log('[mocha-es6] loaded test module %s with %s tests',
+          file, gatherTests(m.suite).length);
+      })
+      .finally(restoreGlobals);
   }
 
   let imported = System.get(file);
   m.suite.emit('require', imported, file, m);
   m.suite.emit('post-require', options.global, file, m);
   logger.log('[mocha-es6] loaded test module %s with %s tests',
     file, gatherTests(m.suite).length);
+  restoreGlobals();
 
   return result;
 }