Skip to content

fix(router): preserve specificity for redirects - #5933

Closed
btford wants to merge 1 commit into
angular:masterfrom
btford:router-fix-redirect-speficificity
Closed

fix(router): preserve specificity for redirects#5933
btford wants to merge 1 commit into
angular:masterfrom
btford:router-fix-redirect-speficificity

Conversation

@btford

@btford btford commented Dec 16, 2015

Copy link
Copy Markdown
Contributor

Previously when comparing which of multiple possible routes to choose in an ambiguous case, we looked at the specificity of the target of redirect matches rather than the original match. This meant that if a redirect used a wildcard, but redirected to a target that was a static path, we'd count the static path's specificity instead of the wildcard.

This change stores the specificity of the redirect on the RedirectInstruction.

@btford btford added pr_state: LGTM action: merge The PR is ready for merge by the caretaker labels Dec 16, 2015
@btford

btford commented Dec 16, 2015

Copy link
Copy Markdown
Contributor Author

Got an in-person LGTM from @matsko

@mary-poppins

mary-poppins commented Dec 16, 2015

Copy link
Copy Markdown

Merging PR #5933 on behalf of @mprobst to branch presubmit-mprobst-pr-5933.

@alexeagle

alexeagle commented Dec 17, 2015

Copy link
Copy Markdown
Contributor

presubmit job failed:

Failures:
1) Router should replace history when triggered by a hashchange with a redirect
  Message:
    Expected [ 'hash: a' ] to equal [ 'hash: a', 'replace: /b' ].
  Stack:
    Error: Expected [ 'hash: a' ] to equal [ 'hash: a', 'replace: /b' ].
        at Object.next (/home/travis/build/angular/angular/dist/js/cjs/angular2/test/router/router_spec.js:89:68)
        at null._onTimeout (/home/travis/build/angular/angular/dist/js/cjs/angular2/src/facade/async.js:121:110)
        at Timer.listOnTimeout (timers.js:92:15)
Pending:

@btford

btford commented Dec 21, 2015

Copy link
Copy Markdown
Contributor Author

Hm, let me rebase and try again.

@btford
fix(router): preserve specificity for redirects
4e6c4a8 
Previously when comparing which of multiple possible routes to choose in
an ambiguous case, we looked at the specificity of the target of redirect
matches rather than the original match. This meant that if a redirect
used a whilecard, but redirected to a target that was a static path,
we'd cound the static path's specificity instead of the wildcard.

This change stores the specificity of the redirect on the RedirectInstruction.
@btford
btford force-pushed the router-fix-redirect-speficificity branch from 77fee7a to 4e6c4a8 Compare December 21, 2015 18:47
@btford

btford commented Dec 21, 2015

Copy link
Copy Markdown
Contributor Author

Looks like there was a merge conflict in master. Resolved the issue with this PR.

@alexeagle can we try merging this again?

@alexeagle

alexeagle commented Dec 21, 2015

Copy link
Copy Markdown
Contributor

You are the caretaker!

On Mon, Dec 21, 2015 at 1:05 PM Brian Ford [email protected] wrote:

Looks like there was a merge conflict in master. Resolved the issue with
this PR.

@alexeagle https://github.com/alexeagle can we try merging this again?

—
Reply to this email directly or view it on GitHub
#5933 (comment).

@mary-poppins

mary-poppins commented Jan 4, 2016

Copy link
Copy Markdown

Merging PR #5933 on behalf of @alxhub to branch presubmit-alxhub-pr-5933.

@btford btford closed this in a038bb9 Jan 4, 2016
@usernamealreadyis usernamealreadyis mentioned this pull request Jan 14, 2016
Closed
@angular-automatic-lock-bot

angular-automatic-lock-bot Bot commented Sep 7, 2019

Copy link
Copy Markdown

This issue has been automatically locked due to inactivity.
Please file a new issue if you are encountering a similar or related problem.

Read more about our automatic conversation locking policy.

This action has been performed automatically by a bot.

@angular-automatic-lock-bot angular-automatic-lock-bot Bot locked and limited conversation to collaborators Sep 7, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

@mprobst mprobst

Labels

action: merge The PR is ready for merge by the caretaker cla: yes type: bug/fix

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@btford @mary-poppins @alexeagle @mprobst @alxhub @googlebot