Start working on making the alpha pass.

* Add alpha to ember-try setup (allowed to fail for now). * Ensure component integration tests instantiate templates through the container.
emberjs · Aug 1, 2016 · ebb64fa · ebb64fa
1 parent 20ca36e
commit ebb64fa
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 6 deletions.
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -186,6 +186,26 @@ module.exports = {
         }
       }
     },
+    {
+      name: 'ember-alpha',
+      allowedToFail: true,
+      bower: {
+        dependencies: {
+          "ember": "alpha"
+        },
+        devDependencies: {
+          "ember-cli-shims": "ember-cli/ember-cli-shims#0.1.0"
+        },
+        resolutions: {
+          "ember": "alpha"
+        }
+      },
+      npm: {
+        devDependencies: {
+          "ember-data": "^2.5.0"
+        }
+      }
+    },
     {
       name: 'ember-data-2.3',
       bower: {

diff --git a/lib/ember-test-helpers/test-module-for-component.js b/lib/ember-test-helpers/test-module-for-component.js
@@ -142,13 +142,12 @@ export default TestModule.extend({
         context.dispatcher = this.container.lookup('event_dispatcher:main') || Ember.EventDispatcher.create();
         context.dispatcher.setup({}, '#ember-testing');
 
+        var hasRendered = false;
         var OutletView = module.container.lookupFactory('view:-outlet');
         var toplevelView = module.component = OutletView.create();
-        toplevelView.setOutletState({ render: { }, outlets: { }});
 
         var element = document.getElementById('ember-testing');
-        Ember.run(module.component, 'appendTo', '#ember-testing');
-
+        var templateId = 0;
         context.render = function(template) {
           if (!template) {
             throw new Error("in a component integration test you must pass a template to `render()`");
@@ -160,17 +159,29 @@ export default TestModule.extend({
             template = Ember.Handlebars.compile(template);
           }
 
-          Ember.run(function() {
+          var templateFullName = 'template:-undertest-' + (++templateId);
+          this.registry.register(templateFullName, template);
+          Ember.run(() => {
             toplevelView.setOutletState({
               render: {
+                owner: this.owner,
+                into: undefined,
+                outlet: 'main',
+                name: 'application',
                 controller: module.context,
-                template
+                ViewClass: undefined,
+                template: this.container.lookup(templateFullName)
               },
 
               outlets: { }
             });
           });
 
+          if (!hasRendered) {
+            Ember.run(module.component, 'appendTo', '#ember-testing');
+            hasRendered = true;
+          }
+
           // ensure the element is based on the wrapping toplevel view
           // Ember still wraps the main application template with a
           // normal tagged view
@@ -228,8 +239,13 @@ export default TestModule.extend({
           Ember.run(function() {
             toplevelView.setOutletState({
               render: {
+                owner: module.container,
+                into: undefined,
+                outlet: 'main',
+                name: 'application',
                 controller: module.context,
-                randomKey: 'empty'
+                ViewClass: undefined,
+                template: undefined
               },
               outlets: {}
             });