ember-source 2.11.2 → 2.11.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 899d3c8b71efee639a84952e9065d3dc1dbabd8d
-  data.tar.gz: ce7015365fdf3ad81d63ca5ef239844518efbcfc
+  metadata.gz: d901c12965c5d4de106da9ff28bd2d5a1b0dcc35
+  data.tar.gz: 8aa863a4de7d4f775fa1f0fad33ccfceb60563a4
 SHA512:
-  metadata.gz: 1b100040ac0615820062517b56cbbd8e4836e1221d027daedf706b25e020f2246725d8635603aee3243cef58254753567d1a3a22d6cb2eb75d75f2bf9c2d9b1f
-  data.tar.gz: 7a6133143b3c3f3b549c570c9094b88a9c59aca37b5838ab2a750bd0f063a1943c86cb9eb3d143ae6bf4c45e7bec8361d63e7bd807d1c9fd068a81205b5da617
+  metadata.gz: 50bf25b89198a62a882ace88ebcbd17d7243c946f13a7918e5bdddffbca5390c2f2a366f9b142d0db9d97029198d39a9dcc6744299e4825dd2206c3f342b68e2
+  data.tar.gz: 274d9be9e78ef5f4aa910dcda4dc5a139d604ad8ecedc99395a7807027b6398921ef9daaeca545cf1ccf077d0a0760d9e2335f84088f3d1fb20b69a900a855d0

data/VERSION

@@ -1 +1 @@
-2.11.2
+2.11.3

data/dist/ember-runtime.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.11.2
+ * @version   2.11.3
  */
 
 var enifed, requireModule, Ember;
@@ -164,7 +164,7 @@ function defaults(obj, defaults) {
   return obj;
 }
 
-babelHelpers = {
+var babelHelpers = {
   inherits: inherits,
   taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,
   slice: Array.prototype.slice,
@@ -4655,6 +4655,7 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
   exports.getOnerror = getOnerror;
   exports.setOnerror = setOnerror;
   exports.dispatchError = dispatchError;
+  exports.getDispatchOverride = getDispatchOverride;
   exports.setDispatchOverride = setDispatchOverride;
 
   // To maintain stacktrace consistency across browsers
@@ -4695,6 +4696,10 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
 
   // allows testing adapter to override dispatch
 
+  function getDispatchOverride() {
+    return dispatchOverride;
+  }
+
   function setDispatchOverride(handler) {
     dispatchOverride = handler;
   }
@@ -9265,7 +9270,7 @@ enifed('ember-metal/run_loop', ['exports', 'ember-utils', 'ember-metal/debug', '
 
   var onErrorTarget = {
     get onerror() {
-      return _emberMetalError_handler.getOnerror();
+      return _emberMetalError_handler.dispatchError;
     },
     set onerror(handler) {
       return _emberMetalError_handler.setOnerror(handler);
@@ -16235,9 +16240,9 @@ enifed('ember-runtime/mixins/observable', ['exports', 'ember-metal'], function (
       only a sender and key value as parameters or, if you aren't interested in
       any of these values, to write an observer that has no parameters at all.
        @method addObserver
-      @param {String} key The key to observer
+      @param {String} key The key to observe
       @param {Object} target The target object to invoke
-      @param {String|Function} method The method to invoke.
+      @param {String|Function} method The method to invoke
       @public
     */
     addObserver: function (key, target, method) {
@@ -16249,9 +16254,9 @@ enifed('ember-runtime/mixins/observable', ['exports', 'ember-metal'], function (
       the same key, target, and method you passed to `addObserver()` and your
       target will no longer receive notifications.
        @method removeObserver
-      @param {String} key The key to observer
+      @param {String} key The key to observe
       @param {Object} target The target object to invoke
-      @param {String|Function} method The method to invoke.
+      @param {String|Function} method The method to invoke
       @public
     */
     removeObserver: function (key, target, method) {
@@ -19414,7 +19419,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.11.2";
+  exports.default = "2.11.3";
 });
 enifed('rsvp', ['exports'], function (exports) {
   'use strict';
@@ -19838,6 +19843,7 @@ enifed('rsvp', ['exports'], function (exports) {
     } else {
       if (then$$ === GET_THEN_ERROR) {
         reject(promise, GET_THEN_ERROR.error);
+        GET_THEN_ERROR.error = null;
       } else if (then$$ === undefined) {
         fulfill(promise, maybeThenable);
       } else if (isFunction(then$$)) {
@@ -19965,10 +19971,10 @@ enifed('rsvp', ['exports'], function (exports) {
       if (value === TRY_CATCH_ERROR) {
         failed = true;
         error = value.error;
-        value = null;
+        value.error = null; // release
       } else {
-        succeeded = true;
-      }
+          succeeded = true;
+        }
 
       if (promise === value) {
         reject(promise, withOwnPromise());
@@ -20752,7 +20758,7 @@ enifed('rsvp', ['exports'], function (exports) {
       try {
         return findAuthor(); // succeed or fail
       } catch(error) {
-        return findOtherAuther();
+        return findOtherAuthor();
       } finally {
         // always runs
         // doesn't affect the return value
@@ -20763,7 +20769,7 @@ enifed('rsvp', ['exports'], function (exports) {
     
       ```js
       findAuthor().catch(function(reason){
-        return findOtherAuther();
+        return findOtherAuthor();
       }).finally(function(){
         // author was either found, or not
       });

data/dist/ember-template-compiler.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.11.2
+ * @version   2.11.3
  */
 
 var enifed, requireModule, Ember;
@@ -174,7 +174,7 @@ function defaults(obj, defaults) {
   return obj;
 }
 
-babelHelpers = {
+var babelHelpers = {
   classCallCheck: classCallCheck,
   inherits: inherits,
   taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,
@@ -3954,6 +3954,7 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
   exports.getOnerror = getOnerror;
   exports.setOnerror = setOnerror;
   exports.dispatchError = dispatchError;
+  exports.getDispatchOverride = getDispatchOverride;
   exports.setDispatchOverride = setDispatchOverride;
 
   // To maintain stacktrace consistency across browsers
@@ -3994,6 +3995,10 @@ enifed('ember-metal/error_handler', ['exports', 'ember-console', 'ember-metal/te
 
   // allows testing adapter to override dispatch
 
+  function getDispatchOverride() {
+    return dispatchOverride;
+  }
+
   function setDispatchOverride(handler) {
     dispatchOverride = handler;
   }
@@ -8564,7 +8569,7 @@ enifed('ember-metal/run_loop', ['exports', 'ember-utils', 'ember-metal/debug', '
 
   var onErrorTarget = {
     get onerror() {
-      return _emberMetalError_handler.getOnerror();
+      return _emberMetalError_handler.dispatchError;
     },
     set onerror(handler) {
       return _emberMetalError_handler.setOnerror(handler);
@@ -11844,8 +11849,7 @@ enifed('ember-utils/owner', ['exports', 'ember-utils/symbol'], function (exports
     For example, this component dynamically looks up a service based on the
     `audioType` passed as an attribute:
   
-    ```
-    // app/components/play-audio.js
+    ```app/components/play-audio.js
     import Ember from 'ember';
   
     // Usage:
@@ -12024,7 +12028,7 @@ enifed("ember/features", ["exports"], function (exports) {
 enifed("ember/version", ["exports"], function (exports) {
   "use strict";
 
-  exports.default = "2.11.2";
+  exports.default = "2.11.3";
 });
 enifed("glimmer-compiler/index", ["exports", "glimmer-compiler/lib/compiler", "glimmer-compiler/lib/template-visitor"], function (exports, _glimmerCompilerLibCompiler, _glimmerCompilerLibTemplateVisitor) {
   "use strict";

data/dist/ember-testing.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.11.2
+ * @version   2.11.3
  */
 
 var enifed, requireModule, Ember;
@@ -174,7 +174,7 @@ function defaults(obj, defaults) {
   return obj;
 }
 
-babelHelpers = {
+var babelHelpers = {
   classCallCheck: classCallCheck,
   inherits: inherits,
   taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,

data/dist/ember-tests.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.11.2
+ * @version   2.11.3
  */
 
 var enifed, requireModule, Ember;
@@ -174,7 +174,7 @@ function defaults(obj, defaults) {
   return obj;
 }
 
-babelHelpers = {
+var babelHelpers = {
   classCallCheck: classCallCheck,
   inherits: inherits,
   taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,
@@ -15475,6 +15475,41 @@ babelHelpers.classCallCheck(this, _class);
     return _class;
   })(_emberGlimmerTestsUtilsTestCase.RenderingTest));
 });
+enifed('ember-glimmer/tests/integration/components/destroy-test', ['exports', 'ember-metal', 'ember-glimmer/tests/utils/helpers', 'ember-glimmer/tests/utils/test-case'], function (exports, _emberMetal, _emberGlimmerTestsUtilsHelpers, _emberGlimmerTestsUtilsTestCase) {
+  'use strict';
+
+  _emberGlimmerTestsUtilsTestCase.moduleFor('Component destroy', (function (_RenderingTest) {
+    babelHelpers.inherits(_class, _RenderingTest);
+
+    function _class() {
+      babelHelpers.classCallCheck(this, _class);
+
+      _RenderingTest.apply(this, arguments);
+    }
+
+    _class.prototype['@test it correctly releases the destroyed components'] = function testItCorrectlyReleasesTheDestroyedComponents(assert) {
+      var _this = this;
+
+      var FooBarComponent = _emberGlimmerTestsUtilsHelpers.Component.extend({});
+
+      this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template: 'hello' });
+
+      this.render('{{#if switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
+
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
+
+      this.runTask(function () {
+        return _emberMetal.set(_this.context, 'switch', false);
+      });
+
+      this.assertText('');
+
+      assert.equal(this.env.destroyedComponents.length, 0, 'enviroment.destroyedComponents should be empty');
+    };
+
+    return _class;
+  })(_emberGlimmerTestsUtilsTestCase.RenderingTest));
+});
 enifed('ember-glimmer/tests/integration/components/dynamic-components-test', ['exports', 'ember-metal', 'ember-glimmer/tests/utils/helpers', 'ember-glimmer/tests/utils/abstract-test-case', 'ember-glimmer/tests/utils/test-case'], function (exports, _emberMetal, _emberGlimmerTestsUtilsHelpers, _emberGlimmerTestsUtilsAbstractTestCase, _emberGlimmerTestsUtilsTestCase) {
   'use strict';
 
@@ -21154,8 +21189,8 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
       _emberMetal.setDebugFunction('warn', originalWarn);
     };
 
-    StyleTest.prototype.assertStyleWarning = function assertStyleWarning() {
-      this.assert.deepEqual(warnings, [_emberViews.STYLE_WARNING]);
+    StyleTest.prototype.assertStyleWarning = function assertStyleWarning(style) {
+      this.assert.deepEqual(warnings, [_emberViews.constructStyleDeprecationMessage(style)]);
     };
 
     StyleTest.prototype.assertNoWarning = function assertNoWarning() {
@@ -21254,11 +21289,12 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
       }
 
       _class9.prototype['@test specifying <div style={{userValue}}></div> generates a warning'] = function testSpecifyingDivStyleUserValueDivGeneratesAWarning(assert) {
+        var userValue = 'width: 42px';
         this.render('<div style={{userValue}}></div>', {
-          userValue: 'width: 42px'
+          userValue: userValue
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning(userValue);
       };
 
       _class9.prototype['@test specifying `attributeBindings: ["style"]` generates a warning'] = function testSpecifyingAttributeBindingsStyleGeneratesAWarning(assert) {
@@ -21267,12 +21303,12 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
         });
 
         this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template: 'hello' });
-
+        var userValue = 'width: 42px';
         this.render('{{foo-bar style=userValue}}', {
-          userValue: 'width: 42px'
+          userValue: userValue
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning(userValue);
       };
 
       _class9.prototype['@test specifying `<div style={{{userValue}}}></div>` works properly without a warning'] = function testSpecifyingDivStyleUserValueDivWorksProperlyWithoutAWarning(assert) {
@@ -21322,35 +21358,39 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
       };
 
       _class9.prototype['@test binding warning is triggered when an unsafe string is quoted'] = function testBindingWarningIsTriggeredWhenAnUnsafeStringIsQuoted(assert) {
+        var userValue = 'width: 42px';
         this.render('<div style="{{userValue}}"></div>', {
-          userValue: 'width: 42px'
+          userValue: userValue
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning(userValue);
       };
 
       _class9.prototype['@test binding warning is triggered when a safe string for a complete property is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForACompletePropertyIsConcatenatedInPlace(assert) {
+        var userValue = 'width: 42px';
         this.render('<div style="color: green; {{userValue}}"></div>', {
           userValue: new _emberGlimmerTestsUtilsHelpers.SafeString('width: 42px')
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning('color: green; ' + userValue);
       };
 
       _class9.prototype['@test binding warning is triggered when a safe string for a value is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForAValueIsConcatenatedInPlace(assert) {
+        var userValue = '42px';
         this.render('<div style="color: green; width: {{userValue}}"></div>', {
-          userValue: new _emberGlimmerTestsUtilsHelpers.SafeString('42px')
+          userValue: new _emberGlimmerTestsUtilsHelpers.SafeString(userValue)
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning('color: green; width: ' + userValue);
       };
 
       _class9.prototype['@test binding warning is triggered when a safe string for a property name is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForAPropertyNameIsConcatenatedInPlace(assert) {
+        var userValue = 'width';
         this.render('<div style="color: green; {{userProperty}}: 42px"></div>', {
-          userProperty: new _emberGlimmerTestsUtilsHelpers.SafeString('width')
+          userProperty: new _emberGlimmerTestsUtilsHelpers.SafeString(userValue)
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning('color: green; ' + userValue + ': 42px');
       };
 
       return _class9;
@@ -43096,7 +43136,7 @@ enifed('ember-metal/tests/run_loop/once_test', ['exports', 'ember-metal/run_loop
     });
   });
 });
-enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_loop', 'ember-metal/error_handler'], function (exports, _emberMetalRun_loop, _emberMetalError_handler) {
+enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_loop', 'ember-metal/error_handler', 'ember-metal/testing'], function (exports, _emberMetalRun_loop, _emberMetalError_handler, _emberMetalTesting) {
   'use strict';
 
   QUnit.module('system/run_loop/onerror_test');
@@ -43123,17 +43163,24 @@ enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_l
   QUnit.test('With Ember.onerror set, errors in Ember.run are caught', function () {
     var thrown = new Error('Boom!');
     var original = _emberMetalError_handler.getOnerror();
+    var originalDispatchOverride = _emberMetalError_handler.getDispatchOverride();
+    var originalIsTesting = _emberMetalTesting.isTesting();
 
     var caught = undefined;
     _emberMetalError_handler.setOnerror(function (error) {
       caught = error;
     });
+    _emberMetalError_handler.setDispatchOverride(null);
+    _emberMetalTesting.setTesting(false);
+
     try {
       _emberMetalRun_loop.default(function () {
         throw thrown;
       });
     } finally {
       _emberMetalError_handler.setOnerror(original);
+      _emberMetalError_handler.setDispatchOverride(originalDispatchOverride);
+      _emberMetalTesting.setTesting(originalIsTesting);
     }
 
     deepEqual(caught, thrown);
@@ -60139,9 +60186,11 @@ enifed('ember-testing/tests/adapters_test', ['exports', 'ember-metal', 'ember-te
       originalQUnit = window.QUnit;
     },
     teardown: function () {
-      _emberMetal.run(App, App.destroy);
-      App.removeTestHelpers();
-      App = null;
+      if (App) {
+        _emberMetal.run(App, App.destroy);
+        App.removeTestHelpers();
+        App = null;
+      }
 
       _emberTestingTest.default.adapter = originalAdapter;
       window.QUnit = originalQUnit;
@@ -60195,6 +60244,23 @@ enifed('ember-testing/tests/adapters_test', ['exports', 'ember-metal', 'ember-te
     ok(_emberTestingTest.default.adapter instanceof _emberTestingAdaptersAdapter.default);
     ok(!(_emberTestingTest.default.adapter instanceof _emberTestingAdaptersQunit.default));
   });
+
+  QUnit.test('With Ember.Test.adapter set, errors in Ember.run are caught', function () {
+    var thrown = new Error('Boom!');
+
+    var caught = undefined;
+    _emberTestingTest.default.adapter = _emberTestingAdaptersQunit.default.create({
+      exception: function (error) {
+        caught = error;
+      }
+    });
+
+    _emberMetal.run(function () {
+      throw thrown;
+    });
+
+    deepEqual(caught, thrown);
+  });
 });
 enifed('ember-testing/tests/ext/rsvp_test', ['exports', 'ember-testing/ext/rsvp', 'ember-testing/test/adapter', 'ember-metal'], function (exports, _emberTestingExtRsvp, _emberTestingTestAdapter, _emberMetal) {
   'use strict';

data/dist/ember-tests.prod.js

@@ -6,7 +6,7 @@
  *            Portions Copyright 2008-2011 Apple Inc. All rights reserved.
  * @license   Licensed under MIT license
  *            See https://raw.github.com/emberjs/ember.js/master/LICENSE
- * @version   2.11.2
+ * @version   2.11.3
  */
 
 var enifed, requireModule, Ember;
@@ -164,7 +164,7 @@ function defaults(obj, defaults) {
   return obj;
 }
 
-babelHelpers = {
+var babelHelpers = {
   inherits: inherits,
   taggedTemplateLiteralLoose: taggedTemplateLiteralLoose,
   slice: Array.prototype.slice,
@@ -15353,6 +15353,39 @@ babelHelpers.inherits(_class, _RenderingTest);
     return _class;
   })(_emberGlimmerTestsUtilsTestCase.RenderingTest));
 });
+enifed('ember-glimmer/tests/integration/components/destroy-test', ['exports', 'ember-metal', 'ember-glimmer/tests/utils/helpers', 'ember-glimmer/tests/utils/test-case'], function (exports, _emberMetal, _emberGlimmerTestsUtilsHelpers, _emberGlimmerTestsUtilsTestCase) {
+  'use strict';
+
+  _emberGlimmerTestsUtilsTestCase.moduleFor('Component destroy', (function (_RenderingTest) {
+    babelHelpers.inherits(_class, _RenderingTest);
+
+    function _class() {
+      _RenderingTest.apply(this, arguments);
+    }
+
+    _class.prototype['@test it correctly releases the destroyed components'] = function testItCorrectlyReleasesTheDestroyedComponents(assert) {
+      var _this = this;
+
+      var FooBarComponent = _emberGlimmerTestsUtilsHelpers.Component.extend({});
+
+      this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template: 'hello' });
+
+      this.render('{{#if switch}}{{#foo-bar}}{{foo-bar}}{{/foo-bar}}{{/if}}', { switch: true });
+
+      this.assertComponentElement(this.firstChild, { content: 'hello' });
+
+      this.runTask(function () {
+        return _emberMetal.set(_this.context, 'switch', false);
+      });
+
+      this.assertText('');
+
+      assert.equal(this.env.destroyedComponents.length, 0, 'enviroment.destroyedComponents should be empty');
+    };
+
+    return _class;
+  })(_emberGlimmerTestsUtilsTestCase.RenderingTest));
+});
 enifed('ember-glimmer/tests/integration/components/dynamic-components-test', ['exports', 'ember-metal', 'ember-glimmer/tests/utils/helpers', 'ember-glimmer/tests/utils/abstract-test-case', 'ember-glimmer/tests/utils/test-case'], function (exports, _emberMetal, _emberGlimmerTestsUtilsHelpers, _emberGlimmerTestsUtilsAbstractTestCase, _emberGlimmerTestsUtilsTestCase) {
   'use strict';
 
@@ -20969,8 +21002,8 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
       _emberMetal.setDebugFunction('warn', originalWarn);
     };
 
-    StyleTest.prototype.assertStyleWarning = function assertStyleWarning() {
-      this.assert.deepEqual(warnings, [_emberViews.STYLE_WARNING]);
+    StyleTest.prototype.assertStyleWarning = function assertStyleWarning(style) {
+      this.assert.deepEqual(warnings, [_emberViews.constructStyleDeprecationMessage(style)]);
     };
 
     StyleTest.prototype.assertNoWarning = function assertNoWarning() {
@@ -21065,11 +21098,12 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
       }
 
       _class9.prototype['@test specifying <div style={{userValue}}></div> generates a warning'] = function testSpecifyingDivStyleUserValueDivGeneratesAWarning(assert) {
+        var userValue = 'width: 42px';
         this.render('<div style={{userValue}}></div>', {
-          userValue: 'width: 42px'
+          userValue: userValue
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning(userValue);
       };
 
       _class9.prototype['@test specifying `attributeBindings: ["style"]` generates a warning'] = function testSpecifyingAttributeBindingsStyleGeneratesAWarning(assert) {
@@ -21078,12 +21112,12 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
         });
 
         this.registerComponent('foo-bar', { ComponentClass: FooBarComponent, template: 'hello' });
-
+        var userValue = 'width: 42px';
         this.render('{{foo-bar style=userValue}}', {
-          userValue: 'width: 42px'
+          userValue: userValue
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning(userValue);
       };
 
       _class9.prototype['@test specifying `<div style={{{userValue}}}></div>` works properly without a warning'] = function testSpecifyingDivStyleUserValueDivWorksProperlyWithoutAWarning(assert) {
@@ -21133,35 +21167,39 @@ enifed('ember-glimmer/tests/integration/content-test', ['exports', 'ember-glimme
       };
 
       _class9.prototype['@test binding warning is triggered when an unsafe string is quoted'] = function testBindingWarningIsTriggeredWhenAnUnsafeStringIsQuoted(assert) {
+        var userValue = 'width: 42px';
         this.render('<div style="{{userValue}}"></div>', {
-          userValue: 'width: 42px'
+          userValue: userValue
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning(userValue);
       };
 
       _class9.prototype['@test binding warning is triggered when a safe string for a complete property is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForACompletePropertyIsConcatenatedInPlace(assert) {
+        var userValue = 'width: 42px';
         this.render('<div style="color: green; {{userValue}}"></div>', {
           userValue: new _emberGlimmerTestsUtilsHelpers.SafeString('width: 42px')
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning('color: green; ' + userValue);
       };
 
       _class9.prototype['@test binding warning is triggered when a safe string for a value is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForAValueIsConcatenatedInPlace(assert) {
+        var userValue = '42px';
         this.render('<div style="color: green; width: {{userValue}}"></div>', {
-          userValue: new _emberGlimmerTestsUtilsHelpers.SafeString('42px')
+          userValue: new _emberGlimmerTestsUtilsHelpers.SafeString(userValue)
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning('color: green; width: ' + userValue);
       };
 
       _class9.prototype['@test binding warning is triggered when a safe string for a property name is concatenated in place'] = function testBindingWarningIsTriggeredWhenASafeStringForAPropertyNameIsConcatenatedInPlace(assert) {
+        var userValue = 'width';
         this.render('<div style="color: green; {{userProperty}}: 42px"></div>', {
-          userProperty: new _emberGlimmerTestsUtilsHelpers.SafeString('width')
+          userProperty: new _emberGlimmerTestsUtilsHelpers.SafeString(userValue)
         });
 
-        this.assertStyleWarning();
+        this.assertStyleWarning('color: green; ' + userValue + ': 42px');
       };
 
       return _class9;
@@ -42651,7 +42689,7 @@ enifed('ember-metal/tests/run_loop/once_test', ['exports', 'ember-metal/run_loop
     });
   });
 });
-enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_loop', 'ember-metal/error_handler'], function (exports, _emberMetalRun_loop, _emberMetalError_handler) {
+enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_loop', 'ember-metal/error_handler', 'ember-metal/testing'], function (exports, _emberMetalRun_loop, _emberMetalError_handler, _emberMetalTesting) {
   'use strict';
 
   QUnit.module('system/run_loop/onerror_test');
@@ -42678,17 +42716,24 @@ enifed('ember-metal/tests/run_loop/onerror_test', ['exports', 'ember-metal/run_l
   QUnit.test('With Ember.onerror set, errors in Ember.run are caught', function () {
     var thrown = new Error('Boom!');
     var original = _emberMetalError_handler.getOnerror();
+    var originalDispatchOverride = _emberMetalError_handler.getDispatchOverride();
+    var originalIsTesting = _emberMetalTesting.isTesting();
 
     var caught = undefined;
     _emberMetalError_handler.setOnerror(function (error) {
       caught = error;
     });
+    _emberMetalError_handler.setDispatchOverride(null);
+    _emberMetalTesting.setTesting(false);
+
     try {
       _emberMetalRun_loop.default(function () {
         throw thrown;
       });
     } finally {
       _emberMetalError_handler.setOnerror(original);
+      _emberMetalError_handler.setDispatchOverride(originalDispatchOverride);
+      _emberMetalTesting.setTesting(originalIsTesting);
     }
 
     deepEqual(caught, thrown);
@@ -59680,9 +59725,11 @@ enifed('ember-testing/tests/adapters_test', ['exports', 'ember-metal', 'ember-te
       originalQUnit = window.QUnit;
     },
     teardown: function () {
-      _emberMetal.run(App, App.destroy);
-      App.removeTestHelpers();
-      App = null;
+      if (App) {
+        _emberMetal.run(App, App.destroy);
+        App.removeTestHelpers();
+        App = null;
+      }
 
       _emberTestingTest.default.adapter = originalAdapter;
       window.QUnit = originalQUnit;
@@ -59736,6 +59783,23 @@ enifed('ember-testing/tests/adapters_test', ['exports', 'ember-metal', 'ember-te
     ok(_emberTestingTest.default.adapter instanceof _emberTestingAdaptersAdapter.default);
     ok(!(_emberTestingTest.default.adapter instanceof _emberTestingAdaptersQunit.default));
   });
+
+  QUnit.test('With Ember.Test.adapter set, errors in Ember.run are caught', function () {
+    var thrown = new Error('Boom!');
+
+    var caught = undefined;
+    _emberTestingTest.default.adapter = _emberTestingAdaptersQunit.default.create({
+      exception: function (error) {
+        caught = error;
+      }
+    });
+
+    _emberMetal.run(function () {
+      throw thrown;
+    });
+
+    deepEqual(caught, thrown);
+  });
 });
 enifed('ember-testing/tests/ext/rsvp_test', ['exports', 'ember-testing/ext/rsvp', 'ember-testing/test/adapter', 'ember-metal'], function (exports, _emberTestingExtRsvp, _emberTestingTestAdapter, _emberMetal) {
   'use strict';