fixing issue with multiple driver instances

tymondesigns · Jul 15, 2015 · a7ec281 · a7ec281
1 parent 68808d0
commit a7ec281
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 35 deletions.
diff --git a/dist/angular-locker.js b/dist/angular-locker.js
@@ -628,9 +628,6 @@
                      * @return {Locker}
                      */
                     driver: function (driver) {
-                        // no need to create a new instance if the driver is the same
-                        if (driver === this._options.driver) return this;
-
                         return this.instance(angular.extend(this._options, { driver: driver }));
                     },
 
@@ -655,9 +652,6 @@
                      * @return {Locker}
                      */
                     namespace: function (namespace) {
-                        // no need to create a new instance if the namespace is the same
-                        if (namespace === this._namespace) return this;
-
                         return this.instance(angular.extend(this._options, { namespace: namespace }));
                     },
 

diff --git a/dist/angular-locker.min.js b/dist/angular-locker.min.js
diff --git a/dist/angular-locker.min.js.map b/dist/angular-locker.min.js.map
diff --git a/src/angular-locker.js b/src/angular-locker.js
@@ -628,9 +628,6 @@
                      * @return {Locker}
                      */
                     driver: function (driver) {
-                        // no need to create a new instance if the driver is the same
-                        if (driver === this._options.driver) return this;
-
                         return this.instance(angular.extend(this._options, { driver: driver }));
                     },
 
@@ -655,9 +652,6 @@
                      * @return {Locker}
                      */
                     namespace: function (namespace) {
-                        // no need to create a new instance if the namespace is the same
-                        if (namespace === this._namespace) return this;
-
                         return this.instance(angular.extend(this._options, { namespace: namespace }));
                     },
 

diff --git a/test/spec/angular-locker.spec.js b/test/spec/angular-locker.spec.js
@@ -115,6 +115,14 @@ describe('angular-locker', function () {
                 locker.put('someKey', str);
 
                 expect( locker.get('someKey') ).toEqual(str);
+
+                locker.driver('session').put('sessionKey1', 1);
+                locker.driver('session').put('sessionKey2', 2);
+                locker.driver('local').put('localKey1', 1);
+                locker.driver('local').put('localKey2', 2);
+
+                expect(locker.driver('session').get('sessionKey2')).toEqual(2);
+
             }));
 
             it('should put a boolean into the locker', inject(function (locker) {
@@ -702,27 +710,6 @@ describe('angular-locker', function () {
                 expect( locker.driver('session').getDriver() ).toEqual($window.sessionStorage);
             }));
 
-            it('should return the same instance if driver or namespace not changed', inject(function ($window, locker) {
-                expect( locker.getDriver() ).toEqual($window.localStorage);
-
-                var localInstance1 = locker;
-                var localInstance2 = locker.driver('local');
-                var sessionInstance = locker.driver('session');
-
-                expect( localInstance1 ).toEqual(localInstance2);
-                expect( localInstance1 ).not.toEqual(sessionInstance);
-            }));
-
-            it('should return the same instance if driver or namespace not changed', inject(function ($window, locker) {
-                expect( locker.getNamespace() ).toEqual('locker');
-
-                var defaultNamespace1 = locker;
-                var defaultNamespace2 = locker.namespace('locker');
-                var fooNamespace = locker.namespace('foo');
-
-                expect( defaultNamespace1 ).toEqual(defaultNamespace2);
-                expect( defaultNamespace2 ).not.toEqual(fooNamespace);
-            }));
         });
 
     });