ember-source 2.15.3 → 2.16.0.beta.1

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.15.3
+ * @version   2.16.0-beta.1
  */
 
 var enifed, requireModule, Ember;

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.15.3
+ * @version   2.16.0-beta.1
  */
 
 var enifed, requireModule, Ember;
@@ -1779,7 +1779,6 @@ enifed('ember-application/tests/system/application_instance_test', ['ember-babel
     appInstance = (0, _emberMetal.run)(function () {
       return _applicationInstance.default.create({ application: application });
     });
-    appInstance.setupRegistry();
 
     application.customEvents = {
       awesome: 'sauce'
@@ -1799,7 +1798,6 @@ enifed('ember-application/tests/system/application_instance_test', ['ember-babel
     (0, _emberMetal.run)(function () {
       return appInstance = _applicationInstance.default.create({ application: application });
     });
-    appInstance.setupRegistry();
 
     application.customEvents = {
       awesome: 'sauce'
@@ -1819,7 +1817,6 @@ enifed('ember-application/tests/system/application_instance_test', ['ember-babel
     appInstance = (0, _emberMetal.run)(function () {
       return _applicationInstance.default.create({ application: application });
     });
-    appInstance.setupRegistry();
 
     appInstance.customEvents = {
       awesome: 'sauce'
@@ -5765,22 +5762,15 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
       });
     };
 
-    _class.prototype['@test visit() does not setup the event_dispatcher:main if isInteractive is false (with Engines) GH#15615'] = function (assert) {
+    _class.prototype['@test visit() on engine resolves engine component'] = function (assert) {
       var _this8 = this;
 
-      assert.expect(3);
+      assert.expect(2);
 
       this.router.map(function () {
         this.mount('blog');
       });
 
-      this.addTemplate('application', '<h1>Hello world</h1>{{outlet}}');
-      this.add('event_dispatcher:main', {
-        create: function () {
-          throw new Error('should not happen!');
-        }
-      });
-
       // Register engine
       var BlogEngine = _engine.default.extend({
         init: function () {
@@ -5800,15 +5790,14 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
       var BlogMap = function () {};
       this.add('route-map:blog', BlogMap);
 
-      assert.strictEqual(this.$('#qunit-fixture').children().length, 0, 'there are no elements in the fixture element');
+      assert.strictEqual(this.$().children().length, 0, 'there are no elements in the fixture element');
 
-      return this.visit('/blog', { isInteractive: false }).then(function (instance) {
-        assert.ok(instance instanceof _applicationInstance.default, 'promise is resolved with an ApplicationInstance');
+      return this.visit('/blog', { shouldRender: true }).then(function (instance) {
         assert.strictEqual(_this8.$().find('p').text(), 'Dis cache money', 'Engine component is resolved');
       });
     };
 
-    _class.prototype['@test visit() on engine resolves engine component'] = function (assert) {
+    _class.prototype['@test visit() on engine resolves engine helper'] = function (assert) {
       var _this9 = this;
 
       assert.expect(2);
@@ -5824,41 +5813,6 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
             args[_key2] = arguments[_key2];
           }
 
-          this._super.apply(this, args);
-          this.register('template:application', (0, _emberTemplateCompiler.compile)('{{cache-money}}'));
-          this.register('template:components/cache-money', (0, _emberTemplateCompiler.compile)('\n          <p>Dis cache money</p>\n        '));
-          this.register('component:cache-money', _emberGlimmer.Component.extend({}));
-        }
-      });
-      this.add('engine:blog', BlogEngine);
-
-      // Register engine route map
-      var BlogMap = function () {};
-      this.add('route-map:blog', BlogMap);
-
-      assert.strictEqual(this.$().children().length, 0, 'there are no elements in the fixture element');
-
-      return this.visit('/blog', { shouldRender: true }).then(function (instance) {
-        assert.strictEqual(_this9.$().find('p').text(), 'Dis cache money', 'Engine component is resolved');
-      });
-    };
-
-    _class.prototype['@test visit() on engine resolves engine helper'] = function (assert) {
-      var _this10 = this;
-
-      assert.expect(2);
-
-      this.router.map(function () {
-        this.mount('blog');
-      });
-
-      // Register engine
-      var BlogEngine = _engine.default.extend({
-        init: function () {
-          for (var _len3 = arguments.length, args = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
-            args[_key3] = arguments[_key3];
-          }
-
           this._super.apply(this, args);
           this.register('template:application', (0, _emberTemplateCompiler.compile)('{{swag}}'));
           this.register('helper:swag', (0, _emberGlimmer.helper)(function () {
@@ -5875,12 +5829,12 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
       assert.strictEqual(this.$().children().length, 0, 'there are no elements in the fixture element');
 
       return this.visit('/blog', { shouldRender: true }).then(function () {
-        assert.strictEqual(_this10.$().text(), 'turnt up', 'Engine component is resolved');
+        assert.strictEqual(_this9.$().text(), 'turnt up', 'Engine component is resolved');
       });
     };
 
     _class.prototype['@test Ember Islands-style setup'] = function (assert) {
-      var _this11 = this;
+      var _this10 = this;
 
       var xFooInitCalled = false;
       var xFooDidInsertElementCalled = false;
@@ -5967,9 +5921,9 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
       var instances = [];
 
       return _emberRuntime.RSVP.all([this.runTask(function () {
-        return _this11.application.visit('/x-foo?data=' + data, { rootElement: $foo[0] });
+        return _this10.application.visit('/x-foo?data=' + data, { rootElement: $foo[0] });
       }), this.runTask(function () {
-        return _this11.application.visit('/x-bar', { rootElement: $bar[0] });
+        return _this10.application.visit('/x-bar', { rootElement: $bar[0] });
       })]).then(function (_instances) {
         instances = _instances;
 
@@ -5987,14 +5941,14 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
         assert.equal($bar.find('button').text(), 'Join 0 others in clicking me!');
         assert.ok($bar.text().indexOf('X-Foo') === -1);
 
-        _this11.runTask(function () {
+        _this10.runTask(function () {
           $foo.find('x-foo').click();
         });
 
         assert.equal($foo.find('p').text(), 'Hello Godfrey, I have been clicked 1 times (1 times combined)!');
         assert.equal($bar.find('button').text(), 'Join 1 others in clicking me!');
 
-        _this11.runTask(function () {
+        _this10.runTask(function () {
           $bar.find('button').click();
           $bar.find('button').click();
         });
@@ -6002,7 +5956,7 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
         assert.equal($foo.find('p').text(), 'Hello Godfrey, I have been clicked 1 times (3 times combined)!');
         assert.equal($bar.find('button').text(), 'Join 3 others in clicking me!');
       }).finally(function () {
-        _this11.runTask(function () {
+        _this10.runTask(function () {
           instances.forEach(function (instance) {
             instance.destroy();
           });
@@ -7761,37 +7715,8 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
       });
     };
 
-    _class.prototype['@test Model Types Updated but Unchanged Do not Trigger Callbacks'] = function testModelTypesUpdatedButUnchangedDoNotTriggerCallbacks() {
-      var _this6 = this;
-
-      expect(0);
-      var records = (0, _emberRuntime.A)([1, 2, 3]);
-      this.add('data-adapter:main', DataAdapter.extend({
-        getRecords: function (klass, name) {
-          return records;
-        }
-      }));
-      this.add('model:post', PostClass);
-
-      return this.visit('/').then(function () {
-        adapter = _this6.applicationInstance.lookup('data-adapter:main');
-
-        function modelTypesAdded(types) {
-          (0, _emberMetal.run)(function () {
-            records.arrayContentDidChange(0, 0, 0);
-          });
-        }
-
-        function modelTypesUpdated(types) {
-          ok(false, "modelTypesUpdated should not be triggered if the array didn't change");
-        }
-
-        adapter.watchModelTypes(modelTypesAdded, modelTypesUpdated);
-      });
-    };
-
     _class.prototype['@test Records Added'] = function testRecordsAdded() {
-      var _this7 = this;
+      var _this6 = this;
 
       var countAdded = 1;
       var post = PostClass.create();
@@ -7814,7 +7739,7 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
       this.add('model:post', PostClass);
 
       return this.visit('/').then(function () {
-        adapter = _this7.applicationInstance.lookup('data-adapter:main');
+        adapter = _this6.applicationInstance.lookup('data-adapter:main');
 
         function recordsAdded(records) {
           var record = records[0];
@@ -7832,7 +7757,7 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
     };
 
     _class.prototype['@test Observes and releases a record correctly'] = function testObservesAndReleasesARecordCorrectly() {
-      var _this8 = this;
+      var _this7 = this;
 
       var updatesCalled = 0;
       var post = PostClass.create({ title: 'Post' });
@@ -7859,7 +7784,7 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
       this.add('model:post', PostClass);
 
       return this.visit('/').then(function () {
-        adapter = _this8.applicationInstance.lookup('data-adapter:main');
+        adapter = _this7.applicationInstance.lookup('data-adapter:main');
 
         function recordsAdded() {
           (0, _emberMetal.set)(post, 'title', 'Post Modified');
@@ -7878,12 +7803,12 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
     };
 
     _class.prototype['@test _nameToClass does not error when not found'] = function test_nameToClassDoesNotErrorWhenNotFound() {
-      var _this9 = this;
+      var _this8 = this;
 
       this.add('data-adapter:main', DataAdapter);
 
       return this.visit('/').then(function () {
-        adapter = _this9.applicationInstance.lookup('data-adapter:main');
+        adapter = _this8.applicationInstance.lookup('data-adapter:main');
 
         var klass = adapter._nameToClass('foo');
 
@@ -8691,7 +8616,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
       return this.visit('/').then(function () {
         _this12.assertText('Application');
         return _this12.transitionTo('blog.post');
-      }).then(function () {
+      }).catch(function () {
         _this12.assertText('ApplicationError! Oh, noes!');
       });
     };
@@ -8714,7 +8639,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
       return this.visit('/').then(function () {
         _this13.assertText('Application');
         return _this13.transitionTo('blog.post');
-      }).then(function () {
+      }).catch(function () {
         _this13.assertText('ApplicationEngineError! Oh, noes!');
       });
     };
@@ -8737,7 +8662,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
       return this.visit('/').then(function () {
         _this14.assertText('Application');
         return _this14.transitionTo('blog.post');
-      }).then(function () {
+      }).catch(function () {
         _this14.assertText('ApplicationEngineError! Oh, noes!');
       });
     };
@@ -8760,7 +8685,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
       return this.visit('/').then(function () {
         _this15.assertText('Application');
         return _this15.transitionTo('blog.post.comments');
-      }).then(function () {
+      }).catch(function () {
         _this15.assertText('ApplicationEngineError! Oh, noes!');
       });
     };
@@ -23085,6 +23010,15 @@ enifed('ember-glimmer/tests/integration/event-dispatcher-test', ['ember-babel',
       this.render('{{x-foo}}');
     };
 
+    _class2.prototype['@test canDispatchToEventManager is deprecated in EventDispatcher'] = function testCanDispatchToEventManagerIsDeprecatedInEventDispatcher(assert) {
+      var MyDispatcher = _emberViews.EventDispatcher.extend({
+        canDispatchToEventManager: null
+      });
+
+      expectDeprecation(/`canDispatchToEventManager` has been deprecated/);
+      MyDispatcher.create();
+    };
+
     _class2.prototype['@test a rootElement can be specified'] = function testARootElementCanBeSpecified(assert) {
       this.$().append('<div id="app"></div>');
       this.dispatcher.setup({ myevent: 'myEvent' }, '#app');
@@ -23129,49 +23063,21 @@ enifed('ember-glimmer/tests/integration/event-dispatcher-test', ['ember-babel',
     return _class2;
   }(_testCase.RenderingTest));
 
-  (0, _testCase.moduleFor)('custom EventDispatcher subclass with #setup', function (_RenderingTest3) {
-    (0, _emberBabel.inherits)(_class3, _RenderingTest3);
-
-    function _class3() {
-      (0, _emberBabel.classCallCheck)(this, _class3);
-
-      var _this9 = (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest3.call(this));
-
-      var dispatcher = _this9.owner.lookup('event_dispatcher:main');
-      (0, _emberMetal.run)(dispatcher, 'destroy');
-      _this9.owner.__container__.reset('event_dispatcher:main');
-      _this9.owner.unregister('event_dispatcher:main');
-      return _this9;
-    }
-
-    _class3.prototype['@test canDispatchToEventManager is deprecated in EventDispatcher'] = function testCanDispatchToEventManagerIsDeprecatedInEventDispatcher(assert) {
-      var MyDispatcher = _emberViews.EventDispatcher.extend({
-        canDispatchToEventManager: null
-      });
-      this.owner.register('event_dispatcher:main', MyDispatcher);
-
-      expectDeprecation(/`canDispatchToEventManager` has been deprecated/);
-      this.owner.lookup('event_dispatcher:main');
-    };
-
-    return _class3;
-  }(_testCase.RenderingTest));
-
   if (_features.EMBER_IMPROVED_INSTRUMENTATION) {
-    (0, _testCase.moduleFor)('EventDispatcher - Instrumentation', function (_RenderingTest4) {
-      (0, _emberBabel.inherits)(_class4, _RenderingTest4);
+    (0, _testCase.moduleFor)('EventDispatcher - Instrumentation', function (_RenderingTest3) {
+      (0, _emberBabel.inherits)(_class3, _RenderingTest3);
 
-      function _class4() {
-        (0, _emberBabel.classCallCheck)(this, _class4);
-        return (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest4.apply(this, arguments));
+      function _class3() {
+        (0, _emberBabel.classCallCheck)(this, _class3);
+        return (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest3.apply(this, arguments));
       }
 
-      _class4.prototype.teardown = function teardown() {
-        _RenderingTest4.prototype.teardown.call(this);
+      _class3.prototype.teardown = function teardown() {
+        _RenderingTest3.prototype.teardown.call(this);
         (0, _emberMetal.instrumentationReset)();
       };
 
-      _class4.prototype['@test instruments triggered events'] = function testInstrumentsTriggeredEvents(assert) {
+      _class3.prototype['@test instruments triggered events'] = function testInstrumentsTriggeredEvents(assert) {
         var clicked = 0;
 
         this.registerComponent('x-foo', {
@@ -23218,20 +23124,20 @@ enifed('ember-glimmer/tests/integration/event-dispatcher-test', ['ember-babel',
         assert.strictEqual(keypressInstrumented, 0, 'The keypress was not instrumented');
       };
 
-      return _class4;
+      return _class3;
     }(_testCase.RenderingTest));
   }
 
   if (canDataTransfer) {
-    (0, _testCase.moduleFor)('EventDispatcher - Event Properties', function (_RenderingTest5) {
-      (0, _emberBabel.inherits)(_class5, _RenderingTest5);
+    (0, _testCase.moduleFor)('EventDispatcher - Event Properties', function (_RenderingTest4) {
+      (0, _emberBabel.inherits)(_class4, _RenderingTest4);
 
-      function _class5() {
-        (0, _emberBabel.classCallCheck)(this, _class5);
-        return (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest5.apply(this, arguments));
+      function _class4() {
+        (0, _emberBabel.classCallCheck)(this, _class4);
+        return (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest4.apply(this, arguments));
       }
 
-      _class5.prototype['@test dataTransfer property is added to drop event'] = function testDataTransferPropertyIsAddedToDropEvent(assert) {
+      _class4.prototype['@test dataTransfer property is added to drop event'] = function testDataTransferPropertyIsAddedToDropEvent(assert) {
         var receivedEvent = void 0;
         this.registerComponent('x-foo', {
           ComponentClass: _helpers.Component.extend({
@@ -23247,7 +23153,7 @@ enifed('ember-glimmer/tests/integration/event-dispatcher-test', ['ember-babel',
         assert.equal(receivedEvent.dataTransfer, 'success');
       };
 
-      return _class5;
+      return _class4;
     }(_testCase.RenderingTest));
   }
 });
@@ -45315,7 +45221,7 @@ QUnit.test('should pass ESLint', function(assert) {
   assert.ok(true, 'ember-metal/tests/run_loop/debounce_test.js should pass ESLint\n\n');
 });
 
-enifed('ember-metal/tests/run_loop/later_test', ['ember-utils', 'ember-metal'], function (_emberUtils, _emberMetal) {
+enifed('ember-metal/tests/run_loop/later_test', ['ember-metal'], function (_emberMetal) {
   'use strict';
 
   var originalSetTimeout = window.setTimeout;
@@ -45522,7 +45428,7 @@ enifed('ember-metal/tests/run_loop/later_test', ['ember-utils', 'ember-metal'],
     // happens when an expired timer callback takes a while to run,
     // which is what we simulate here.
     var newSetTimeoutUsed = void 0;
-    _emberMetal.run.backburner._platform = (0, _emberUtils.assign)({}, originalPlatform, {
+    _emberMetal.run.backburner._platform = {
       setTimeout: function () {
         var wait = arguments[arguments.length - 1];
         newSetTimeoutUsed = true;
@@ -45530,7 +45436,7 @@ enifed('ember-metal/tests/run_loop/later_test', ['ember-utils', 'ember-metal'],
 
         return originalPlatform.setTimeout.apply(originalPlatform, arguments);
       }
-    });
+    };
 
     var count = 0;
     (0, _emberMetal.run)(function () {
@@ -46515,8 +46421,8 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
   QUnit.module('Ember.WeakMap');
 
   QUnit.test('has weakMap like qualities', function (assert) {
-    var map = new _emberMetal.WeakMap();
-    var map2 = new _emberMetal.WeakMap();
+    var map = new _emberMetal.WeakMapPolyfill();
+    var map2 = new _emberMetal.WeakMapPolyfill();
 
     var a = {};
     var b = {};
@@ -46559,20 +46465,11 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
     assert.strictEqual(map.get(b), undefined);
   });
 
-  QUnit.test('WeakMap constructor requres new', function (assert) {
-    var expectedError = new TypeError('Constructor WeakMap requires \'new\'');
-
-    assert.throws(function () {
-      // jshint newcap: false
-      (0, _emberMetal.WeakMap)();
-    }, expectedError);
-  });
-
   QUnit.test('constructing a WeakMap with an invalid iterator throws an error', function (assert) {
     var expectedError = new TypeError('The weak map constructor polyfill only supports an array argument');
 
     assert.throws(function () {
-      new _emberMetal.WeakMap({ a: 1 });
+      new _emberMetal.WeakMapPolyfill({ a: 1 });
     }, expectedError);
   });
 
@@ -46581,7 +46478,7 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
     var b = {};
     var c = {};
 
-    var map = new _emberMetal.WeakMap([[a, 1], [b, 2], [c, 3]]);
+    var map = new _emberMetal.WeakMapPolyfill([[a, 1], [b, 2], [c, 3]]);
 
     assert.strictEqual(map.get(a), 1);
     assert.strictEqual(map.get(b), 2);
@@ -46590,7 +46487,7 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
 
   QUnit.test('that error is thrown when using a primitive key', function (assert) {
     var expectedError = new TypeError('Invalid value used as weak map key');
-    var map = new _emberMetal.WeakMap();
+    var map = new _emberMetal.WeakMapPolyfill();
 
     assert.throws(function () {
       return map.set('a', 1);
@@ -46610,7 +46507,7 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
   });
 
   QUnit.test('that .has and .delete work as expected', function (assert) {
-    var map = new _emberMetal.WeakMap();
+    var map = new _emberMetal.WeakMapPolyfill();
     var a = {};
     var b = {};
     var foo = { id: 1, name: 'My file', progress: 0 };
@@ -46630,7 +46527,7 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
   });
 
   QUnit.test('that .toString works as expected', function (assert) {
-    var map = new _emberMetal.WeakMap();
+    var map = new _emberMetal.WeakMapPolyfill();
 
     assert.strictEqual(map.toString(), '[object WeakMap]');
   });
@@ -49257,12 +49154,6 @@ QUnit.test('should pass ESLint', function(assert) {
   assert.ok(true, 'ember-runtime/mixins/controller.js should pass ESLint\n\n');
 });
 
-QUnit.module('ESLint | ember-runtime/mixins/controller_content_model_alias_deprecation.js');
-QUnit.test('should pass ESLint', function(assert) {
-  assert.expect(1);
-  assert.ok(true, 'ember-runtime/mixins/controller_content_model_alias_deprecation.js should pass ESLint\n\n');
-});
-
 QUnit.module('ESLint | ember-runtime/mixins/copyable.js');
 QUnit.test('should pass ESLint', function(assert) {
   assert.expect(1);
@@ -51446,16 +51337,18 @@ enifed('ember-runtime/tests/controllers/controller_test', ['ember-runtime/contro
 
   QUnit.module('Controller Content -> Model Alias');
 
-  QUnit.test('`model` is aliased as `content`', function () {
-    expect(1);
+  QUnit.test('`content` is a deprecated alias of `model`', function () {
+    expect(2);
     var controller = _controller.default.extend({
       model: 'foo-bar'
     }).create();
 
-    equal(controller.get('content'), 'foo-bar', 'content is an alias of model');
+    expectDeprecation(function () {
+      equal(controller.get('content'), 'foo-bar', 'content is an alias of model');
+    });
   });
 
-  QUnit.test('`content` is moved to `model` when `model` is unset', function () {
+  QUnit.test('`content` is not moved to `model` when `model` is unset', function () {
     expect(2);
     var controller = void 0;
 
@@ -51465,18 +51358,19 @@ enifed('ember-runtime/tests/controllers/controller_test', ['ember-runtime/contro
       }).create();
     });
 
-    equal(controller.get('model'), 'foo-bar', 'model is set properly');
-    equal(controller.get('content'), 'foo-bar', 'content is set properly');
+    notEqual(controller.get('model'), 'foo-bar', 'model is set properly');
+    equal(controller.get('content'), 'foo-bar', 'content is not set properly');
   });
 
-  QUnit.test('specifying `content` (without `model` specified) results in deprecation', function () {
-    expect(1);
+  QUnit.test('specifying `content` (without `model` specified) does not result in deprecation', function () {
+    expect(2);
+    expectNoDeprecation();
 
-    expectDeprecation(function () {
-      _controller.default.extend({
-        content: 'foo-bar'
-      }).create();
-    }, 'Do not specify `content` on a Controller, use `model` instead.');
+    var controller = _controller.default.extend({
+      content: 'foo-bar'
+    }).create();
+
+    equal((0, _emberMetal.get)(controller, 'content'), 'foo-bar');
   });
 
   QUnit.test('specifying `content` (with `model` specified) does not result in deprecation', function () {
@@ -61125,9 +61019,9 @@ enifed('ember-runtime/tests/system/object/create_test', ['ember-metal', 'ember/f
   });
 
   QUnit.test('throws if you try to pass anything a string as a parameter', function () {
-    var expected = 'Ember.Object.create only accepts objects.';
+    var expected = 'EmberObject.create only accepts an objects.';
 
-    expectAssertion(function () {
+    throws(function () {
       return _object.default.create('some-string');
     }, expected);
   });
@@ -62751,6 +62645,13 @@ enifed('ember-runtime/tests/system/string/capitalize_test', ['ember-environment'
       deepEqual('private-docs/owner-invoice'.capitalize(), 'Private-docs/Owner-invoice');
     }
   });
+
+  QUnit.test('capitalize string with accent character', function () {
+    deepEqual((0, _string.capitalize)('šabc'), 'Šabc');
+    if (_emberEnvironment.ENV.EXTEND_PROTOTYPES.String) {
+      deepEqual('šabc'.capitalize(), 'Šabc');
+    }
+  });
 });
 QUnit.module('ESLint | ember-runtime/tests/system/string/capitalize_test.js');
 QUnit.test('should pass ESLint', function(assert) {
@@ -64478,7 +64379,7 @@ QUnit.test('should pass ESLint', function(assert) {
   assert.ok(true, 'ember-testing/tests/adapters_test.js should pass ESLint\n\n');
 });
 
-enifed('ember-testing/tests/ext/rsvp_test', ['ember-testing/ext/rsvp', 'ember-testing/test/adapter', 'ember-metal', 'ember-debug'], function (_rsvp, _adapter, _emberMetal, _emberDebug) {
+enifed('ember-testing/tests/ext/rsvp_test', ['ember-testing/ext/rsvp', 'ember-testing/test/adapter', 'ember-testing/test/promise', 'ember-metal', 'ember-debug'], function (_rsvp, _adapter, _promise, _emberMetal, _emberDebug) {
   'use strict';
 
   var originalTestAdapter = (0, _adapter.getAdapter)();
@@ -64562,6 +64463,34 @@ enifed('ember-testing/tests/ext/rsvp_test', ['ember-testing/ext/rsvp', 'ember-te
       equal(asyncEnded, 2);
     });
   });
+
+  QUnit.module('TestPromise');
+
+  QUnit.test('does not throw error when falsy value passed to then', function () {
+    expect(1);
+    return new _promise.default(function (resolve) {
+      resolve();
+    }).then(null).then(function () {
+      ok(true);
+    });
+  });
+
+  QUnit.test('able to get last Promise', function () {
+    expect(2);
+
+    var p1 = new _promise.default(function (resolve) {
+      resolve();
+    }).then(function () {
+      ok(true);
+    });
+
+    var p2 = new _promise.default(function (resolve) {
+      resolve();
+    });
+
+    deepEqual((0, _promise.getLastPromise)(), p2);
+    return p1;
+  });
 });
 QUnit.module('ESLint | ember-testing/tests/ext/rsvp_test.js');
 QUnit.test('should pass ESLint', function(assert) {
@@ -67322,105 +67251,6 @@ QUnit.test('should pass ESLint', function(assert) {
   assert.ok(true, 'ember/tests/controller_test.js should pass ESLint\n\n');
 });
 
-enifed('ember/tests/error_handler_test', ['ember', 'ember-metal'], function (_ember, _emberMetal) {
-  'use strict';
-
-  var ONERROR = _ember.default.onerror;
-  var ADAPTER = _ember.default.Test && _ember.default.Test.adapter;
-  var TESTING = _ember.default.testing;
-
-  QUnit.module('error_handler', {
-    teardown: function () {
-      _ember.default.onerror = ONERROR;
-      _ember.default.testing = TESTING;
-      if (_ember.default.Test) {
-        _ember.default.Test.adapter = ADAPTER;
-      }
-    }
-  });
-
-  function runThatThrows(message) {
-    return (0, _emberMetal.run)(function () {
-      throw new Error(message);
-    });
-  }
-
-  test('by default there is no onerror', function (assert) {
-    _ember.default.onerror = undefined;
-    assert.throws(runThatThrows, Error);
-    assert.equal(_ember.default.onerror, undefined);
-  });
-
-  test('when Ember.onerror is registered', function (assert) {
-    assert.expect(2);
-    _ember.default.onerror = function (error) {
-      assert.ok(true, 'onerror called');
-      throw error;
-    };
-    assert.throws(runThatThrows, Error);
-    // Ember.onerror = ONERROR;
-  });
-
-  if (true) {
-    test('when Ember.Test.adapter is registered', function (assert) {
-      assert.expect(2);
-
-      _ember.default.Test.adapter = {
-        exception: function (error) {
-          assert.ok(true, 'adapter called');
-          throw error;
-        }
-      };
-
-      assert.throws(runThatThrows, Error);
-    });
-
-    test('when both Ember.onerror Ember.Test.adapter are registered', function (assert) {
-      assert.expect(2);
-
-      // takes precedence
-      _ember.default.Test.adapter = {
-        exception: function (error) {
-          assert.ok(true, 'adapter called');
-          throw error;
-        }
-      };
-
-      _ember.default.onerror = function (error) {
-        assert.ok(false, 'onerror was NEVER called');
-        throw error;
-      };
-
-      assert.throws(runThatThrows, Error);
-    });
-  }
-
-  QUnit.test('Ember.run does not swallow exceptions by default (Ember.testing = true)', function () {
-    _ember.default.testing = true;
-    var error = new Error('the error');
-    throws(function () {
-      _ember.default.run(function () {
-        throw error;
-      });
-    }, error);
-  });
-
-  QUnit.test('Ember.run does not swallow exceptions by default (Ember.testing = false)', function () {
-    _ember.default.testing = false;
-    var error = new Error('the error');
-    throws(function () {
-      _ember.default.run(function () {
-        throw error;
-      });
-    }, error);
-  });
-});
-QUnit.module('ESLint | ember/tests/error_handler_test.js');
-QUnit.test('should pass ESLint', function(assert) {
-  assert.expect(1);
-  assert.ok(true, 'ember/tests/error_handler_test.js should pass ESLint\n\n');
-});
-
 enifed('ember/tests/global-api-test', ['ember-metal', 'ember-runtime'], function (_emberMetal, _emberRuntime) {
   'use strict';
 
@@ -69703,7 +69533,7 @@ enifed('ember/tests/helpers/link_to_test/link_to_with_query_params_test', ['embe
 
       assert.expect(1);
 
-      expectAssertion(function () {
+      assert.throws(function () {
         _this19.runTask(function () {
           _this19.createApplication();
 
@@ -69713,7 +69543,7 @@ enifed('ember/tests/helpers/link_to_test/link_to_with_query_params_test', ['embe
 
           _this19.addTemplate('application', '{{#link-to id=\'the-link\'}}Index{{/link-to}}');
         });
-      }, /You must provide one or more parameters to the link-to component/);
+      }, /(You must provide one or more parameters to the link-to component.|undefined is not an object)/);
     };
 
     return _class2;
@@ -69928,7 +69758,7 @@ enifed('ember/tests/reexports_test', ['ember/index', 'internal-test-helpers', 'e
   ['computed', 'ember-metal'], ['computed.alias', 'ember-metal', 'alias'], ['ComputedProperty', 'ember-metal'], ['cacheFor', 'ember-metal'], ['merge', 'ember-metal'], ['instrument', 'ember-metal'], ['Instrumentation.instrument', 'ember-metal', 'instrument'], ['Instrumentation.subscribe', 'ember-metal', 'instrumentationSubscribe'], ['Instrumentation.unsubscribe', 'ember-metal', 'instrumentationUnsubscribe'], ['Instrumentation.reset', 'ember-metal', 'instrumentationReset'], ['testing', 'ember-debug', { get: 'isTesting', set: 'setTesting' }], ['onerror', 'ember-metal', { get: 'getOnerror', set: 'setOnerror' }],
   // ['create'], TODO: figure out what to do here
   // ['keys'], TODO: figure out what to do here
-  ['FEATURES', 'ember/features'], ['FEATURES.isEnabled', 'ember-debug', 'isFeatureEnabled'], ['Error', 'ember-debug'], ['META_DESC', 'ember-metal'], ['meta', 'ember-metal'], ['get', 'ember-metal'], ['set', 'ember-metal'], ['_getPath', 'ember-metal'], ['getWithDefault', 'ember-metal'], ['trySet', 'ember-metal'], ['_Cache', 'ember-metal', 'Cache'], ['on', 'ember-metal'], ['addListener', 'ember-metal'], ['removeListener', 'ember-metal'], ['_suspendListener', 'ember-metal', 'suspendListener'], ['_suspendListeners', 'ember-metal', 'suspendListeners'], ['sendEvent', 'ember-metal'], ['hasListeners', 'ember-metal'], ['watchedEvents', 'ember-metal'], ['listenersFor', 'ember-metal'], ['accumulateListeners', 'ember-metal'], ['isNone', 'ember-metal'], ['isEmpty', 'ember-metal'], ['isBlank', 'ember-metal'], ['isPresent', 'ember-metal'], ['_Backburner', 'backburner', 'default'], ['run', 'ember-metal'], ['_ObserverSet', 'ember-metal', 'ObserverSet'], ['propertyWillChange', 'ember-metal'], ['propertyDidChange', 'ember-metal'], ['overrideChains', 'ember-metal'], ['beginPropertyChanges', 'ember-metal'], ['beginPropertyChanges', 'ember-metal'], ['endPropertyChanges', 'ember-metal'], ['changeProperties', 'ember-metal'], ['defineProperty', 'ember-metal'], ['watchKey', 'ember-metal'], ['unwatchKey', 'ember-metal'], ['removeChainWatcher', 'ember-metal'], ['_ChainNode', 'ember-metal', 'ChainNode'], ['finishChains', 'ember-metal'], ['watchPath', 'ember-metal'], ['unwatchPath', 'ember-metal'], ['watch', 'ember-metal'], ['isWatching', 'ember-metal'], ['unwatch', 'ember-metal'], ['destroy', 'ember-metal'], ['libraries', 'ember-metal'], ['OrderedSet', 'ember-metal'], ['Map', 'ember-metal'], ['MapWithDefault', 'ember-metal'], ['getProperties', 'ember-metal'], ['setProperties', 'ember-metal'], ['expandProperties', 'ember-metal'], ['NAME_KEY', 'ember-utils'], ['addObserver', 'ember-metal'], ['observersFor', 'ember-metal'], ['removeObserver', 'ember-metal'], ['_suspendObserver', 'ember-metal'], ['_suspendObservers', 'ember-metal'], ['required', 'ember-metal'], ['aliasMethod', 'ember-metal'], ['observer', 'ember-metal'], ['immediateObserver', 'ember-metal', '_immediateObserver'], ['mixin', 'ember-metal'], ['Mixin', 'ember-metal'], ['bind', 'ember-metal'], ['Binding', 'ember-metal'], ['isGlobalPath', 'ember-metal'],
+  ['FEATURES', 'ember/features'], ['FEATURES.isEnabled', 'ember-debug', 'isFeatureEnabled'], ['Error', 'ember-debug'], ['META_DESC', 'ember-metal'], ['meta', 'ember-metal'], ['get', 'ember-metal'], ['set', 'ember-metal'], ['_getPath', 'ember-metal'], ['getWithDefault', 'ember-metal'], ['trySet', 'ember-metal'], ['_Cache', 'ember-metal', 'Cache'], ['on', 'ember-metal'], ['addListener', 'ember-metal'], ['removeListener', 'ember-metal'], ['_suspendListener', 'ember-metal', 'suspendListener'], ['_suspendListeners', 'ember-metal', 'suspendListeners'], ['sendEvent', 'ember-metal'], ['hasListeners', 'ember-metal'], ['watchedEvents', 'ember-metal'], ['listenersFor', 'ember-metal'], ['isNone', 'ember-metal'], ['isEmpty', 'ember-metal'], ['isBlank', 'ember-metal'], ['isPresent', 'ember-metal'], ['_Backburner', 'backburner', 'default'], ['run', 'ember-metal'], ['_ObserverSet', 'ember-metal', 'ObserverSet'], ['propertyWillChange', 'ember-metal'], ['propertyDidChange', 'ember-metal'], ['overrideChains', 'ember-metal'], ['beginPropertyChanges', 'ember-metal'], ['beginPropertyChanges', 'ember-metal'], ['endPropertyChanges', 'ember-metal'], ['changeProperties', 'ember-metal'], ['defineProperty', 'ember-metal'], ['watchKey', 'ember-metal'], ['unwatchKey', 'ember-metal'], ['removeChainWatcher', 'ember-metal'], ['_ChainNode', 'ember-metal', 'ChainNode'], ['finishChains', 'ember-metal'], ['watchPath', 'ember-metal'], ['unwatchPath', 'ember-metal'], ['watch', 'ember-metal'], ['isWatching', 'ember-metal'], ['unwatch', 'ember-metal'], ['destroy', 'ember-metal'], ['libraries', 'ember-metal'], ['OrderedSet', 'ember-metal'], ['Map', 'ember-metal'], ['MapWithDefault', 'ember-metal'], ['getProperties', 'ember-metal'], ['setProperties', 'ember-metal'], ['expandProperties', 'ember-metal'], ['NAME_KEY', 'ember-utils'], ['addObserver', 'ember-metal'], ['observersFor', 'ember-metal'], ['removeObserver', 'ember-metal'], ['_suspendObserver', 'ember-metal'], ['_suspendObservers', 'ember-metal'], ['required', 'ember-metal'], ['aliasMethod', 'ember-metal'], ['observer', 'ember-metal'], ['immediateObserver', 'ember-metal', '_immediateObserver'], ['mixin', 'ember-metal'], ['Mixin', 'ember-metal'], ['bind', 'ember-metal'], ['Binding', 'ember-metal'], ['isGlobalPath', 'ember-metal'],
 
   // ember-views
   ['$', 'ember-views', 'jQuery'], ['ViewUtils.isSimpleClick', 'ember-views', 'isSimpleClick'], ['ViewUtils.getViewElement', 'ember-views', 'getViewElement'], ['ViewUtils.getViewBounds', 'ember-views', 'getViewBounds'], ['ViewUtils.getViewClientRects', 'ember-views', 'getViewClientRects'], ['ViewUtils.getViewBoundingClientRect', 'ember-views', 'getViewBoundingClientRect'], ['ViewUtils.getRootViews', 'ember-views', 'getRootViews'], ['ViewUtils.getChildViews', 'ember-views', 'getChildViews'], ['TextSupport', 'ember-views'], ['ComponentLookup', 'ember-views'], ['EventDispatcher', 'ember-views'],
@@ -73011,7 +72841,9 @@ enifed('ember/tests/routing/basic_test', ['ember-utils', 'ember-console', 'ember
       }
     });
 
-    bootApplication();
+    throws(function () {
+      return bootApplication();
+    }, /More context objects were passed/);
 
     equal((0, _emberViews.jQuery)('#error').length, 1, 'Error template was rendered.');
   });
@@ -78181,7 +78013,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
   });
 
   QUnit.test('Default error event moves into nested route', function () {
-    expect(5);
+    expect(6);
 
     templates['grandma'] = 'GRANDMA {{outlet}}';
     templates['grandma/error'] = 'ERROR: {{model.msg}}';
@@ -78213,7 +78045,11 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    bootApplication('/grandma/mom/sally');
+    throws(function () {
+      bootApplication('/grandma/mom/sally');
+    }, function (err) {
+      return err.msg === 'did it broke?';
+    });
 
     step(3, 'App finished booting');
 
@@ -78597,7 +78433,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
   });
 
   QUnit.test('Default error event moves into nested route, prioritizing more specifically named error route', function () {
-    expect(5);
+    expect(6);
 
     templates['grandma'] = 'GRANDMA {{outlet}}';
     templates['grandma/error'] = 'ERROR: {{model.msg}}';
@@ -78630,7 +78466,11 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    bootApplication('/grandma/mom/sally');
+    throws(function () {
+      bootApplication('/grandma/mom/sally');
+    }, function (err) {
+      return err.msg === 'did it broke?';
+    });
 
     step(3, 'App finished booting');
 
@@ -78731,7 +78571,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
   });
 
   QUnit.test('Prioritized error substate entry works with preserved-namespace nested routes', function () {
-    expect(1);
+    expect(2);
 
     templates['foo/bar_error'] = 'FOOBAR ERROR: {{model.msg}}';
     templates['foo/bar'] = 'YAY';
@@ -78752,7 +78592,11 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    bootApplication('/foo/bar');
+    throws(function () {
+      bootApplication('/foo/bar');
+    }, function (err) {
+      return err.msg === 'did it broke?';
+    });
 
     equal((0, _emberViews.jQuery)('#app', '#qunit-fixture').text(), 'FOOBAR ERROR: did it broke?', 'foo.bar_error was entered (as opposed to something like foo/foo/bar_error)');
   });
@@ -78794,7 +78638,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
   });
 
   QUnit.test('Prioritized error substate entry works with auto-generated index routes', function () {
-    expect(1);
+    expect(2);
 
     templates['foo/index_error'] = 'FOO ERROR: {{model.msg}}';
     templates['foo/index'] = 'YAY';
@@ -78821,13 +78665,17 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    bootApplication('/foo');
+    throws(function () {
+      return bootApplication('/foo');
+    }, function (err) {
+      return err.msg === 'did it broke?';
+    });
 
     equal((0, _emberViews.jQuery)('#app', '#qunit-fixture').text(), 'FOO ERROR: did it broke?', 'foo.index_error was entered');
   });
 
   QUnit.test('Rejected promises returned from ApplicationRoute transition into top-level application_error', function () {
-    expect(2);
+    expect(3);
 
     templates['application_error'] = '<p id="toplevel-error">TOPLEVEL ERROR: {{model.msg}}</p>';
 
@@ -78842,7 +78690,11 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
       }
     });
 
-    bootApplication();
+    throws(function () {
+      return bootApplication();
+    }, function (err) {
+      return err.msg === 'BAD NEWS BEARS';
+    });
 
     equal((0, _emberViews.jQuery)('#toplevel-error', '#qunit-fixture').text(), 'TOPLEVEL ERROR: BAD NEWS BEARS');
 
@@ -79755,12 +79607,10 @@ enifed('internal-test-helpers/test-cases/abstract-rendering', ['exports', 'ember
 
       var _this = (0, _emberBabel.possibleConstructorReturn)(this, _AbstractTestCase.call(this));
 
-      var bootOptions = _this.getBootOptions();
-
       var owner = _this.owner = (0, _buildOwner.default)({
         ownerOptions: _this.getOwnerOptions(),
-        resolver: _this.getResolver(),
-        bootOptions: bootOptions
+        bootOptions: _this.getBootOptions(),
+        resolver: _this.getResolver()
       });
 
       _this.renderer = _this.owner.lookup('renderer:-dom');
@@ -79769,9 +79619,7 @@ enifed('internal-test-helpers/test-cases/abstract-rendering', ['exports', 'ember
 
       owner.register('event_dispatcher:main', _emberViews.EventDispatcher);
       owner.inject('event_dispatcher:main', '_viewRegistry', '-view-registry:main');
-      if (!bootOptions || bootOptions.isInteractive !== false) {
-        owner.lookup('event_dispatcher:main').setup(_this.getCustomDispatcherEvents(), _this.element);
-      }
+      owner.lookup('event_dispatcher:main').setup(_this.getCustomDispatcherEvents(), _this.element);
       return _this;
     }