Make errors and their messages more accurate and helpful (#2536)
Also, I normalized them to all be sentences for consistency, and I moved the reentrancy check from `m.mount` to `m.render` to be a little more helpful. The router change during mounting is inconsequential and only to avoid the new modified error, and the change to the update loop is to send the original error if an error occurred while initializing the default route. (This is all around more useful anyways.) And while I was at it, I fixed an obscure bug with sync redraws.
This commit is contained in:
Isiah Meadows
GitHub
parent
475747800a
commit
b98ab29efd
14 changed files with 310 additions and 54 deletions
|
|
@ -91,6 +91,30 @@ o.spec("mount/redraw", function() {
|
|||
o(spy3.callCount).equals(2)
|
||||
})
|
||||
|
||||
o("should not redraw when mounting another root", function() {
|
||||
var el1 = $document.createElement("div")
|
||||
var el2 = $document.createElement("div")
|
||||
var el3 = $document.createElement("div")
|
||||
var spy1 = o.spy()
|
||||
var spy2 = o.spy()
|
||||
var spy3 = o.spy()
|
||||
|
||||
m.mount(el1, {view: spy1})
|
||||
o(spy1.callCount).equals(1)
|
||||
o(spy2.callCount).equals(0)
|
||||
o(spy3.callCount).equals(0)
|
||||
|
||||
m.mount(el2, {view: spy2})
|
||||
o(spy1.callCount).equals(1)
|
||||
o(spy2.callCount).equals(1)
|
||||
o(spy3.callCount).equals(0)
|
||||
|
||||
m.mount(el3, {view: spy3})
|
||||
o(spy1.callCount).equals(1)
|
||||
o(spy2.callCount).equals(1)
|
||||
o(spy3.callCount).equals(1)
|
||||
})
|
||||
|
||||
o("should stop running after mount null", function() {
|
||||
var spy = o.spy()
|
||||
|
||||
|
|
@ -204,6 +228,136 @@ o.spec("mount/redraw", function() {
|
|||
o(function() { m.mount(root, {}) }).throws(TypeError)
|
||||
})
|
||||
|
||||
o("skips roots that were synchronously unsubscribed before they were visited", function() {
|
||||
var calls = []
|
||||
var root1 = $document.createElement("div")
|
||||
var root2 = $document.createElement("div")
|
||||
var root3 = $document.createElement("div")
|
||||
|
||||
m.mount(root1, {
|
||||
onbeforeupdate: function() {
|
||||
m.mount(root2, null)
|
||||
},
|
||||
view: function() { calls.push("root1") },
|
||||
})
|
||||
m.mount(root2, {view: function() { calls.push("root2") }})
|
||||
m.mount(root3, {view: function() { calls.push("root3") }})
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
])
|
||||
|
||||
m.redraw.sync()
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
"root1", "root3",
|
||||
])
|
||||
})
|
||||
|
||||
o("keeps its place when synchronously unsubscribing previously visited roots", function() {
|
||||
var calls = []
|
||||
var root1 = $document.createElement("div")
|
||||
var root2 = $document.createElement("div")
|
||||
var root3 = $document.createElement("div")
|
||||
|
||||
m.mount(root1, {view: function() { calls.push("root1") }})
|
||||
m.mount(root2, {
|
||||
onbeforeupdate: function() {
|
||||
m.mount(root1, null)
|
||||
},
|
||||
view: function() { calls.push("root2") },
|
||||
})
|
||||
m.mount(root3, {view: function() { calls.push("root3") }})
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
])
|
||||
|
||||
m.redraw.sync()
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
"root1", "root2", "root3",
|
||||
])
|
||||
})
|
||||
|
||||
o("keeps its place when synchronously unsubscribing previously visited roots in the face of errors", function() {
|
||||
errors = ["fail"]
|
||||
var calls = []
|
||||
var root1 = $document.createElement("div")
|
||||
var root2 = $document.createElement("div")
|
||||
var root3 = $document.createElement("div")
|
||||
|
||||
m.mount(root1, {view: function() { calls.push("root1") }})
|
||||
m.mount(root2, {
|
||||
onbeforeupdate: function() {
|
||||
m.mount(root1, null)
|
||||
throw "fail"
|
||||
},
|
||||
view: function() { calls.push("root2") },
|
||||
})
|
||||
m.mount(root3, {view: function() { calls.push("root3") }})
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
])
|
||||
|
||||
m.redraw.sync()
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
"root1", "root3",
|
||||
])
|
||||
})
|
||||
|
||||
o("keeps its place when synchronously unsubscribing the current root", function() {
|
||||
var calls = []
|
||||
var root1 = $document.createElement("div")
|
||||
var root2 = $document.createElement("div")
|
||||
var root3 = $document.createElement("div")
|
||||
|
||||
m.mount(root1, {view: function() { calls.push("root1") }})
|
||||
m.mount(root2, {
|
||||
onbeforeupdate: function() {
|
||||
try { m.mount(root2, null) } catch (e) { calls.push([e.constructor, e.message]) }
|
||||
},
|
||||
view: function() { calls.push("root2") },
|
||||
})
|
||||
m.mount(root3, {view: function() { calls.push("root3") }})
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
])
|
||||
|
||||
m.redraw.sync()
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
"root1", [TypeError, "Node is currently being rendered to and thus is locked."], "root2", "root3",
|
||||
])
|
||||
})
|
||||
|
||||
o("keeps its place when synchronously unsubscribing the current root in the face of an error", function() {
|
||||
errors = [
|
||||
[TypeError, "Node is currently being rendered to and thus is locked."],
|
||||
]
|
||||
var calls = []
|
||||
var root1 = $document.createElement("div")
|
||||
var root2 = $document.createElement("div")
|
||||
var root3 = $document.createElement("div")
|
||||
|
||||
m.mount(root1, {view: function() { calls.push("root1") }})
|
||||
m.mount(root2, {
|
||||
onbeforeupdate: function() {
|
||||
try { m.mount(root2, null) } catch (e) { throw [e.constructor, e.message] }
|
||||
},
|
||||
view: function() { calls.push("root2") },
|
||||
})
|
||||
m.mount(root3, {view: function() { calls.push("root3") }})
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
])
|
||||
|
||||
m.redraw.sync()
|
||||
o(calls).deepEquals([
|
||||
"root1", "root2", "root3",
|
||||
"root1", "root3",
|
||||
])
|
||||
})
|
||||
|
||||
components.forEach(function(cmp){
|
||||
o.spec(cmp.kind, function(){
|
||||
var createComponent = cmp.create
|
||||
|
|
|
|||
|
|
@ -69,6 +69,9 @@ o.spec("route", function() {
|
|||
}
|
||||
}
|
||||
|
||||
// In case it doesn't get reset
|
||||
var realError = console.error
|
||||
|
||||
o.beforeEach(function() {
|
||||
currentTest = nextID++
|
||||
$window = browserMock(env)
|
||||
|
|
@ -79,11 +82,16 @@ o.spec("route", function() {
|
|||
mountRedraw = apiMountRedraw(coreRenderer($window), throttleMock.schedule, console)
|
||||
route = apiRouter($window, mountRedraw)
|
||||
route.prefix = prefix
|
||||
console.error = function() {
|
||||
realError.call(this, new Error("Unexpected `console.error` call"))
|
||||
realError.apply(this, arguments)
|
||||
}
|
||||
})
|
||||
|
||||
o.afterEach(function() {
|
||||
o(throttleMock.queueLength()).equals(0)
|
||||
currentTest = -1 // doesn't match any test
|
||||
console.error = realError
|
||||
})
|
||||
|
||||
o("throws on invalid `root` DOM node", function() {
|
||||
|
|
@ -1082,11 +1090,13 @@ o.spec("route", function() {
|
|||
var matchCount = 0
|
||||
var renderCount = 0
|
||||
var spy = o.spy()
|
||||
var error = new Error("error")
|
||||
var errorSpy = console.error = o.spy()
|
||||
|
||||
var resolver = {
|
||||
onmatch: lock(function() {
|
||||
matchCount++
|
||||
return Promise.reject(new Error("error"))
|
||||
return Promise.reject(error)
|
||||
}),
|
||||
render: lock(function(vnode) {
|
||||
renderCount++
|
||||
|
|
@ -1104,6 +1114,8 @@ o.spec("route", function() {
|
|||
o(matchCount).equals(1)
|
||||
o(renderCount).equals(0)
|
||||
o(spy.callCount).equals(1)
|
||||
o(errorSpy.callCount).equals(1)
|
||||
o(errorSpy.args[0]).equals(error)
|
||||
})
|
||||
})
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue