Merge pull request #32 from GCheung55/bug/classic-sustain

Fix sustain to work with classic app structure.

addon/lib/sustain.js

@@ -223,7 +223,11 @@ export default Obj.extend({
     // pre Ember 2.0, layout is a computed property that MUST be set
     // via get/set
     if (!this._component.get('layout')) {
-      this._component.set('layout', this.owner.lookup(`template:${name}`));
+      let template = this.owner.lookup(`template:${name}`);
+      if (!template) {
+        template = this.owner.lookup(`template:components/${name}`);
+      }
+      this._component.set('layout', template);
     }
     this._component.set('model', model);
 

tests/acceptance/sustain-classic-component-test.js

@@ -0,0 +1,14 @@
+import { test } from 'qunit';
+import moduleForAcceptance from '../../tests/helpers/module-for-acceptance';
+
+moduleForAcceptance('Acceptance | sustain classic');
+
+test('visiting /tests/sustain-classic-component', function(assert) {
+  visit('/tests/sustain-classic-component');
+
+  andThen(function() {
+    assert.equal(currentURL(), '/tests/sustain-classic-component', 'We transitioned to the initial route');
+
+    assert.equal(find('h2.classic-component').eq(0).text(), 'Classic Component', 'We rendered the sustain');
+  });
+});

tests/dummy/app/components/classic-component.js

@@ -0,0 +1,3 @@
+import Ember from 'ember';
+
+export default Ember.Component.extend();

tests/dummy/app/router.js

@@ -17,6 +17,7 @@ Router.map(function() {
     this.route('sustain-labels');
     this.route('sustain-labels-2');
     this.route('sustain-hooks');
+    this.route('sustain-classic-component');
   });
 
   this.route('docs', function() {

tests/dummy/app/routes/tests/sustain-classic-component/route.js

@@ -0,0 +1,4 @@
+import Ember from 'ember';
+
+export default Ember.Route.extend({
+});

tests/dummy/app/routes/tests/sustain-classic-component/template.hbs

@@ -0,0 +1 @@
+{{sustain 'classic-component'}}

tests/dummy/app/templates/components/classic-component.hbs

@@ -0,0 +1 @@
+<h2 class="classic-component">Classic Component</h2>