Merge pull request #35 from Matthew-Edwards/patch-1

Fix bug where log level is reset to default if it's stored as TRACE

Author: pimterry

lib/loglevel.js

@@ -127,12 +127,16 @@
                 storedLevel = window.localStorage['loglevel'];
             }
 
-            if (!storedLevel && cookiesAvailable()) {
+            if (storedLevel === undefined && cookiesAvailable()) {
                 var cookieMatch = cookieRegex.exec(window.document.cookie) || [];
                 storedLevel = cookieMatch[1];
             }
+            
+            if (self.levels[storedLevel] === undefined) {
+                storedLevel = "WARN";
+            }
 
-            self.setLevel(self.levels[storedLevel] || self.levels.WARN);
+            self.setLevel(self.levels[storedLevel]);
         }
 
         /*

test/local-storage-test.js

@@ -44,7 +44,27 @@ define(['test/test-helpers'], function(testHelpers) {
                 expect("debug").toBeTheStoredLevel();
             });
         });
+        
+        describe("If trace level is saved", function () {
+            beforeEach(function () {
+                testHelpers.setStoredLevel("trace");
+            });
+            
+            it("trace is the default log level", function (log) {
+                expect(log).toBeAtLevel("trace");
+            });
+        });
+
+        describe("If debug level is saved", function () {
+            beforeEach(function () {
+                testHelpers.setStoredLevel("debug");
+            });
 
+            it("debug is the default log level", function (log) {
+                expect(log).toBeAtLevel("debug");
+            });
+        });
+        
         describe("If info level is saved", function() {
             beforeEach(function() {
                 testHelpers.setStoredLevel("info");
@@ -67,6 +87,27 @@ define(['test/test-helpers'], function(testHelpers) {
             });
         });
 
+        describe("If warn level is saved", function () {
+            beforeEach(function () {
+                testHelpers.setStoredLevel("warn");
+            });
+
+            it("warn is the default log level", function (log) {
+                expect(log).toBeAtLevel("warn");
+            });
+        });
+
+        describe("If error level is saved", function () {
+            beforeEach(function () {
+                testHelpers.setStoredLevel("error");
+            });
+
+            it("error is the default log level", function (log) {
+                expect(log).toBeAtLevel("error");
+            });
+        });
+
+
         describe("If the level is saved with other data", function() {
             beforeEach(function() {
                 window.localStorage['qwe'] = "asd";