921 firefox scheduler test fix

.gitignore

@@ -1,5 +1,6 @@
 node_modules/
 dist/
+tmp/
 coverage/
 lib/**/*.d.ts
 .idea/

karma.conf.js

@@ -2,6 +2,8 @@
 
 var path = require('path');
 
+var fs = require('fs');
+
 var coverage = process.env.COVERAGE;
 
 // configures browsers to run test against
@@ -11,6 +13,12 @@ var browsers = (process.env.TEST_BROWSERS || 'ChromeHeadless').split(',');
 // use puppeteer provided Chrome for testing
 process.env.CHROME_BIN = require('puppeteer').executablePath();
 
+var tmpDir = path.join(__dirname, 'tmp');
+
+fs.mkdirSync(tmpDir, { recursive: true });
+
+var firefoxProfile = fs.mkdtempSync(path.join(tmpDir, 'firefox-profile'));
+
 var absoluteBasePath = path.resolve(__dirname);
 
 var suite = coverage ? 'test/coverageBundle.js' : 'test/testBundle.js';
@@ -35,6 +43,14 @@ module.exports = function(karma) {
 
     reporters: [ 'progress' ].concat(coverage ? 'coverage' : []),
 
+    customLaunchers: {
+      'FirefoxHeadless': {
+        base: 'Firefox',
+        flags: [ '-headless' ],
+        profile: firefoxProfile
+      }
+    },
+
     browsers,
 
     browserNoActivityTimeout: 30000,

lib/features/scheduler/Scheduler.js

@@ -52,30 +52,49 @@ Scheduler.prototype.schedule = function(taskFn, id = Ids.next()) {
 
   const newScheduled = this._schedule(taskFn, id);
 
+  if (this.DEBUG) {
+    console.log('Scheduler.schedule', { id, ...newScheduled });
+  }
+
   this._scheduled[id] = newScheduled;
 
   return newScheduled.promise;
 };
 
 Scheduler.prototype._schedule = function(taskFn, id) {
 
-  const {
-    promise,
-    resolve,
-    reject
-  } = defer();
+  const deferred = defer();
 
   const executionId = requestAnimationFrame(() => {
+
     try {
-      resolve(taskFn());
-    } catch (error) {
-      reject(error);
+      this._scheduled[id] = null;
+
+      if (this.DEBUG) {
+        console.log('Scheduler.exec', { id, executionId });
+      }
+
+      try {
+        deferred.resolve(taskFn());
+
+        if (this.DEBUG) {
+          console.log('Scheduler.executed', { id, executionId });
+        }
+      } catch (error) {
+        deferred.reject(error);
+      }
+    } catch (err) {
+      console.log(err);
     }
   });
 
+  if (this.DEBUG) {
+    console.log('Scheduler._schedule', { id, executionId });
+  }
+
   return {
     executionId,
-    promise
+    promise: deferred.promise
   };
 };
 
@@ -89,6 +108,11 @@ Scheduler.prototype.cancel = function(id) {
   const scheduled = this._scheduled[id];
 
   if (scheduled) {
+
+    if (this.DEBUG) {
+      console.log('Scheduler.cancel', { id, executionId: scheduled.executionId });
+    }
+
     this._cancel(scheduled);
 
     this._scheduled[id] = null;
@@ -108,17 +132,12 @@ Scheduler.prototype._cancel = function(scheduled) {
  */
 function defer() {
 
-  let resolve;
-  let reject;
+  const deferred = {};
 
-  const promise = new Promise((_resolve, _reject) => {
-    resolve = _resolve;
-    reject = _reject;
+  deferred.promise = new Promise((resolve, reject) => {
+    deferred.resolve = resolve;
+    deferred.reject = reject;
   });
 
-  return {
-    promise,
-    resolve,
-    reject
-  };
+  return deferred;
 }