vndb/mithril-vndb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1404

Browse source
This commit is contained in:
Leo Horie 2016-12-01 01:45:07 -05:00
parent f7c187eec9
commit 713c25c9c0
24 changed files with 437 additions and 629 deletions
Download patch file Download diff file Expand all files Collapse all files

24
api/tests/test-router.js
View file

@ -6,25 +6,23 @@ var browserMock = require("../../test-utils/browserMock")
var m = require("../../render/hyperscript")
var coreRenderer = require("../../render/render")
var apiPubSub = require("../../api/pubsub")
var apiRedraw = require("../../api/redraw")
var apiRouter = require("../../api/router")
var apiMounter = require("../../api/mount")
o.spec("route", function() {
void [{protocol: "http:", hostname: "localhost"}, {protocol: "file:", hostname: "/"}].forEach(function(env) {
void ["#", "?", "", "#!", "?!", "/foo"].forEach(function(prefix) {
o.spec("using prefix `" + prefix + "` starting on " + env.protocol + "//" + env.hostname, function() {
var FRAME_BUDGET = Math.floor(1000 / 60)
var $window, root, redraw, mount, route
var $window, root, redrawService, route
o.beforeEach(function() {
$window = browserMock(env)
root = $window.document.body
redraw = apiPubSub()
mount = apiMounter(coreRenderer($window), redraw)
route = apiRouter($window, mount)
redrawService = apiRedraw($window)
route = apiRouter($window, redrawService)
route.prefix(prefix)
})
@ -59,7 +57,7 @@ o.spec("route", function() {
o(view.callCount).equals(1)
redraw.publish(true)
redrawService.redraw()
o(view.callCount).equals(2)
@ -122,15 +120,15 @@ o.spec("route", function() {
o(oninit.callCount).equals(1)
redraw.publish(true)
redrawService.redraw()
o(onupdate.callCount).equals(1)
})
o("redraws on events", function(done) {
var onupdate = o.spy()
var oninit = o.spy()
var onclick = o.spy()
var oninit = o.spy()
var onclick = o.spy()
var e = $window.document.createEvent("MouseEvents")
e.initEvent("click", true, true)
@ -403,7 +401,7 @@ o.spec("route", function() {
o(matchCount).equals(1)
o(renderCount).equals(1)
redraw.publish(true)
redrawService.redraw()
o(matchCount).equals(1)
o(renderCount).equals(2)
@ -505,7 +503,7 @@ o.spec("route", function() {
o(view.callCount).equals(1)
o(onmatch.callCount).equals(1)
redraw.publish(true)
redrawService.redraw()
o(view.callCount).equals(2)
o(onmatch.callCount).equals(1)
@ -515,7 +513,7 @@ o.spec("route", function() {
})
o("m.route.set(m.route.get()) re-runs the resolution logic (#1180)", function(done){
var onmatch = o.spy(function(resolve){resolve()})
var onmatch = o.spy(function(resolve) {resolve()})
$window.location.href = prefix + "/"
route(root, '/', {