Updated singleton test

Author: auser

lib/firestack.js

@@ -30,26 +30,26 @@ let log;
 export class Firestack extends Singleton {
 
   constructor(options) {
-    super(options);
+    var instance = super(options);
 
-    this.options = options || {};
-    this._debug = this.options.debug || false;
-    log = this._log = new Log('firestack', this._debug);
+    instance.options = options || {};
+    instance._debug = instance.options.debug || false;
+    log = instance._log = new Log('firestack', instance._debug);
 
     log.info('Creating new firestack instance');
 
-    this._remoteConfig = this.options.remoteConfig || {};
-    delete this.options.remoteConfig;
+    instance._remoteConfig = instance.options.remoteConfig || {};
+    delete instance.options.remoteConfig;
 
-    this.configured = this.options.configure || false;
-    this.auth = null;
+    instance.configured = instance.options.configure || false;
+    instance.auth = null;
 
-    this.eventHandlers = {};
+    instance.eventHandlers = {};
 
-    log.info('Calling configure with options', this.options);
-    this.configurePromise = this.configure(this.options);
+    log.info('Calling configure with options', instance.options);
+    instance.configurePromise = instance.configure(instance.options);
 
-    this._auth = new Authentication(this, this.options);
+    instance._auth = new Authentication(instance, instance.options);
   }
 
   configure(opts={}) {

lib/utils/__tests__/singleton-test.js

@@ -3,38 +3,45 @@ jest.unmock('../singleton');
 import Singleton from '../singleton';
 import sinon from 'sinon'
 
-let created = 0;
 class TestClass extends Singleton {
-  constructor() {
+  static _createdCount;
+
+  constructor(num) {
     super();
-    created += 1;
+    TestClass._createdCount += TestClass._createdCount + 1;
   }
 
   get namespace() {
     return 'firestack:TestClass'
   }
+
+  static get createdCount() {
+    return TestClass._createdCount || 0;
+  }
+
+  static reset() {
+    TestClass._createdCount = 0;
+  }
 }
 
 describe('singleton', () => {
   let tc;
 
   beforeEach(() => {
-    created = 0;
     TestClass.reset();
   })
 
   it('creates an instance of the class', () => {
-    expect(created).toBe(0);
-    TestClass.instance
-    expect(created).toBe(1);
+    expect(TestClass.createdCount).toBe(0);
+    new TestClass();
+    expect(TestClass.createdCount).toBe(1);
   })
 
   it('returns the singleton instance of the class when called a subsequent times', () => {
-    expect(created).toBe(0);
-    tc = TestClass.instance
-    let tc2 = TestClass.instance
-    expect(created).toBe(1);
-    expect(tc).toBe(tc2);
+    expect(TestClass.createdCount).toBe(0);
+    tc = new TestClass()
+    let tc2 = new TestClass()
+    expect(tc).toEqual(tc2);
   })
 
 });

lib/utils/singleton.js

@@ -1,12 +1,9 @@
 'use strict';
 
 const Symbol = require('es6-symbol');
-let singleton;
 
-class Singleton {    
+class Singleton {
   constructor() {
-    this.singleton = Symbol(this.namespace);
-
     let Class = this.constructor;
 
     if(!Class[this.singleton]) {
@@ -24,6 +21,15 @@ class Singleton {
     return this[this.singleton];
   }
 
+  static set instance(instance) {
+    this[this.singleton] = instance;
+    return this[this.singleton];
+  }
+
+  static get singleton() {
+    return Symbol(this.namespace);
+  }
+
   static reset() {
     delete this[this.singleton]
   }