Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions api/tests/test-router.js
Original file line number Diff line number Diff line change
Expand Up @@ -225,6 +225,30 @@ o.spec("route", function() {
)
})

o("remove trailing slash to match route if it is before rest operator match (...) ", function() {
$window.location.href = prefix + "/test/d/"
route(root, "/test/some/path", {
"/test/:a" : {
view: lock(function(vnode) {
return JSON.stringify(route.param()) + " " +
JSON.stringify(vnode.attrs) + " " +
route.get()
})
},
"/test/:a..." : {
view: lock(function(vnode) {
return JSON.stringify(route.param()) + " " +
JSON.stringify(vnode.attrs) + " " +
route.get()
})
},
})

o(root.firstChild.nodeValue).equals(
'{"a":"d"} {"a":"d"} /test/d/'
)
})

o("handles route with search", function() {
$window.location.href = prefix + "/test?a=b&c=d"
route(root, "/test", {
Expand Down
2 changes: 1 addition & 1 deletion pathname/compileTemplate.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ module.exports = function(template) {
if (extra === ".") return "([^/]+)\\."
return "([^/]+)" + (extra || "")
}
) + "$")
) + "\\/?$")
return function(data) {
// First, check the params. Usually, there isn't any, and it's just
// checking a static set.
Expand Down