More tests.

Author: sebadoom

package.json

@@ -26,13 +26,17 @@
     "grunt-mocha-test": "^0.13.3",
     "grunt-webpack": "^3.0.2",
     "highlight.js": "^9.12.0",
+    "inject-loader": "^3.0.1",
     "isotope-layout": "^3.0.5",
     "jquery": "^3.2.1",
     "jsrsasign": "^8.0.4",
     "jstransformer-markdown-it": "^2.0.0",
+    "lodash": "^4.17.4",
     "loglevel": "^1.6.1",
     "mocha": "^5.0.0",
     "pug": "^2.0.0-rc.4",
+    "sinon": "^4.2.2",
+    "sinon-chai": "^2.14.0",
     "source-map-support": "^0.5.3",
     "stylus": "^0.54.5",
     "uglifyjs-webpack-plugin": "^1.1.6",

src/editor/index.js

@@ -36,7 +36,7 @@ import {
   decodedTabElement
 } from '../dom-elements.js';
 
-import * as log from 'loglevel';
+import log from 'loglevel';
 
 // The event manager lets us enable/disable events as needed without
 // manually tracking them. Events that need to be disabled should be

src/editor/jwt.js

@@ -8,7 +8,7 @@ import {
   utf8tohex 
 } from 'jsrsasign';
 
-import * as log from 'loglevel';
+import log from 'loglevel';
 
 export function sign(header, 
                      payload,

src/utils.js

@@ -1,5 +1,5 @@
 import { KEYUTIL } from 'jsrsasign';
-import * as log from 'loglevel';
+import log from 'loglevel';
 
 export function httpGet(url, cache = true) {
   return new Promise((resolve, reject) => {

src/website/counter.js

@@ -5,7 +5,7 @@ import { httpGet } from '../utils.js';
 import $ from 'jquery';
 import jQuery from 'jquery';
 import 'flipclock/compiled/flipclock.js';
-import * as log from 'loglevel';
+import log from 'loglevel';
 
 const initialCount = 80482701;
 const pollIntervalWhenVisible = 5000;

src/website/libraries.js

@@ -7,7 +7,7 @@ import {
 } from './dom-elements.js';
 
 import Isotope from 'isotope-layout';
-import * as log from 'loglevel';
+import log from 'loglevel';
 
 const librariesGrid = new Isotope(librariesElement, {
   layoutMode: 'fitRows',

src/website/smooth-scrolling.js

@@ -2,7 +2,7 @@ import { menuScrollableLinks, navbarElement } from './dom-elements.js';
 import { isWideScreen } from '../utils.js';
 
 import $ from 'jquery';
-import * as log from 'loglevel';
+import log from 'loglevel';
 
 // This is the only function that really requires jQuery, other than some
 // of the dependencies. Consider this when adding code that depends on

test/unit/editor/jwt.js

@@ -3,21 +3,13 @@ import tokens from '../../../src/editor/default-tokens.js';
 
 import { utf8tob64u, b64utob64 } from 'jsrsasign';
 
-import * as log from 'loglevel';
+import log from 'loglevel';
 
 import { should } from 'chai';
 
 should();
 
-describe('JWT (logging disabled, enable it for debugging)', function() {
-  before(function() {
-    log.disableAll();
-  });
-
-  after(function() {
-    log.enableAll();
-  });
-
+describe('JWT', function() {
   it('detects tokens', function() {
     jwt.isToken('skdjf9238ujdhkf.asdfasdf2.sdsdffsfsd').should.be.false;
     jwt.isToken('skdjf9238ujdhkf.asdfasdf2').should.be.false;
@@ -59,43 +51,50 @@ describe('JWT (logging disabled, enable it for debugging)', function() {
     jwt.verify(tokens.ps384.token, tokens.ps384.publicKey).should.be.true;
   });
 
-  it('fails to verify invalid tokens', function() {
-    const split = tokens.hs256.token.split('.');
-    const token = `${split[0]}.${split[1]}`;
-    const token2 = token + '.';
-
-    jwt.verify(token, tokens.hs256.secret).should.be.false;
-    jwt.verify(token2, tokens.hs256.secret).should.be.false;
-
-    jwt.verify(tokens.hs256.token, tokens.hs256.secret + 'sdfasdf')
-       .should.be.false;
-    jwt.verify(tokens.hs256.token, 'sdfsdf' + tokens.hs256.secret)
-       .should.be.false;
-    jwt.verify(tokens.hs256.token, 'sdfsdf').should.be.false;
-
-    jwt.verify(tokens.rs256.token, tokens.rs256.publicKey.replace('a','b'))
-       .should.be.false;
-
-    jwt.verify(tokens.es256.token, tokens.es256.publicKey.replace('a','b'))
-       .should.be.false;
-    
-    jwt.verify(tokens.ps256.token, tokens.ps256.publicKey.replace('a','b'))
-       .should.be.false;
-
-    const header = {
-      typ: 'JWT',
-      alg: 'none'
-    };
-    const payload = {
-      sub: 'test'
-    };
+  it('fails to verify invalid tokens ' +
+     '(logging temporarily disabled to hide exceptions)', function() {
+    log.disableAll();
 
-    const token3 = `${utf8tob64u(JSON.stringify(header))}.` + 
-                   `${utf8tob64u(JSON.stringify(payload))}`;
-    
-    jwt.verify(token3, 'whatever').should.be.false;
-    jwt.verify(token3 + '.', 'whatever').should.be.false;
-    jwt.verify(token3 + '.' + split[2], 'whatever').should.be.false;
+    try {
+      const split = tokens.hs256.token.split('.');
+      const token = `${split[0]}.${split[1]}`;
+      const token2 = token + '.';
+
+      jwt.verify(token, tokens.hs256.secret).should.be.false;
+      jwt.verify(token2, tokens.hs256.secret).should.be.false;
+
+      jwt.verify(tokens.hs256.token, tokens.hs256.secret + 'sdfasdf')
+        .should.be.false;
+      jwt.verify(tokens.hs256.token, 'sdfsdf' + tokens.hs256.secret)
+        .should.be.false;
+      jwt.verify(tokens.hs256.token, 'sdfsdf').should.be.false;
+
+      jwt.verify(tokens.rs256.token, tokens.rs256.publicKey.replace('a','b'))
+        .should.be.false;
+
+      jwt.verify(tokens.es256.token, tokens.es256.publicKey.replace('a','b'))
+        .should.be.false;
+      
+      jwt.verify(tokens.ps256.token, tokens.ps256.publicKey.replace('a','b'))
+        .should.be.false;
+
+      const header = {
+        typ: 'JWT',
+        alg: 'none'
+      };
+      const payload = {
+        sub: 'test'
+      };
+
+      const token3 = `${utf8tob64u(JSON.stringify(header))}.` + 
+                    `${utf8tob64u(JSON.stringify(payload))}`;
+      
+      jwt.verify(token3, 'whatever').should.be.false;
+      jwt.verify(token3 + '.', 'whatever').should.be.false;
+      jwt.verify(token3 + '.' + split[2], 'whatever').should.be.false;
+    } finally {
+      log.enableAll();
+    }
   });
 
   it('signs tokens (HS256)', function() {