From 9b5e6791d4b72c7c540e40719c2978590d63f5c4 Mon Sep 17 00:00:00 2001
From: Isaac Ezer <isaac.ezer@gmail.com>
Date: Mon, 5 Feb 2018 17:26:32 -0500
Subject: [PATCH] fix requires registry for main services/components

Was ignoring main when it was in the specifier name,
However we should only ignore if it is in the name AND collection.
This is meant to avoid looking up main twice for example /my-app/src/router/main/main
---
 mu-trees/addon/module-registries/requirejs.js           | 2 +-
 mu-trees/tests/unit/module-registries/requirejs-test.js | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/mu-trees/addon/module-registries/requirejs.js b/mu-trees/addon/module-registries/requirejs.js
index a5d5e39d..64f990a8 100644
--- 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
index ebfa57b2..a0832d28 100644
--- 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 = {};