Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(tree): reassign fullpath when register new node which the same current node #2366

Merged
merged 4 commits into from
May 11, 2020
Merged

fix(tree): reassign fullpath when register new node which the same current node #2366

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c38bc3c
fix(tree): assign fullpath to current node by fullpath of new node if…
May 9, 2020
c2e0974
test(router-test): reverse the order when register router when test f…
May 9, 2020
f854167
chg(tree-test): update test case with register new route in TestRoute…
May 11, 2020
a43651d
Merge branch 'master' into fix/assign-fullpath-when-the-same-current-…
appleboy May 11, 2020
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
2 changes: 1 addition & 1 deletion routes_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,14 +585,14 @@ func TestRouteContextHoldsFullPath(t *testing.T) {
// Test routes
routes := []string{
"/simple",
"/project/:name/bui",
"/project/:name",
"/",
"/news/home",
"/news",
"/simple-two/one",
"/simple-two/one-two",
"/project/:name/build/*params",
"/project/:name/bui",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

put these changes back and add a new route as above.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done @appleboy. I added new route.

}

for _, route := range routes {
Expand Down
1 change: 1 addition & 0 deletions tree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ walk:
panic("handlers are already registered for path '" + fullPath + "'")
}
n.handlers = handlers
n.fullPath = fullPath
return
}
}
Expand Down