Merge pull request #221 from 201-created/isaac/fix-main-service-lookup

Fix Main Service Lookup
ember-cli · Feb 13, 2018 · 13f05eb · 13f05eb
2 parents b2357af + 9b5e679
commit 13f05eb
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/mu-trees/addon/ember-config.js b/mu-trees/addon/ember-config.js
@@ -30,6 +30,7 @@ export default function generateConfig(name) {
       serializer: { definitiveCollection: 'models' },
       service: { definitiveCollection: 'services' },
       template: { definitiveCollection: 'components' },
+      'template-options': { definitiveCollection: 'main' },
       transform: { definitiveCollection: 'transforms' },
       view: { definitiveCollection: 'views' },
       '-view-registry': { definitiveCollection: 'main' },

diff --git a/mu-trees/addon/module-registries/requirejs.js b/mu-trees/addon/module-registries/requirejs.js
@@ -36,7 +36,7 @@ export default class RequireJSRegistry {
       segments.push(s.namespace);
     }
 
-    if (s.name !== 'main') {
+    if (s.name !== 'main' || s.collection !== 'main') {
       segments.push(s.name);
     }
 

diff --git a/mu-trees/tests/unit/module-registries/requirejs-test.js b/mu-trees/tests/unit/module-registries/requirejs-test.js
@@ -60,7 +60,7 @@ module('RequireJS Registry', {
 });
 
 test('basic get', function(assert) {
-  assert.expect(8);
+  assert.expect(11);
 
   [
     /*
@@ -74,7 +74,11 @@ test('basic get', function(assert) {
     [ 'template:/my-app/routes/components/my-input', 'my-app/src/ui/components/my-input/template' ],
     [ 'template:/my-app/components/my-input', 'my-app/src/ui/components/my-input/template' ],
     [ 'component:/my-app/components/my-input/my-button', 'my-app/src/ui/components/my-input/my-button/component' ],
-    [ 'template:/my-app/components/my-input/my-button', 'my-app/src/ui/components/my-input/my-button/template' ]
+    [ 'template:/my-app/components/my-input/my-button', 'my-app/src/ui/components/my-input/my-button/template' ],
+    [ 'service:/my-app/services/main', 'my-app/src/services/main' ],
+    [ 'component:/my-app/components/main', 'my-app/src/ui/components/main/component' ],
+    [ 'template:/my-app/components/main', 'my-app/src/ui/components/main/template' ],
+
   ]
   .forEach(([ lookupString, expected ]) => {
     let expectedModule = {};