rename limiter to throttle and refactor
- don't inject raf/setTimeout since we can't really mock them w/ a good degree of timing accuracy anyways fix some unrelated tests
This commit is contained in:
Leo Horie
parent
2af3aa27c7
commit
977239d207
15 changed files with 813 additions and 353 deletions
|
|
@ -3,189 +3,144 @@
|
|||
var o = require("../../ospec/ospec")
|
||||
var pushStateMock = require("../../test-utils/pushStateMock")
|
||||
var domMock = require("../../test-utils/domMock")
|
||||
var async = require("./async")
|
||||
|
||||
var m = require("../../render/hyperscript")
|
||||
// Convention would be `createRouter`, but that causes variable shadowing bugs
|
||||
// in browsers when running tests, so `makeRouter` it is
|
||||
var makeRouter = require("../router")
|
||||
var router = require("../../api/router")
|
||||
|
||||
o.spec("m.route", function() {
|
||||
var $window, root, router
|
||||
var FRAME_BUDGET = 1000 / 60
|
||||
var $window, root, route, redraw
|
||||
|
||||
void [
|
||||
"setTimeout",
|
||||
"requestAnimationFrame"
|
||||
].forEach(function(timing) {
|
||||
o.spec(timing, function() {
|
||||
void [
|
||||
"#",
|
||||
"?",
|
||||
"#!",
|
||||
"?!",
|
||||
""
|
||||
].forEach(function(prefix) {
|
||||
var spec = prefix ? "prefix " + prefix : "pushstate";
|
||||
|
||||
o.spec(spec, function() {
|
||||
o.beforeEach(function() {
|
||||
var dom = domMock()
|
||||
var location = pushStateMock()
|
||||
|
||||
// Generate a DOM + Location mock
|
||||
Object.keys(location).forEach(function(key) {
|
||||
dom[key] = location[key]
|
||||
})
|
||||
|
||||
$window = dom
|
||||
async[timing]($window)
|
||||
root = $window.document.body
|
||||
})
|
||||
|
||||
o("is a function", function() {
|
||||
o(typeof makeRouter).equals("function")
|
||||
})
|
||||
|
||||
o("returns a function after invocation", function() {
|
||||
o(typeof makeRouter($window)).equals("function")
|
||||
})
|
||||
|
||||
o("updates passed in redraw object", function() {
|
||||
var redraw = {}
|
||||
var router = makeRouter($window, redraw)
|
||||
|
||||
router.prefix(prefix)
|
||||
|
||||
router(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("div")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
o(typeof redraw.run).equals("function")
|
||||
})
|
||||
|
||||
o("renders into `root`", function() {
|
||||
var router = makeRouter($window, {})
|
||||
|
||||
router.prefix(prefix)
|
||||
|
||||
router(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("div")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
o(root.firstChild.nodeName).equals("DIV")
|
||||
})
|
||||
|
||||
o("redraws on redraw.run()", function(done) {
|
||||
var onupdate = o.spy()
|
||||
var oninit = o.spy()
|
||||
var redraw = {}
|
||||
var router = makeRouter($window, redraw)
|
||||
|
||||
router.prefix(prefix)
|
||||
|
||||
router(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("div", {
|
||||
oninit: oninit,
|
||||
onupdate: onupdate
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
o(oninit.callCount).equals(1)
|
||||
|
||||
redraw.run()
|
||||
|
||||
// Wrapped to give time for the rate-limited redraw to fire
|
||||
setTimeout(function() {
|
||||
o(onupdate.callCount).equals(1)
|
||||
|
||||
done()
|
||||
}, 20)
|
||||
})
|
||||
|
||||
o("redraws on events", function(done, timeout) {
|
||||
var onupdate = o.spy()
|
||||
var oninit = o.spy()
|
||||
var onclick = o.spy()
|
||||
var router = makeRouter($window, {})
|
||||
var e = $window.document.createEvent("MouseEvents")
|
||||
|
||||
e.initEvent("click", true, true)
|
||||
|
||||
router.prefix(prefix)
|
||||
|
||||
router(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("div", {
|
||||
oninit: oninit,
|
||||
onupdate: onupdate,
|
||||
onclick: onclick,
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
root.firstChild.dispatchEvent(e)
|
||||
|
||||
o(oninit.callCount).equals(1)
|
||||
|
||||
o(onclick.callCount).equals(1)
|
||||
o(onclick.this).equals(root.firstChild)
|
||||
o(onclick.args[0].type).equals("click")
|
||||
o(onclick.args[0].target).equals(root.firstChild)
|
||||
|
||||
// Wrapped to give time for the rate-limited redraw to fire
|
||||
setTimeout(function() {
|
||||
o(onupdate.callCount).equals(1)
|
||||
|
||||
done()
|
||||
}, 20)
|
||||
})
|
||||
|
||||
o("changes location on route.link", function() {
|
||||
var router = makeRouter($window, {})
|
||||
var e = $window.document.createEvent("MouseEvents")
|
||||
|
||||
e.initEvent("click", true, true)
|
||||
|
||||
router.prefix(prefix)
|
||||
|
||||
router(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("a", {
|
||||
href: "/test",
|
||||
oncreate: router.link
|
||||
})
|
||||
}
|
||||
},
|
||||
"/test" : {
|
||||
view : function() {
|
||||
return m("div")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
o($window.location.href).equals("http://localhost/" + (prefix ? prefix + "/" : ""))
|
||||
|
||||
root.firstChild.dispatchEvent(e)
|
||||
|
||||
o($window.location.href).equals("http://localhost/" + (prefix ? prefix + "/test" : "test"))
|
||||
})
|
||||
})
|
||||
})
|
||||
o.beforeEach(function() {
|
||||
$window = {}
|
||||
|
||||
var dom = domMock()
|
||||
for (var key in dom) $window[key] = dom[key]
|
||||
|
||||
var loc = pushStateMock()
|
||||
for (var key in loc) $window[key] = loc[key]
|
||||
|
||||
root = $window.document.body
|
||||
|
||||
redraw = {}
|
||||
route = router($window, redraw)
|
||||
})
|
||||
|
||||
o("updates redraw object", function() {
|
||||
route(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("div")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
o(typeof redraw.run).equals("function")
|
||||
})
|
||||
|
||||
o("renders into `root`", function() {
|
||||
route(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("div")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
o(root.firstChild.nodeName).equals("DIV")
|
||||
})
|
||||
|
||||
o("redraws on redraw.run()", function(done) {
|
||||
var onupdate = o.spy()
|
||||
var oninit = o.spy()
|
||||
|
||||
route(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("div", {
|
||||
oninit: oninit,
|
||||
onupdate: onupdate
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
o(oninit.callCount).equals(1)
|
||||
|
||||
redraw.run()
|
||||
|
||||
// Wrapped to give time for the rate-limited redraw to fire
|
||||
setTimeout(function() {
|
||||
o(onupdate.callCount).equals(1)
|
||||
|
||||
done()
|
||||
}, FRAME_BUDGET)
|
||||
})
|
||||
|
||||
o("redraws on events", function(done, timeout) {
|
||||
var onupdate = o.spy()
|
||||
var oninit = o.spy()
|
||||
var onclick = o.spy()
|
||||
var e = $window.document.createEvent("MouseEvents")
|
||||
|
||||
e.initEvent("click", true, true)
|
||||
|
||||
route(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("div", {
|
||||
oninit: oninit,
|
||||
onupdate: onupdate,
|
||||
onclick: onclick,
|
||||
})
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
root.firstChild.dispatchEvent(e)
|
||||
|
||||
o(oninit.callCount).equals(1)
|
||||
|
||||
o(onclick.callCount).equals(1)
|
||||
o(onclick.this).equals(root.firstChild)
|
||||
o(onclick.args[0].type).equals("click")
|
||||
o(onclick.args[0].target).equals(root.firstChild)
|
||||
|
||||
// Wrapped to give time for the rate-limited redraw to fire
|
||||
setTimeout(function() {
|
||||
o(onupdate.callCount).equals(1)
|
||||
|
||||
done()
|
||||
}, FRAME_BUDGET)
|
||||
})
|
||||
|
||||
o("changes location on route.link", function() {
|
||||
var e = $window.document.createEvent("MouseEvents")
|
||||
|
||||
e.initEvent("click", true, true)
|
||||
|
||||
route.prefix("?")
|
||||
|
||||
route(root, "/", {
|
||||
"/" : {
|
||||
view: function() {
|
||||
return m("a", {
|
||||
href: "/test",
|
||||
oncreate: route.link
|
||||
})
|
||||
}
|
||||
},
|
||||
"/test" : {
|
||||
view : function() {
|
||||
return m("div")
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
o($window.location.href).equals("http://localhost/?/")
|
||||
|
||||
root.firstChild.dispatchEvent(e)
|
||||
|
||||
o($window.location.href).equals("http://localhost/?/test")
|
||||
})
|
||||
})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue