fix e2e tests

Author: yyx990803

example/components/inbox/index.vue

@@ -31,9 +31,7 @@ module.exports = {
 
     activate: function (transition) {
       console.log('activating inbox...')
-      setTimeout(function () {
-        transition.next()
-      }, 500)
+      transition.next()
     },
 
     // for doing cleanups

example/route-config.js

@@ -75,7 +75,7 @@ module.exports = function (router) {
         router.app.authenticating = false
         alert('this route is forbidden by a global before hook')
         transition.abort()
-      }, 500)
+      }, 1500)
     } else {
       transition.next()
     }

example/services/messages.js

@@ -6,6 +6,6 @@ module.exports = {
         id: params.id,
         text: 'Hello this is a message'
       })
-    }, 1000)
+    }, 1500)
   }
 }

src/router/internal.js

@@ -210,8 +210,6 @@ module.exports = function (Vue, Router) {
       })
     }
 
-    this._currentRoute = route
-
     // handle scroll positions
     // saved scroll positions take priority
     // then we check if the path has an anchor

src/transition.js

@@ -123,6 +123,8 @@ p.start = function (cb) {
   transition.runQueue(daq, pipeline.canDeactivate, function canActivatePhase () {
     transition.runQueue(aq, pipeline.canActivate, function deactivatePhase () {
       transition.runQueue(daq, pipeline.deactivate, function activatePhase () {
+        // validation complete. change the current route.
+        transition.router._currentRoute = transition.to
         // trigger reuse for all reused views
         reuseQueue && reuseQueue.forEach(function (view) {
           pipeline.reuse(view, transition)

test/e2e/test.js

@@ -54,19 +54,14 @@ module.exports = {
     // inbox
     .url(base + '/inbox')
       .waitForElementVisible('h1', 1000)
-      .assert.elementNotPresent('.view h2')
-      // wait for inbox's activation hook
-      .pause(600)
       .assert.containsText('.view h2', 'inbox!')
       .assert.containsText('.view', 'default yo')
 
     .url(base + '/inbox/message/123')
       .waitForElementVisible('h1', 1000)
-      .assert.elementNotPresent('.view h2')
-      .pause(600)
-      .assert.containsText('.view h2', 'inbox!')
       .assert.containsText('.view div', 'Loading data')
-      .pause(600)
+      .assert.containsText('.view h2', 'inbox!')
+      .pause(1500)
       .assert.containsText('.view div', 'message #123: Hello this is a message')
       // confirm navigation
       .click('a[href^="/user"]')
@@ -91,7 +86,7 @@ module.exports = {
       .waitForElementVisible('h1', 1000)
       .assert.visible('#app > p')
       .assert.containsText('#app > p', 'Authenticating')
-      .pause(600)
+      .pause(1500)
       .getAlertText(function (text) {
         this.assert.ok(/forbidden by a global before hook/.test(text.value))
       })