[BUGFIX] Pass environment options forward to Engines #14025
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -499,6 +499,9 @@ function commonSetupRegistry(registry) { | |||
|
|
|||
| registry.injection('view:-outlet', 'namespace', 'application:main'); | |||
|
|
|||
| registry.injection('view', '_environment', '-environment:main'); | |||
| registry.injection('route', '_environment', '-environment:main'); | |||
There was a problem hiding this comment.
These injections should be done in the engine-instance (because the environment can change per .visit call).
There was a problem hiding this comment.
Good point. Updated.
|
@rwjblue / @trentmwillis is this correct to target master? |
|
The PR should target master with the commits prefixed with |
added 2 commits
August 4, 2016 11:18
This fixes a failing test introduced in the previous test where Engines rendered even though shouldRender was set to false.
trentmwillis
force-pushed
the
should-render
branch
from
b768236 to
d2d6e27
Compare
|
Updated the commit tags. |
|
Thanks @trentmwillis! |
|
Pulled into beta branch, next build should fix for folks... |
nathanhammond
added a commit
to nathanhammond/ember-engines
that referenced
this pull request
Aug 8, 2016
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addressing #14015.
There are two commits here. The first simply adds two tests to verify the behavior of
shouldRender: falsein thevisitAPI. The latter of those tests failed with an error due to attempting to render when it shouldn't (as described in the issue).The second commit fixes the failing test by passing
-environment:mainfrom the parent into an EngineInstance. This also resulted in needing to update some tests to setup the registry in an ApplicationInstance that constructs the EngineInstance. I assume this will always happen in a real application, so I figured it made sense to do in the tests.