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.

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

Ensure Controller#transitionToRoute and Route#intermediateTransitionTo work in Engines #14176

Merged
merged 1 commit into from
Sep 10, 2016

Conversation

trentmwillis
Copy link
Member

Addressing ember-engines/ember-engines#159 and ember-engines/ember-engines#186.

Planning to add tests (though there don't seem to be any tests for related features).

// only alter the routeName if it's actually referencing a route.
if (owner.routable && typeof routeName === 'string') {
if (resemblesURL(routeName)) {
throw new EmberError('Route#transitionTo cannot be used for URLs. Please use the route name instead.');
Copy link
Member

Choose a reason for hiding this comment

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

Hard-coded source Route#transitionTo.

@homu
Copy link
Contributor

homu commented Sep 2, 2016

☔ The latest upstream changes (presumably #14199) made this pull request unmergeable. Please resolve the merge conflicts.

…o work in Engines

Also adds basic tests to verify programmatic transition behavior in Engines.
@trentmwillis
Copy link
Member Author

@dgeb / @rwjblue fixed prior issues and added some basic unit tests to verify programmatic transition behavior in Engines.

@rwjblue rwjblue merged commit 7ce7f4e into emberjs:master Sep 10, 2016
@rwjblue
Copy link
Member

rwjblue commented Sep 10, 2016

Oops, forgot to ask about commit prefix. I think this should target release, c/d?

@trentmwillis
Copy link
Member Author

I think this should target release, c/d?

I believe so since it's a gap in functionality of the current release.

@rwjblue
Copy link
Member

rwjblue commented Sep 10, 2016

OK, I've cherry-picked into beta, but I think we need to PR directly against release. Lots of conflicts (due to imports changing from absolute to relative and removing the engines feature flag), and I'd like to get a CI run.

Would you mind doing that?

@trentmwillis
Copy link
Member Author

@rwjblue sure, I'll try to get to it sometime this weekend.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants