Skip to content

Commit

Permalink
Merge pull request #167 from rwjblue/setup-registry
Browse files Browse the repository at this point in the history
Call `Ember.ApplicationInstance.setupRegistry` if present.
  • Loading branch information
rwjblue authored Jul 30, 2016
2 parents 768c422 + 6788225 commit f1c18ae
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions lib/ember-test-helpers/build-registry.js
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ export default function(resolver) {
fallback: fallbackRegistry
});

if (Ember.ApplicationInstance && Ember.ApplicationInstance.setupRegistry) {
Ember.ApplicationInstance.setupRegistry(registry);
}

// these properties are set on the fallback registry by `buildRegistry`
// and on the primary registry within the ApplicationInstance constructor
// but we need to manually recreate them since ApplicationInstance's are not
Expand Down

0 comments on commit f1c18ae

Please sign in to comment.