Upgrade babel-eslint

package.json

@@ -1,6 +1,6 @@
 {
   "name": "navigo",
-  "version": "2.3.0",
+  "version": "2.3.1",
   "description": "A simple vanilla JavaScript router with a fallback for older browsers",
   "main": "lib/navigo.js",
   "jsnext:main": "src/index.js",
@@ -30,7 +30,7 @@
   "devDependencies": {
     "babel": "6.3.26",
     "babel-core": "6.4.5",
-    "babel-eslint": "5.0.0-beta6",
+    "babel-eslint": "^6.1.2",
     "babel-loader": "6.2.1",
     "babel-plugin-add-module-exports": "0.1.2",
     "babel-preset-es2015": "6.3.13",

src/index.js

@@ -161,6 +161,7 @@ Navigo.prototype = {
         handler(m.params);
       return m;
     } else if (this._defaultHandler && (url === '' || url === '/')) {
+      this._lastRouteResolved = url;
       this._defaultHandler();
       return true;
     } else if (this._notFoundHandler) {

test/Navigo.spec.js

@@ -110,6 +110,7 @@ describe('Given an instance of Navigo', function () {
           expect(action).to.be.equal('save');
           done();
         };
+
         router.on(/users\/(\d+)\/(\w+)\/?/, handler);
         router.resolve('site.com/app/users/42/save');
       });
@@ -118,6 +119,7 @@ describe('Given an instance of Navigo', function () {
     describe('and when we use the destroy method', function () {
       it('should not be able to resolve a route', function () {
         var handler = sinon.spy();
+
         router.on('/users', handler);
         router.resolve('site.com/app/users');
         router.destroy();
@@ -245,7 +247,7 @@ describe('Given an instance of Navigo', function () {
 
         expect(handler)
           .to.be.calledOnce
-          .and.to.be.calledWith({ productId: '42' })
+          .and.to.be.calledWith({ productId: '42' });
       });
     });
   });
@@ -271,4 +273,25 @@ describe('Given an instance of Navigo', function () {
     });
   });
 
+  describe('Given the issue #41 case', function () {
+    it('should resolve routes properly', function () {
+      var taskRoute = sinon.spy();
+      var defaultRoute = sinon.spy();
+
+      router = new Navigo('http://site.com/', true);
+      router.on('/task/:taskId/', taskRoute);
+      router.on(defaultRoute);
+
+      router.resolve('/task/frontend-1');
+      router.resolve('/');
+      router.resolve('/task/frontend-1');
+
+      expect(defaultRoute).to.be.calledOnce;
+      expect(taskRoute).to.be.calledTwice;
+      expect(taskRoute.firstCall).to.be.calledWith({ taskId: 'frontend-1' });
+      expect(taskRoute.secondCall).to.be.calledWith({ taskId: 'frontend-1' });
+
+    });
+  });
+
 });