From d8ad94adb22aa6abbf83499e609da1b69254ee25 Mon Sep 17 00:00:00 2001
From: Leo Horie <leohorie@hotmail.com>
Date: Tue, 6 Dec 2016 16:53:16 -0500
Subject: [PATCH] fix invalidation test

---
 api/tests/test-router.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/api/tests/test-router.js b/api/tests/test-router.js
index cb0e3a8c..7c93438a 100644
--- a/api/tests/test-router.js
+++ b/api/tests/test-router.js
@@ -640,16 +640,22 @@ o.spec("route", function() {
 				})
 
 				o("calling route.set invalidates pending onmatch resolution", function(done) {
+					var rendered = false
 					var resolved
 					$window.location.href = prefix + "/a"
 					route(root, "/a", {
 						"/a": {
 							onmatch: function() {
-								return Promise.resolve(function(resolve) {
-									setTimeout(resolve, 0)
+								return new Promise(function(resolve) {
+									callAsync(function() {
+										callAsync(function() {
+											resolve({view: function() {}})
+										})
+									})
 								})
 							},
 							render: function(vnode) {
+								rendered = true
 								resolved = "a"
 							}
 						},
@@ -662,11 +668,12 @@ o.spec("route", function() {
 
 					route.set("/b")
 
-					setTimeout(function() {
+					callAsync(function() {
+						o(rendered).equals(false)
 						o(resolved).equals("b")
 
 						done()
-					}, 2) //FIXME magic number
+					})
 				})
 
 				o("route changes activate onbeforeremove", function(done) {