Add Historian.instance

karma.conf.js

@@ -79,6 +79,6 @@ module.exports = function(config) {
 
     // Concurrency level
     // how many browser should be started simultaneous
-    concurrency: Infinity
+    concurrency: 1
   })
 }

src/client.ts

@@ -21,7 +21,7 @@ import nodeReporter from './reporter/node';
 import xhrReporter from './reporter/xhr';
 import jsonpReporter from './reporter/jsonp';
 
-import {historian, getHistory} from './historian';
+import Historian from './historian';
 
 
 declare const VERSION: string;
@@ -36,6 +36,7 @@ interface Todo {
 
 class Client {
     private opts: any;
+    private historian: Historian;
 
     private processor: Processor;
     private reporter: Reporter;
@@ -98,17 +99,18 @@ class Client {
             this.addFilter(nodeFilter);
         }
 
-        historian.registerNotifier(this);
+        this.historian = Historian.instance();
+        this.historian.registerNotifier(this);
         if (opts.unwrapConsole || isDevEnv(opts)) {
-            historian.unwrapConsole();
+            this.historian.unwrapConsole();
         }
     }
 
     close(): void {
         for (let fn of this.onClose) {
             fn();
         }
-        historian.unregisterNotifier(this);
+        this.historian.unregisterNotifier(this);
     }
 
     private setReporter(name: string|Reporter): void {
@@ -179,7 +181,7 @@ class Client {
             });
         }
 
-        let history = getHistory();
+        let history = this.historian.getHistory();
         if (history.length > 0) {
             notice.context.history = history;
         }
@@ -224,7 +226,7 @@ class Client {
                 return fn.apply(this, wrappedArgs);
             } catch (err) {
                 client.notify({error: err, params: {arguments: fnArgs}});
-                historian.ignoreNextWindowError();
+                this.historian.ignoreNextWindowError();
                 throw err;
             }
         } as FuncWrapper;
@@ -262,7 +264,7 @@ class Client {
     }
 
     onerror(): void {
-        historian.onerror.apply(historian, arguments);
+        this.historian.onerror.apply(this.historian, arguments);
     }
 
     private onOnline(): void {

src/historian.ts

@@ -13,6 +13,8 @@ interface XMLHttpRequestWithState extends XMLHttpRequest {
 
 
 export default class Historian {
+    private static _instance: Historian;
+
     private historyMaxLen = 20;
 
     private notifiers: Notifier[] = [];
@@ -89,6 +91,13 @@ export default class Historian {
         }
     }
 
+    static instance(): Historian {
+        if (!Historian._instance) {
+            Historian._instance = new Historian();
+        }
+        return Historian._instance;
+    }
+
     registerNotifier(notifier: Notifier) {
         this.notifiers.push(notifier);
 
@@ -393,9 +402,3 @@ export default class Historian {
         this.lastLocation = url;
     }
 }
-
-export let historian = new Historian();
-
-export function getHistory(): any[] {
-    return historian.getHistory();
-}

test/unit/jsonify_notice_test.ts

@@ -2,6 +2,7 @@ import Notice from '../../src/notice';
 import jsonifyNotice from '../../src/jsonify_notice';
 import { expect } from './sinon_chai';
 
+
 describe('jsonify_notice', () => {
     const maxLength = 30000;