Standard test handling of Ember.TEMPLATES teardown

Author: wagenet

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: https://github.com/emberjs/ember-dev.git
-  revision: e847d56ee6aa86076471bce65b3505f72682013c
+  revision: 600c5e6e0fd60903ad9cdc79839d338c7f994ec7
   branch: master
   specs:
     ember-dev (0.1)
@@ -32,7 +32,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (1.16.0)
+    aws-sdk (1.16.1)
       json (~> 1.4)
       nokogiri (< 1.6.0)
       uuidtools (~> 2.1)
@@ -52,7 +52,7 @@ GEM
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
-    mime-types (1.24)
+    mime-types (1.25)
     multi_json (1.7.9)
     nokogiri (1.5.10)
     posix-spawn (0.3.6)

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

@@ -92,8 +92,8 @@ var app;
 
 module("Ember.Application initialization", {
   teardown: function() {
-    Ember.TEMPLATES = {};
     Ember.run(app, 'destroy');
+    Ember.TEMPLATES = {};
   }
 });
 

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

@@ -9,6 +9,7 @@ module("Ember.Application Depedency Injection", {
   },
 
   teardown: function() {
+    Ember.TEMPLATES = {};
     Ember.lookup = originalLookup;
     Ember.run(application, 'destroy');
   }
@@ -26,7 +27,7 @@ test('the default resolver can look things up in other namespaces', function() {
 test('the default resolver looks up templates in Ember.TEMPLATES', function() {
   function fooTemplate() {}
   function fooBarTemplate() {}
-  function fooBarBazTemplate() {} 
+  function fooBarBazTemplate() {}
 
   Ember.TEMPLATES['foo'] = fooTemplate;
   Ember.TEMPLATES['fooBar'] = fooBarTemplate;

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

@@ -66,6 +66,8 @@ module("Handlebars {{render}} helper", {
         view.destroy();
       }
     });
+
+    Ember.TEMPLATES = {};
   }
 });
 

packages/ember-testing/tests/helpers_test.js

@@ -5,6 +5,7 @@ module("ember-testing Helpers", {
     Ember.run(App, App.destroy);
     App.removeTestHelpers();
     App = null;
+    Ember.TEMPLATES = {};
   }
 });
 

packages/ember/tests/component_registration_test.js

@@ -1,9 +1,8 @@
-var App, container, originalTemplates;
+var App, container;
 var compile = Ember.Handlebars.compile;
 
 module("Application Lifecycle - Component Registration", {
   setup: function() {
-    originalTemplates = Ember.$.extend({}, Ember.TEMPLATES);
     Ember.TEMPLATES["components/expand-it"] = compile("<p>hello {{yield}}</p>");
     Ember.TEMPLATES.application = compile("Hello world {{#expand-it}}world{{/expand-it}}");
   },
@@ -12,7 +11,7 @@ module("Application Lifecycle - Component Registration", {
     Ember.run(function() {
       App.destroy();
       App = null;
-      Ember.TEMPLATES = originalTemplates;
+      Ember.TEMPLATES = {};
     });
   }
 });

packages/ember/tests/helpers/link_to_test.js

@@ -1,4 +1,4 @@
-var Router, App, AppView, templates, router, eventDispatcher, container, originalTemplates;
+var Router, App, AppView, templates, router, eventDispatcher, container;
 var get = Ember.get, set = Ember.set;
 
 function bootApplication() {
@@ -31,7 +31,6 @@ module("The {{link-to}} helper", {
 
       Router = App.Router;
 
-      originalTemplates = Ember.$.extend({}, Ember.TEMPLATES);
       Ember.TEMPLATES.app = Ember.Handlebars.compile("{{outlet}}");
       Ember.TEMPLATES.index = Ember.Handlebars.compile("<h3>Home</h3>{{#link-to 'about' id='about-link'}}About{{/link-to}}{{#link-to 'index' id='self-link'}}Self{{/link-to}}");
       Ember.TEMPLATES.about = Ember.Handlebars.compile("<h3>About</h3>{{#link-to 'index' id='home-link'}}Home{{/link-to}}{{#link-to 'about' id='self-link'}}Self{{/link-to}}");
@@ -50,7 +49,7 @@ module("The {{link-to}} helper", {
 
   teardown: function() {
     Ember.run(function() { App.destroy(); });
-    Ember.TEMPLATES = originalTemplates;
+    Ember.TEMPLATES = {};
   }
 });
 

packages/ember/tests/homepage_example_test.js

@@ -1,4 +1,4 @@
-var App, originalTemplates, $fixture;
+var App, $fixture;
 
 function setupExample() {
   // setup templates
@@ -46,7 +46,6 @@ module("Homepage Example", {
       });
 
       App.LoadingRoute = Ember.Route.extend();
-      originalTemplates = Ember.$.extend({}, Ember.TEMPLATES);
     });
 
     $fixture = Ember.$('#qunit-fixture');
@@ -61,7 +60,7 @@ module("Homepage Example", {
       App.destroy();
       App = null;
 
-      Ember.TEMPLATES = originalTemplates;
+      Ember.TEMPLATES = {};
     });
   }
 });

packages/ember/tests/routing/basic_test.js

@@ -1,4 +1,4 @@
-var Router, App, AppView, templates, router, container, originalTemplates;
+var Router, App, AppView, templates, router, container;
 var get = Ember.get, set = Ember.set;
 
 function bootApplication() {
@@ -63,7 +63,6 @@ module("Basic Routing", {
 
       container = App.__container__;
 
-      originalTemplates = Ember.$.extend({}, Ember.TEMPLATES);
       Ember.TEMPLATES.application = compile("{{outlet}}");
       Ember.TEMPLATES.home = compile("<h3>Hours</h3>");
       Ember.TEMPLATES.homepage = compile("<h3>Megatroll</h3><p>{{home}}</p>");
@@ -76,7 +75,7 @@ module("Basic Routing", {
       App.destroy();
       App = null;
 
-      Ember.TEMPLATES = originalTemplates;
+      Ember.TEMPLATES = {};
     });
   }
 });