Skip to content

fix(router): fix url path for star segment in path recognizer #6514

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

Closed
davidreher wants to merge 4 commits into from
Closed

fix(router): fix url path for star segment in path recognizer #6514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
64822eb
Url path of star segments should equal the original path.
davidreher Jan 15, 2016
c03abd9
fixed test description
davidreher Jan 15, 2016
a3299a5
fixed formatting
davidreher Jan 17, 2016
f491bd4
Merge remote-tracking branch 'upstream/master' into fix-url-path-for-…
davidreher Jan 17, 2016
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
5 changes: 3 additions & 2 deletions modules/angular2/src/router/path_recognizer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,15 +208,16 @@ export class PathRecognizer {
}

if (isPresent(currentSegment)) {
captured.push(currentSegment.path);

// the star segment consumes all of the remaining URL, including matrix params
if (segment instanceof StarSegment) {
positionalParams[segment.name] = currentSegment.toString();
captured.push(currentSegment.toString());
nextSegment = null;
break;
}

captured.push(currentSegment.path);

if (segment instanceof DynamicSegment) {
positionalParams[segment.name] = currentSegment.path;
} else if (!segment.match(currentSegment.path)) {
Expand Down
9 changes: 9 additions & 0 deletions modules/angular2/test/router/path_recognizer_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,5 +90,14 @@ export function main() {
expect(match['allParams']).toEqual({'c': '3'});
});
});

describe('wildcard segment', () => {
it('should return a url path which matches the original url path', () => {
var rec = new PathRecognizer('/wild/*everything');
var url = parser.parse('/wild/super;variable=value/anotherPartAfterSlash');
var match = rec.recognize(url);
expect(match['urlPath']).toEqual('wild/super;variable=value/anotherPartAfterSlash');
});
});
});
}