Fix tests

Profiscience · Mar 31, 2017 · 84b7f5a · 84b7f5a
1 parent 122d01a
commit 84b7f5a
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/src/context.ts b/src/context.ts
@@ -125,9 +125,6 @@ export default class Context {
   render() {
     let ctx: Context = this                               // eslint-disable-line
 
-    // ctx.router.component(null)
-    // ko.tasks.runEarly()
-
     while (ctx) {
       if (isUndefined(ctx._redirect)) {
         ctx.router.component(ctx.route.component)

diff --git a/src/router.ts b/src/router.ts
@@ -168,10 +168,10 @@ export default class Router {
 
     this.ctx = toCtx
 
-    toCtx.render()
-
     await fromCtx.runAfterDispose()
 
+    toCtx.render()
+
     if (!isUndefined(toCtx._redirect)) {
       await toCtx.runAfterRender()
       const { router: r, path: p } = traversePath(toCtx.router, toCtx._redirect)

diff --git a/test/basepath.js b/test/basepath.js
@@ -31,7 +31,6 @@ ko.components.register('basepath', {
             t.pass('initializes with basepath')
             t.equals(location.pathname, '/base/foo/foo', 'uses basepath in url on init')
             t.equals(ctx.canonicalPath, '/foo/foo', 'ctx.canonicalPath is correct')
-            t.equals(ctx.fullPath, '/base/foo/foo', 'ctx.fullPath is correct')
 
             ctx.router.initialized.then(() => setTimeout(() => { // Dirty hack for FF/TravisCI
               t.equals($('#foo-link').attr('href'), '/base/foo/foo', 'sets href correctly in path binding')