Ember global cleanup

packages/ember-application/tests/system/application_test.js

@@ -15,6 +15,7 @@ import jQuery from 'ember-views/system/jquery';
 import compile from 'ember-template-compiler/system/compile';
 import { _loaded } from 'ember-runtime/system/lazy_load';
 import { getDebugFunction, setDebugFunction } from 'ember-metal/debug';
+import { setTemplates, set as setTemplate } from 'ember-htmlbars/template_registry';
 
 var trim = jQuery.trim;
 
@@ -123,7 +124,7 @@ QUnit.module('Ember.Application initialization', {
     if (app) {
       run(app, 'destroy');
     }
-    Ember.TEMPLATES = {};
+    setTemplates({});
     ENV.LOG_VERSION = originalLogVersion;
   }
 });
@@ -142,9 +143,9 @@ QUnit.test('initialized application goes to initial route', function() {
       compile('{{outlet}}')
     );
 
-    Ember.TEMPLATES.index = compile(
+    setTemplate('index', compile(
       '<h1>Hi from index</h1>'
-    );
+    ));
   });
 
   equal(jQuery('#qunit-fixture h1').text(), 'Hi from index');

packages/ember-application/tests/system/dependency_injection/default_resolver_test.js

@@ -1,5 +1,4 @@
 /* globals EmberDev */
-import Ember from 'ember-metal/core'; // Ember.TEMPLATES
 import { context } from 'ember-environment';
 import { getDebugFunction, setDebugFunction } from 'ember-metal/debug';
 import run from 'ember-metal/run_loop';
@@ -16,6 +15,7 @@ import makeHTMLBarsBoundHelper from 'ember-htmlbars/system/make_bound_helper';
 import {
   registerHelper
 } from 'ember-htmlbars/helpers';
+import { setTemplates, set as setTemplate } from 'ember-htmlbars/template_registry';
 
 var registry, locator, application, originalLookup, originalInfo;
 
@@ -30,7 +30,7 @@ QUnit.module('Ember.Application Dependency Injection - default resolver', {
   },
 
   teardown() {
-    Ember.TEMPLATES = {};
+    setTemplates({});
     context.lookup = originalLookup;
     run(application, 'destroy');
     var UserInterfaceNamespace = Namespace.NAMESPACES_BY_ID['UserInterface'];
@@ -58,9 +58,9 @@ QUnit.test('the default resolver looks up templates in Ember.TEMPLATES', functio
   function fooBarTemplate() {}
   function fooBarBazTemplate() {}
 
-  Ember.TEMPLATES['foo'] = fooTemplate;
-  Ember.TEMPLATES['fooBar'] = fooBarTemplate;
-  Ember.TEMPLATES['fooBar/baz'] = fooBarBazTemplate;
+  setTemplate('foo', fooTemplate);
+  setTemplate('fooBar', fooBarTemplate);
+  setTemplate('fooBar/baz', fooBarBazTemplate);
 
   equal(locator.lookup('template:foo'), fooTemplate, 'resolves template:foo');
   equal(locator.lookup('template:fooBar'), fooBarTemplate, 'resolves template:foo_bar');

packages/ember-htmlbars/tests/helpers/yield_test.js

@@ -1,5 +1,3 @@
-import Ember from 'ember-metal/core';
-import run from 'ember-metal/run_loop';
 import EmberView from 'ember-views/views/view';
 import Component from 'ember-views/components/component';
 import ComponentLookup from 'ember-views/component_lookup';
@@ -33,9 +31,6 @@ QUnit.module('ember-htmlbars: Support for {{yield}} helper', {
     originalViewKeyword = registerKeyword('view',  viewKeyword);
   },
   teardown() {
-    run(function() {
-      Ember.TEMPLATES = {};
-    });
     runDestroy(view);
     commonTeardown();
     resetKeyword('view', originalViewKeyword);

packages/ember-htmlbars/tests/system/bootstrap_test.js

@@ -1,12 +1,10 @@
-import Ember from 'ember-metal/core';
 import { context } from 'ember-environment';
 import run from 'ember-metal/run_loop';
-import Component from 'ember-views/components/component';
 import jQuery from 'ember-views/system/jquery';
 import EmberView from 'ember-views/views/view';
 import { runDestroy } from 'ember-runtime/tests/utils';
 import bootstrap from 'ember-htmlbars/system/bootstrap';
-import Application from 'ember-application/system/application';
+import { setTemplates, get as getTemplate } from 'ember-htmlbars/template_registry';
 
 var trim = jQuery.trim;
 
@@ -17,7 +15,7 @@ function checkTemplate(templateName) {
   run(function() {
     bootstrap(jQuery('#qunit-fixture'));
   });
-  var template = Ember.TEMPLATES[templateName];
+  var template = getTemplate(templateName);
   ok(template, 'template is available on Ember.TEMPLATES');
   equal(jQuery('#qunit-fixture script').length, 0, 'script removed');
   var view = EmberView.create({
@@ -40,10 +38,10 @@ if (!isEnabled('ember-glimmer')) {
 
 QUnit.module('ember-htmlbars: bootstrap', {
   setup() {
-    context.lookup = lookup = { Ember: Ember };
+    context.lookup = lookup = {};
   },
   teardown() {
-    Ember.TEMPLATES = {};
+    setTemplates({});
     context.lookup = originalLookup;
     runDestroy(App);
     runDestroy(view);
@@ -76,10 +74,12 @@ if (typeof Handlebars === 'object') {
       bootstrap(jQuery('#qunit-fixture'));
     });
 
-    ok(Ember.TEMPLATES['funkyTemplate'], 'template with name funkyTemplate available');
+    let template = getTemplate('funkyTemplate');
+
+    ok(template, 'template with name funkyTemplate available');
 
     // This won't even work with Ember templates
-    equal(trim(Ember.TEMPLATES['funkyTemplate']({ name: 'Tobias' })), 'Tobias');
+    equal(trim(template({ name: 'Tobias' })), 'Tobias');
   });
 }
 
@@ -133,42 +133,4 @@ QUnit.test('duplicated template data-template-name should throw exception', func
   'duplicate templates should not be allowed');
 });
 
-if (Ember.component) {
-  QUnit.test('registerComponents initializer', function() {
-    Ember.TEMPLATES['components/x-apple'] = 'asdf';
-
-    App = run(Application, 'create');
-
-    ok(Ember.Handlebars.helpers['x-apple'], 'x-apple helper is present');
-    ok(App.__container__.has('component:x-apple'), 'the container is aware of x-apple');
-  });
-
-  QUnit.test('registerComponents and generated components', function() {
-    Ember.TEMPLATES['components/x-apple'] = 'asdf';
-
-    App = run(Application, 'create');
-    view = App.__container__.lookup('component:x-apple');
-    equal(view.get('layoutName'), 'components/x-apple', 'has correct layout name');
-  });
-
-  QUnit.test('registerComponents and non-generated components', function() {
-    Ember.TEMPLATES['components/x-apple'] = 'asdf';
-
-    run(function() {
-      App = Application.create();
-
-      // currently Component code must be loaded before initializers
-      // this is mostly due to how they are bootstrapped. We will hopefully
-      // sort this out soon.
-      App.XAppleComponent = Component.extend({
-        isCorrect: true
-      });
-    });
-
-    view = App.__container__.lookup('component:x-apple');
-    equal(view.get('layoutName'), 'components/x-apple', 'has correct layout name');
-    ok(view.get('isCorrect'), 'ensure a non-generated component');
-  });
-}
-
 }

packages/ember-routing-htmlbars/tests/helpers/render_test.js

@@ -1,15 +1,14 @@
-import Ember from 'ember-metal/core'; // TEMPLATES
 import { ENV } from 'ember-environment';
 import { set } from 'ember-metal/property_set';
 import run from 'ember-metal/run_loop';
 import { observer } from 'ember-metal/mixin';
 import EmberController from 'ember-runtime/controllers/controller';
 import compile from 'ember-template-compiler/system/compile';
 import EmberView from 'ember-views/views/view';
-
 import { buildAppInstance } from 'ember-routing-htmlbars/tests/utils';
 import { runAppend, runDestroy } from 'ember-runtime/tests/utils';
 import { OWNER } from 'container/owner';
+import { setTemplates, set as setTemplate } from 'ember-htmlbars/template_registry';
 
 function runSet(object, key, value) {
   run(function() {
@@ -33,8 +32,7 @@ QUnit.module('ember-routing-htmlbars: {{render}} helper', {
     ENV._ENABLE_LEGACY_CONTROLLER_SUPPORT = ORIGINAL_LEGACY_CONTROLLER_FLAG;
     runDestroy(appInstance);
     runDestroy(view);
-
-    Ember.TEMPLATES = {};
+    setTemplates({});
   }
 });
 
@@ -48,7 +46,7 @@ QUnit.test('{{render}} helper should render given template', function() {
     template: compile(template)
   });
 
-  Ember.TEMPLATES['home'] = compile('<p>BYE</p>');
+  setTemplate('home', compile('<p>BYE</p>'));
 
   runAppend(view);
 
@@ -68,9 +66,9 @@ QUnit.test('{{render}} helper should render nested helpers', function() {
     template: compile(template)
   });
 
-  Ember.TEMPLATES['foo'] = compile('<p>FOO</p>{{render \'bar\'}}');
-  Ember.TEMPLATES['bar'] = compile('<p>BAR</p>{{render \'baz\'}}');
-  Ember.TEMPLATES['baz'] = compile('<p>BAZ</p>');
+  setTemplate('foo', compile('<p>FOO</p>{{render \'bar\'}}'));
+  setTemplate('bar', compile('<p>BAR</p>{{render \'baz\'}}'));
+  setTemplate('baz', compile('<p>BAZ</p>'));
 
   runAppend(view);
 
@@ -140,7 +138,7 @@ QUnit.test('{{render}} helper should render given template with a supplied model
   });
   appInstance.register('controller:post', PostController);
 
-  Ember.TEMPLATES['post'] = compile('<p>{{model.title}}</p>');
+  setTemplate('post', compile('<p>{{model.title}}</p>'));
 
   runAppend(view);
 
@@ -179,7 +177,7 @@ QUnit.test('{{render}} helper with a supplied model should not fire observers on
 
   appInstance.register('controller:post', PostController);
 
-  Ember.TEMPLATES['post'] = compile('<p>{{title}}</p>');
+  setTemplate('post', compile('<p>{{title}}</p>'));
 
   var modelDidChange = 0;
   runAppend(view);
@@ -201,7 +199,7 @@ QUnit.test('{{render}} helper should raise an error when a given controller name
     template: compile(template)
   });
 
-  Ember.TEMPLATES['home'] = compile('<p>BYE</p>');
+  setTemplate('home', compile('<p>BYE</p>'));
 
   expectAssertion(function() {
     runAppend(view);
@@ -231,7 +229,7 @@ QUnit.test('{{render}} helper should render with given controller', function() {
     template: compile(template)
   });
 
-  Ember.TEMPLATES['home'] = compile('{{uniqueId}}');
+  setTemplate('home', compile('{{uniqueId}}'));
 
   runAppend(view);
 
@@ -266,7 +264,7 @@ QUnit.test('{{render}} helper should rerender with given controller', function()
     template: compile(template)
   });
 
-  Ember.TEMPLATES['home'] = compile('{{uniqueId}}');
+  setTemplate('home', compile('{{uniqueId}}'));
 
   runAppend(view);
   run(() => {
@@ -295,7 +293,7 @@ QUnit.test('{{render}} helper should render a template without a model only once
     template: compile(template)
   });
 
-  Ember.TEMPLATES['home'] = compile('<p>BYE</p>');
+  setTemplate('home', compile('<p>BYE</p>'));
 
   expectAssertion(function() {
     runAppend(view);
@@ -341,7 +339,7 @@ QUnit.test('{{render}} helper should render templates with models multiple times
   });
   appInstance.register('controller:post', PostController, { singleton: false });
 
-  Ember.TEMPLATES['post'] = compile('<p>{{model.title}}</p>');
+  setTemplate('post', compile('<p>{{model.title}}</p>'));
 
   runAppend(view);
 
@@ -386,7 +384,7 @@ QUnit.test('{{render}} helper should not leak controllers', function() {
   });
   appInstance.register('controller:post', PostController);
 
-  Ember.TEMPLATES['post'] = compile('<p>{{title}}</p>');
+  setTemplate('post', compile('<p>{{title}}</p>'));
 
   runAppend(view);
 
@@ -424,7 +422,7 @@ QUnit.test('{{render}} helper should not treat invocations with falsy contexts a
   });
   appInstance.register('controller:post', PostController, { singleton: false });
 
-  Ember.TEMPLATES['post'] = compile('<p>{{#unless model}}NOTHING{{/unless}}</p>');
+  setTemplate('post', compile('<p>{{#unless model}}NOTHING{{/unless}}</p>'));
 
   runAppend(view);
 
@@ -468,7 +466,7 @@ QUnit.test('{{render}} helper should render templates both with and without mode
   });
   appInstance.register('controller:post', PostController, { singleton: false });
 
-  Ember.TEMPLATES['post'] = compile('<p>Title:{{model.title}}</p>');
+  setTemplate('post', compile('<p>Title:{{model.title}}</p>'));
 
   runAppend(view);
 
@@ -493,7 +491,7 @@ QUnit.test('{{render}} helper should be able to render a template again when it
     [OWNER]: appInstance
   });
 
-  Ember.TEMPLATES['home'] = compile('<p>BYE</p>');
+  setTemplate('home', compile('<p>BYE</p>'));
 
   var liveRoutes = {
     render: {
@@ -553,7 +551,7 @@ QUnit.test('{{render}} works with dot notation', function() {
     template: compile(template)
   });
 
-  Ember.TEMPLATES['blog.post'] = compile('{{uniqueId}}');
+  setTemplate('blog.post', compile('{{uniqueId}}'));
 
   runAppend(view);
 
@@ -573,7 +571,7 @@ QUnit.test('throws an assertion if {{render}} is called with an unquoted templat
     template: compile(template)
   });
 
-  Ember.TEMPLATES['home'] = compile('<p>BYE</p>');
+  setTemplate('home', compile('<p>BYE</p>'));
 
   expectAssertion(function() {
     runAppend(view);
@@ -593,7 +591,7 @@ QUnit.test('throws an assertion if {{render}} is called with a literal for a mod
     template: compile(template)
   });
 
-  Ember.TEMPLATES['home'] = compile('<p>BYE</p>');
+  setTemplate('home', compile('<p>BYE</p>'));
 
   expectAssertion(function() {
     runAppend(view);

packages/ember-routing-htmlbars/tests/utils.js

@@ -1,4 +1,3 @@
-import Ember from 'ember-metal/core';
 import { get } from 'ember-metal/property_get';
 import {
   classify,
@@ -19,6 +18,7 @@ import EmberObject from 'ember-runtime/system/object';
 import Registry from 'container/registry';
 import RegistryProxy from 'ember-runtime/mixins/registry_proxy';
 import ContainerProxy from 'ember-runtime/mixins/container_proxy';
+import { get as getTemplate, has as hasTemplate } from 'ember-htmlbars/template_registry';
 
 function resolverFor(namespace) {
   return {
@@ -29,8 +29,8 @@ function resolverFor(namespace) {
 
       if (type === 'template') {
         var templateName = decamelize(name);
-        if (Ember.TEMPLATES[templateName]) {
-          return Ember.TEMPLATES[templateName];
+        if (hasTemplate(templateName)) {
+          return getTemplate(templateName);
         }
       }