Merge pull request #308 from Turbo87/owner

Allow passing "owner" into manualSetup()
adopted-ember-addons · Oct 20, 2017 · 41680e9 · 41680e9
2 parents 958a516 + 5c5d656
commit 41680e9
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/addon/utils/load-scenarios.js b/addon/utils/load-scenarios.js
@@ -12,8 +12,8 @@ const scenarioFileRegExp = new RegExp('/scenarios/main$');
  *
  * @param container
  */
-export default function(container) {
-  let config         = container.owner.resolveRegistration('config:environment') || {},
+export default function(owner) {
+  let config         = owner.resolveRegistration('config:environment') || {},
       { factoryGuy } = config;
   if (factoryGuy && factoryGuy.useScenarios) {
     let [Scenario] = requireFiles(scenarioFileRegExp);

diff --git a/addon/utils/manual-setup.js b/addon/utils/manual-setup.js
@@ -3,10 +3,12 @@ import FactoryGuy from '../factory-guy';
 import loadFactories from './load-factories';
 import loadScenarios from './load-scenarios';
 
-export default function(container) {
-  FactoryGuy.setStore(container.lookup('service:store'));
+export default function(ownerOrContainer) {
+  let owner = ownerOrContainer.owner || ownerOrContainer;
+
+  FactoryGuy.setStore(owner.lookup('service:store'));
   FactoryGuy.resetDefinitions();
   loadFactories();
-  loadScenarios(container);
+  loadScenarios(owner);
 }