Fixing the behavior of the hooks krasimir#182 krasimir#174

Krasimir Tsonev · Krasimir Tsonev · commit b70b7f841e0a · 2018-01-06T06:17:51.000+02:00
diff --git a/.eslintrc b/.eslintrc
@@ -18,10 +18,13 @@
     "unescape": false,
     "window": false,
     "describe": true,
-    "before": true,
     "it": true,
     "expect": true,
-    "sinon": true
+    "sinon": true,
+    "before": true,
+    "after": true,
+    "beforeEach": true,
+    "afterEach": true
   },
 
   "parser": "babel-eslint",
diff --git a/lib/navigo.js b/lib/navigo.js
diff --git a/lib/navigo.js.map b/lib/navigo.js.map
diff --git a/lib/navigo.min.js b/lib/navigo.min.js
diff --git a/lib/navigo.min.js.map b/lib/navigo.min.js.map
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "navigo",
-  "version": "6.0.2",
+  "version": "7.0.0",
   "description": "A simple vanilla JavaScript router with a fallback for older browsers",
   "main": "lib/navigo.js",  
   "browser": "lib/navigo.min.js",  
@@ -23,8 +23,9 @@
     "url": "git@github.com:krasimir/navigo.git"
   },
   "scripts": {
-    "dev": "WEBPACK_ENV=dev ./node_modules/.bin/webpack --progress --colors --watch",
-    "build": "npm run test && WEBPACK_ENV=build ./node_modules/.bin/webpack",
+    "watch": "WEBPACK_ENV=dev ./node_modules/.bin/webpack --progress --colors --watch",
+    "build": "WEBPACK_ENV=dev ./node_modules/.bin/webpack && WEBPACK_ENV=build ./node_modules/.bin/webpack",
+    "release": "npm run build && npm run test",
     "test": "node ./test/karma.js",
     "test-chrome": "node ./test/karma.js --browser=Chrome --watch=true",
     "test-firefox": "node ./test/karma.js --browser=Firefox  --watch=true"
diff --git a/src/index.js b/src/index.js
@@ -144,11 +144,12 @@ function manageHooks(handler, hooks, params) {
         handler();
         hooks.after && hooks.after(params);
       }, params);
+      return;
     } else if (hooks.after) {
       handler();
       hooks.after && hooks.after(params);
+      return;
     }
-    return;
   }
   handler();
 };
@@ -308,6 +309,8 @@ Navigo.prototype = {
   destroy: function () {
     this._routes = [];
     this._destroyed = true;
+    this._lastRouteResolved = null;
+    this._genericHooks = null;
     clearTimeout(this._listeningInterval);
     if (typeof window !== 'undefined') {
       window.removeEventListener('popstate', this._onLocationChange);
diff --git a/test/spec/Helpers.spec.js b/test/spec/Helpers.spec.js
@@ -1,5 +1,5 @@
 import chai from 'chai';
-import Navigo from '../../lib/navigo';
+import Navigo from '../../src';
 
 chai.expect();
 
diff --git a/test/spec/InBrowser.spec.js b/test/spec/InBrowser.spec.js
@@ -1,5 +1,5 @@
 /* global beforeEach, afterEach */
-import Navigo from '../../lib/navigo';
+import Navigo from '../../src';
 import { getBrowser } from '../args';
 
 var router;
@@ -222,9 +222,10 @@ describe('Given the Navigo library on the page', function () {
   });
   describe('and the problem described in issue #79', function () {
     it('should not resolve the handler', function (done) {
-      var router = new Navigo(null, true);
       var handler = sinon.spy();
 
+      router = new Navigo(null, true);
+
       router
         .on('r1', {
           as: 'r1',
diff --git a/test/spec/Navigo.spec.js b/test/spec/Navigo.spec.js
@@ -1,4 +1,4 @@
-import Navigo from '../../lib/navigo';
+import Navigo from '../../src';
 
 var router, handler;
 
@@ -10,7 +10,7 @@ describe('Given an instance of Navigo', function () {
     Navigo.MATCH_REGEXP_FLAGS = '';
   });
 
-  afterEach(function(){
+  afterEach(function () {
     router.destroy();
   });
 
diff --git a/test/spec/features/beforeAfterAllHooks.spec.js b/test/spec/features/beforeAfterAllHooks.spec.js
@@ -1,13 +1,17 @@
 /* global beforeEach, afterEach */
-import Navigo from '../../../lib/navigo';
+import Navigo from '../../../src';
 // import { getBrowser } from '../../args';
 
 var router;
 // var browser = getBrowser();
 
 describe('Given the Navigo library on the page', function () {
-  beforeEach(function () {});
-  afterEach(function () {});
+  beforeEach(function () {
+    
+  });
+  afterEach(function () {
+    router.destroy();
+  });
   describe('and we set beforeAll and afterAll hooks', function () {
     it('should call the hooks', function () {
       var handler = sinon.spy();
@@ -19,9 +23,9 @@ describe('Given the Navigo library on the page', function () {
         before: beforeAll,
         after: afterAll
       });
-      handler = sinon.spy();
       router.on({ '/user/:name': handler });
       router.resolve('/user/Krasimir%20Tsonev');
+
       expect(handler)
         .be.calledOnce
         .and.to.be.calledWith({
diff --git a/test/spec/issues/111.spec.js b/test/spec/issues/111.spec.js
@@ -1,4 +1,4 @@
-import Navigo from '../../../lib/navigo';
+import Navigo from '../../../src';
 // import { getBrowser } from '../../args';
 
 var router;
diff --git a/test/spec/issues/116.spec.js b/test/spec/issues/116.spec.js
@@ -1,9 +1,6 @@
-/* global beforeEach, afterEach */
-import Navigo from '../../../lib/navigo';
-// import { getBrowser } from '../../args';
+import Navigo from '../../../src';
 
 var router;
-// var browser = getBrowser();
 
 describe('Given the Navigo library on the page', function () {
   beforeEach(function () {
diff --git a/test/spec/issues/125.spec.js b/test/spec/issues/125.spec.js
@@ -1,6 +1,4 @@
-/* global beforeEach, afterEach */
-import Navigo from '../../../lib/navigo';
-// import { getBrowser } from '../../args';
+import Navigo from '../../../src';
 
 var router;
 // var browser = getBrowser();
diff --git a/test/spec/issues/128.spec.js b/test/spec/issues/128.spec.js
@@ -1,5 +1,4 @@
-import Navigo from '../../../lib/navigo';
-// import { getBrowser } from '../../args';
+import Navigo from '../../../src';
 
 var router;
 // var browser = getBrowser();
diff --git a/test/spec/issues/136.spec.js b/test/spec/issues/136.spec.js
@@ -1,16 +1,12 @@
-import Navigo from '../../../lib/navigo';
-// import { getBrowser } from '../../args';
-
-var router;
-// var browser = getBrowser();
+import Navigo from '../../../src';
 
 describe('Given the Navigo library on the page', function () {
   describe('and the feature described in #136', function () {
     it('should call the already hook', function () {
       var handler = sinon.spy();
       var alreadyHandler = sinon.spy();
+      var router = new Navigo('http://site.com/', true);
 
-      router = new Navigo('http://site.com/', true);
       router.on('/:moduleName', handler, {
         already: alreadyHandler
       });
@@ -20,7 +16,7 @@ describe('Given the Navigo library on the page', function () {
       router.resolve('/rock');
       router.resolve('/rock');
 
-      expect(handler).to.not.be.calledOnce;
+      expect(handler).to.be.calledOnce;
       expect(alreadyHandler.callCount).to.equal(3);
     });
   });
diff --git a/test/spec/issues/146.spec.js b/test/spec/issues/146.spec.js
@@ -1,4 +1,4 @@
-import Navigo from '../../../lib/navigo';
+import Navigo from '../../../src';
 
 var router;
 
diff --git a/test/spec/issues/147.spec.js b/test/spec/issues/147.spec.js
@@ -1,4 +1,4 @@
-import Navigo from '../../../lib/navigo';
+import Navigo from '../../../src';
 import { getBrowser } from '../../args';
 
 var router;
diff --git a/test/spec/issues/157.spec.js b/test/spec/issues/157.spec.js
@@ -1,4 +1,4 @@
-import Navigo from '../../../lib/navigo';
+import Navigo from '../../../src';
 
 describe('Given the getOnlyURL helper', function () {
   describe('when we use a hash based URL', function () {
diff --git a/test/spec/issues/162.spec.js b/test/spec/issues/162.spec.js
@@ -1,4 +1,4 @@
-import Navigo from '../../../lib/navigo';
+import Navigo from '../../../src';
 
 describe('Given the Navigo library on the page and the bug described in #162', function () {
   it('should properly resolve the route handler even tho there is no dynamic param', function () {
diff --git a/test/spec/issues/167.spec.js b/test/spec/issues/167.spec.js
@@ -1,4 +1,4 @@
-import Navigo from '../../../lib/navigo';
+import Navigo from '../../../src';
 
 describe('Given the issue #167', function () {
   it('should have parameterized routes that work', function () {
diff --git a/test/spec/issues/174.spec.js b/test/spec/issues/174.spec.js
@@ -0,0 +1,26 @@
+import Navigo from '../../../src';
+
+describe('Given the issue #174', function () {
+  it('should call the handler when we pass a hook object but no before and after', function () {
+    var handler = sinon.spy();
+    var router = new Navigo('http://site.com/', false);
+    var alreadyHandler = sinon.spy();
+    var leaveHandler = sinon.spy();
+    var aboutHandler = sinon.spy();
+
+    router.on('/products/:id', handler, {
+      already: alreadyHandler,
+      leave: leaveHandler
+    });
+    router.on('/about', aboutHandler);
+
+    router.resolve('/products/421');
+    router.resolve('/products/421');
+    router.resolve('/about');
+
+    expect(handler).to.be.calledOnce.and.to.be.calledWith({ id: '421' });
+    expect(alreadyHandler).to.be.calledOnce.and.to.be.calledWith({ id: '421' });
+    expect(leaveHandler).to.be.calledOnce;
+    expect(aboutHandler).to.be.calledOnce;
+  });
+});
diff --git a/webpack.config.js b/webpack.config.js
@@ -14,7 +14,7 @@ if (env === 'build') {
   outputFile = appName + '.js';
 }
 
-var config = {
+module.exports = {
   entry: __dirname + '/src/index.js',
   devtool: 'source-map',
   output: {
@@ -33,7 +33,7 @@ var config = {
       },
       {
         test: /(\.jsx|\.js)$/,
-        loader: "eslint-loader",
+        loader: 'eslint-loader',
         exclude: /node_modules/
       }
     ]
@@ -44,5 +44,3 @@ var config = {
   },
   plugins: plugins
 };
-
-module.exports = config;
