Changed the start-app test helper to use Ember.assign.
#6193
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
|
@workmanw awesome, thanks! |
| @@ -5,8 +5,7 @@ import config from '../../config/environment'; | |||
| export default function startApp(attrs) { | |||
| let application; | |||
|
|
|||
| let attributes = Ember.merge({}, config.APP); | |||
| attributes = Ember.merge(attributes, attrs); // use defaults, but you can override; | |||
| let attributes = Ember.assign({}, config.APP, attrs); // use defaults, but you can override; | |||
There was a problem hiding this comment.
Let's move the comment to the previous line for line length reasons.
|
LGTM with one modification. |
workmanw
force-pushed
the
start-app-ember-assign
branch
from
9c6a302 to
ff58fc0
Compare
|
@nathanhammond 👍 Updated. |
workmanw
force-pushed
the
start-app-ember-assign
branch
from
ff58fc0 to
3689ee0
Compare
|
@homu r+ |
|
📌 Commit 3689ee0 has been approved by |
homu
added a commit
that referenced
this pull request
Aug 19, 2016
Changed the start-app test helper to use `Ember.assign`. Some discussion here: ember-cli/ember-new-output#5 . I mistakenly submitted the PR to that repo not knowing it was generated.
|
☀️ Test successful - status |
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.
Some discussion here: ember-cli/ember-new-output#5 . I mistakenly submitted the PR to that repo not knowing it was generated.