Fix default behaviour for flush method, issue #30

tsironis · Feb 29, 2016 · f1c2bc8 · f1c2bc8
1 parent ceee274
commit f1c2bc8
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 2 deletions.
diff --git a/lockr.js b/lockr.js
@@ -165,7 +165,13 @@
   };
 
   Lockr.flush = function () {
-    localStorage.clear();
+    if (Lockr.prefix.length) {
+      Lockr.keys().forEach(function(key) {
+        localStorage.removeItem(key);
+      });
+    } else {
+      localStorage.clear();
+    }
   };
   return Lockr;
 

diff --git a/lockr.min.js b/lockr.min.js
diff --git a/specs/lockrSpecs.js b/specs/lockrSpecs.js
@@ -214,4 +214,27 @@ describe('Lockr::Prefixed', function() {
     expect(keys).toContain('imaprefixone', 'imaprefixtwo', 'imaprefixthree', 'imaprefixfour');
   });
 
+  describe('Lockr.flush', function  () {
+    beforeEach(function() {
+      localStorage.setItem('noprefix', false);
+      Lockr.set('test', 123);
+      Lockr.sadd('array', 2);
+      Lockr.sadd('array', 3);
+      Lockr.set('hash', {"test": 123, "hey": "whatsup"});
+    });
+
+    it('clears all contents of the localStorage', function () {
+      var oldContents = Lockr.getAll();
+      expect(oldContents.length).not.toBe(0);
+
+      expect(Object.keys(localStorage)).toContain('noprefix')
+      Lockr.flush();
+      expect(Object.keys(localStorage)).toContain('noprefix')
+
+      var contents = Lockr.getAll();
+      expect(contents.length).toBe(0);
+    });
+  });
+
+
 });