ember-source 2.15.3 → 2.16.0.beta.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -6,7 +6,7 @@
6
6
  * Portions Copyright 2008-2011 Apple Inc. All rights reserved.
7
7
  * @license Licensed under MIT license
8
8
  * See https://raw.github.com/emberjs/ember.js/master/LICENSE
9
- * @version 2.15.3
9
+ * @version 2.16.0-beta.1
10
10
  */
11
11
 
12
12
  var enifed, requireModule, Ember;
@@ -1536,7 +1536,6 @@ enifed('ember-application/tests/system/application_instance_test', ['ember-babel
1536
1536
  appInstance = (0, _emberMetal.run)(function () {
1537
1537
  return _applicationInstance.default.create({ application: application });
1538
1538
  });
1539
- appInstance.setupRegistry();
1540
1539
 
1541
1540
  application.customEvents = {
1542
1541
  awesome: 'sauce'
@@ -1556,7 +1555,6 @@ enifed('ember-application/tests/system/application_instance_test', ['ember-babel
1556
1555
  (0, _emberMetal.run)(function () {
1557
1556
  return appInstance = _applicationInstance.default.create({ application: application });
1558
1557
  });
1559
- appInstance.setupRegistry();
1560
1558
 
1561
1559
  application.customEvents = {
1562
1560
  awesome: 'sauce'
@@ -1576,7 +1574,6 @@ enifed('ember-application/tests/system/application_instance_test', ['ember-babel
1576
1574
  appInstance = (0, _emberMetal.run)(function () {
1577
1575
  return _applicationInstance.default.create({ application: application });
1578
1576
  });
1579
- appInstance.setupRegistry();
1580
1577
 
1581
1578
  appInstance.customEvents = {
1582
1579
  awesome: 'sauce'
@@ -5385,22 +5382,15 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
5385
5382
  });
5386
5383
  };
5387
5384
 
5388
- _class.prototype['@test visit() does not setup the event_dispatcher:main if isInteractive is false (with Engines) GH#15615'] = function (assert) {
5385
+ _class.prototype['@test visit() on engine resolves engine component'] = function (assert) {
5389
5386
  var _this8 = this;
5390
5387
 
5391
- assert.expect(3);
5388
+ assert.expect(2);
5392
5389
 
5393
5390
  this.router.map(function () {
5394
5391
  this.mount('blog');
5395
5392
  });
5396
5393
 
5397
- this.addTemplate('application', '<h1>Hello world</h1>{{outlet}}');
5398
- this.add('event_dispatcher:main', {
5399
- create: function () {
5400
- throw new Error('should not happen!');
5401
- }
5402
- });
5403
-
5404
5394
  // Register engine
5405
5395
  var BlogEngine = _engine.default.extend({
5406
5396
  init: function () {
@@ -5422,15 +5412,14 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
5422
5412
 
5423
5413
  this.add('route-map:blog', function () {});
5424
5414
 
5425
- assert.strictEqual(this.$('#qunit-fixture').children().length, 0, 'there are no elements in the fixture element');
5415
+ assert.strictEqual(this.$().children().length, 0, 'there are no elements in the fixture element');
5426
5416
 
5427
- return this.visit('/blog', { isInteractive: false }).then(function (instance) {
5428
- assert.ok(instance instanceof _applicationInstance.default, 'promise is resolved with an ApplicationInstance');
5417
+ return this.visit('/blog', { shouldRender: true }).then(function () {
5429
5418
  assert.strictEqual(_this8.$().find('p').text(), 'Dis cache money', 'Engine component is resolved');
5430
5419
  });
5431
5420
  };
5432
5421
 
5433
- _class.prototype['@test visit() on engine resolves engine component'] = function (assert) {
5422
+ _class.prototype['@test visit() on engine resolves engine helper'] = function (assert) {
5434
5423
  var _this9 = this;
5435
5424
 
5436
5425
  assert.expect(2);
@@ -5448,43 +5437,6 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
5448
5437
  args[_key2] = arguments[_key2];
5449
5438
  }
5450
5439
 
5451
- this._super.apply(this, args);
5452
- this.register('template:application', (0, _emberTemplateCompiler.compile)('{{cache-money}}'));
5453
- this.register('template:components/cache-money', (0, _emberTemplateCompiler.compile)('\n <p>Dis cache money</p>\n '));
5454
- this.register('component:cache-money', _emberGlimmer.Component.extend({}));
5455
- }
5456
- });
5457
- this.add('engine:blog', BlogEngine);
5458
-
5459
- // Register engine route map
5460
-
5461
- this.add('route-map:blog', function () {});
5462
-
5463
- assert.strictEqual(this.$().children().length, 0, 'there are no elements in the fixture element');
5464
-
5465
- return this.visit('/blog', { shouldRender: true }).then(function () {
5466
- assert.strictEqual(_this9.$().find('p').text(), 'Dis cache money', 'Engine component is resolved');
5467
- });
5468
- };
5469
-
5470
- _class.prototype['@test visit() on engine resolves engine helper'] = function (assert) {
5471
- var _this10 = this;
5472
-
5473
- assert.expect(2);
5474
-
5475
- this.router.map(function () {
5476
- this.mount('blog');
5477
- });
5478
-
5479
- // Register engine
5480
- var BlogEngine = _engine.default.extend({
5481
- init: function () {
5482
- var _len3, args, _key3;
5483
-
5484
- for (_len3 = arguments.length, args = Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
5485
- args[_key3] = arguments[_key3];
5486
- }
5487
-
5488
5440
  this._super.apply(this, args);
5489
5441
  this.register('template:application', (0, _emberTemplateCompiler.compile)('{{swag}}'));
5490
5442
  this.register('helper:swag', (0, _emberGlimmer.helper)(function () {
@@ -5501,12 +5453,12 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
5501
5453
  assert.strictEqual(this.$().children().length, 0, 'there are no elements in the fixture element');
5502
5454
 
5503
5455
  return this.visit('/blog', { shouldRender: true }).then(function () {
5504
- assert.strictEqual(_this10.$().text(), 'turnt up', 'Engine component is resolved');
5456
+ assert.strictEqual(_this9.$().text(), 'turnt up', 'Engine component is resolved');
5505
5457
  });
5506
5458
  };
5507
5459
 
5508
5460
  _class.prototype['@test Ember Islands-style setup'] = function (assert) {
5509
- var _this11 = this;
5461
+ var _this10 = this;
5510
5462
 
5511
5463
  var xFooInitCalled = false;
5512
5464
  var xFooDidInsertElementCalled = false;
@@ -5593,9 +5545,9 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
5593
5545
  var instances = [];
5594
5546
 
5595
5547
  return _emberRuntime.RSVP.all([this.runTask(function () {
5596
- return _this11.application.visit('/x-foo?data=' + data, { rootElement: $foo[0] });
5548
+ return _this10.application.visit('/x-foo?data=' + data, { rootElement: $foo[0] });
5597
5549
  }), this.runTask(function () {
5598
- return _this11.application.visit('/x-bar', { rootElement: $bar[0] });
5550
+ return _this10.application.visit('/x-bar', { rootElement: $bar[0] });
5599
5551
  })]).then(function (_instances) {
5600
5552
  instances = _instances;
5601
5553
 
@@ -5613,14 +5565,14 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
5613
5565
  assert.equal($bar.find('button').text(), 'Join 0 others in clicking me!');
5614
5566
  assert.ok($bar.text().indexOf('X-Foo') === -1);
5615
5567
 
5616
- _this11.runTask(function () {
5568
+ _this10.runTask(function () {
5617
5569
  $foo.find('x-foo').click();
5618
5570
  });
5619
5571
 
5620
5572
  assert.equal($foo.find('p').text(), 'Hello Godfrey, I have been clicked 1 times (1 times combined)!');
5621
5573
  assert.equal($bar.find('button').text(), 'Join 1 others in clicking me!');
5622
5574
 
5623
- _this11.runTask(function () {
5575
+ _this10.runTask(function () {
5624
5576
  $bar.find('button').click();
5625
5577
  $bar.find('button').click();
5626
5578
  });
@@ -5628,7 +5580,7 @@ enifed('ember-application/tests/system/visit_test', ['ember-babel', 'internal-te
5628
5580
  assert.equal($foo.find('p').text(), 'Hello Godfrey, I have been clicked 1 times (3 times combined)!');
5629
5581
  assert.equal($bar.find('button').text(), 'Join 3 others in clicking me!');
5630
5582
  }).finally(function () {
5631
- _this11.runTask(function () {
5583
+ _this10.runTask(function () {
5632
5584
  instances.forEach(function (instance) {
5633
5585
  instance.destroy();
5634
5586
  });
@@ -7241,33 +7193,8 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
7241
7193
  });
7242
7194
  };
7243
7195
 
7244
- _class.prototype['@test Model Types Updated but Unchanged Do not Trigger Callbacks'] = function () {
7245
- var _this6 = this;
7246
-
7247
- expect(0);
7248
- var records = (0, _emberRuntime.A)([1, 2, 3]);
7249
- this.add('data-adapter:main', DataAdapter.extend({
7250
- getRecords: function () {
7251
- return records;
7252
- }
7253
- }));
7254
- this.add('model:post', PostClass);
7255
-
7256
- return this.visit('/').then(function () {
7257
- adapter = _this6.applicationInstance.lookup('data-adapter:main');
7258
-
7259
- adapter.watchModelTypes(function () {
7260
- (0, _emberMetal.run)(function () {
7261
- records.arrayContentDidChange(0, 0, 0);
7262
- });
7263
- }, function () {
7264
- ok(false, "modelTypesUpdated should not be triggered if the array didn't change");
7265
- });
7266
- });
7267
- };
7268
-
7269
7196
  _class.prototype['@test Records Added'] = function () {
7270
- var _this7 = this;
7197
+ var _this6 = this;
7271
7198
 
7272
7199
  var countAdded = 1;
7273
7200
  var post = PostClass.create();
@@ -7290,7 +7217,7 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
7290
7217
  this.add('model:post', PostClass);
7291
7218
 
7292
7219
  return this.visit('/').then(function () {
7293
- adapter = _this7.applicationInstance.lookup('data-adapter:main');
7220
+ adapter = _this6.applicationInstance.lookup('data-adapter:main');
7294
7221
 
7295
7222
  adapter.watchRecords('post', function (records) {
7296
7223
  var record = records[0];
@@ -7306,7 +7233,7 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
7306
7233
  };
7307
7234
 
7308
7235
  _class.prototype['@test Observes and releases a record correctly'] = function () {
7309
- var _this8 = this;
7236
+ var _this7 = this;
7310
7237
 
7311
7238
  var updatesCalled = 0;
7312
7239
  var post = PostClass.create({ title: 'Post' });
@@ -7333,7 +7260,7 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
7333
7260
  this.add('model:post', PostClass);
7334
7261
 
7335
7262
  return this.visit('/').then(function () {
7336
- adapter = _this8.applicationInstance.lookup('data-adapter:main');
7263
+ adapter = _this7.applicationInstance.lookup('data-adapter:main');
7337
7264
 
7338
7265
  var release = adapter.watchRecords('post', function () {
7339
7266
  (0, _emberMetal.set)(post, 'title', 'Post Modified');
@@ -7348,12 +7275,12 @@ enifed('ember-extension-support/tests/data_adapter_test', ['ember-babel', 'ember
7348
7275
  };
7349
7276
 
7350
7277
  _class.prototype['@test _nameToClass does not error when not found'] = function () {
7351
- var _this9 = this;
7278
+ var _this8 = this;
7352
7279
 
7353
7280
  this.add('data-adapter:main', DataAdapter);
7354
7281
 
7355
7282
  return this.visit('/').then(function () {
7356
- adapter = _this9.applicationInstance.lookup('data-adapter:main');
7283
+ adapter = _this8.applicationInstance.lookup('data-adapter:main');
7357
7284
 
7358
7285
  var klass = adapter._nameToClass('foo');
7359
7286
 
@@ -7840,7 +7767,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
7840
7767
  return this.visit('/').then(function () {
7841
7768
  _this12.assertText('Application');
7842
7769
  return _this12.transitionTo('blog.post');
7843
- }).then(function () {
7770
+ }).catch(function () {
7844
7771
  _this12.assertText('ApplicationError! Oh, noes!');
7845
7772
  });
7846
7773
  };
@@ -7863,7 +7790,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
7863
7790
  return this.visit('/').then(function () {
7864
7791
  _this13.assertText('Application');
7865
7792
  return _this13.transitionTo('blog.post');
7866
- }).then(function () {
7793
+ }).catch(function () {
7867
7794
  _this13.assertText('ApplicationEngineError! Oh, noes!');
7868
7795
  });
7869
7796
  };
@@ -7886,7 +7813,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
7886
7813
  return this.visit('/').then(function () {
7887
7814
  _this14.assertText('Application');
7888
7815
  return _this14.transitionTo('blog.post');
7889
- }).then(function () {
7816
+ }).catch(function () {
7890
7817
  _this14.assertText('ApplicationEngineError! Oh, noes!');
7891
7818
  });
7892
7819
  };
@@ -7909,7 +7836,7 @@ enifed('ember-glimmer/tests/integration/application/engine-test', ['ember-babel'
7909
7836
  return this.visit('/').then(function () {
7910
7837
  _this15.assertText('Application');
7911
7838
  return _this15.transitionTo('blog.post.comments');
7912
- }).then(function () {
7839
+ }).catch(function () {
7913
7840
  _this15.assertText('ApplicationEngineError! Oh, noes!');
7914
7841
  });
7915
7842
  };
@@ -21753,6 +21680,15 @@ enifed('ember-glimmer/tests/integration/event-dispatcher-test', ['ember-babel',
21753
21680
  this.render('{{x-foo}}');
21754
21681
  };
21755
21682
 
21683
+ _class2.prototype['@test canDispatchToEventManager is deprecated in EventDispatcher'] = function () {
21684
+ var MyDispatcher = _emberViews.EventDispatcher.extend({
21685
+ canDispatchToEventManager: null
21686
+ });
21687
+
21688
+ expectDeprecation(/`canDispatchToEventManager` has been deprecated/);
21689
+ MyDispatcher.create();
21690
+ };
21691
+
21756
21692
  _class2.prototype['@test a rootElement can be specified'] = function (assert) {
21757
21693
  this.$().append('<div id="app"></div>');
21758
21694
  this.dispatcher.setup({ myevent: 'myEvent' }, '#app');
@@ -21797,42 +21733,15 @@ enifed('ember-glimmer/tests/integration/event-dispatcher-test', ['ember-babel',
21797
21733
  return _class2;
21798
21734
  }(_testCase.RenderingTest));
21799
21735
 
21800
- (0, _testCase.moduleFor)('custom EventDispatcher subclass with #setup', function (_RenderingTest3) {
21801
- (0, _emberBabel.inherits)(_class3, _RenderingTest3);
21802
-
21803
- function _class3() {
21804
-
21805
- var _this9 = (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest3.call(this));
21806
-
21807
- var dispatcher = _this9.owner.lookup('event_dispatcher:main');
21808
- (0, _emberMetal.run)(dispatcher, 'destroy');
21809
- _this9.owner.__container__.reset('event_dispatcher:main');
21810
- _this9.owner.unregister('event_dispatcher:main');
21811
- return _this9;
21812
- }
21813
-
21814
- _class3.prototype['@test canDispatchToEventManager is deprecated in EventDispatcher'] = function () {
21815
- var MyDispatcher = _emberViews.EventDispatcher.extend({
21816
- canDispatchToEventManager: null
21817
- });
21818
- this.owner.register('event_dispatcher:main', MyDispatcher);
21819
-
21820
- expectDeprecation(/`canDispatchToEventManager` has been deprecated/);
21821
- this.owner.lookup('event_dispatcher:main');
21822
- };
21823
-
21824
- return _class3;
21825
- }(_testCase.RenderingTest));
21826
-
21827
21736
  if (canDataTransfer) {
21828
- (0, _testCase.moduleFor)('EventDispatcher - Event Properties', function (_RenderingTest5) {
21829
- (0, _emberBabel.inherits)(_class5, _RenderingTest5);
21737
+ (0, _testCase.moduleFor)('EventDispatcher - Event Properties', function (_RenderingTest4) {
21738
+ (0, _emberBabel.inherits)(_class4, _RenderingTest4);
21830
21739
 
21831
- function _class5() {
21832
- return (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest5.apply(this, arguments));
21740
+ function _class4() {
21741
+ return (0, _emberBabel.possibleConstructorReturn)(this, _RenderingTest4.apply(this, arguments));
21833
21742
  }
21834
21743
 
21835
- _class5.prototype['@test dataTransfer property is added to drop event'] = function (assert) {
21744
+ _class4.prototype['@test dataTransfer property is added to drop event'] = function (assert) {
21836
21745
  var receivedEvent = void 0;
21837
21746
  this.registerComponent('x-foo', {
21838
21747
  ComponentClass: _helpers.Component.extend({
@@ -21848,7 +21757,7 @@ enifed('ember-glimmer/tests/integration/event-dispatcher-test', ['ember-babel',
21848
21757
  assert.equal(receivedEvent.dataTransfer, 'success');
21849
21758
  };
21850
21759
 
21851
- return _class5;
21760
+ return _class4;
21852
21761
  }(_testCase.RenderingTest));
21853
21762
  }
21854
21763
  });
@@ -42460,7 +42369,7 @@ enifed('ember-metal/tests/run_loop/debounce_test', ['ember-metal'], function (_e
42460
42369
  ok(wasCalled, 'Ember.run.debounce used');
42461
42370
  });
42462
42371
  });
42463
- enifed('ember-metal/tests/run_loop/later_test', ['ember-utils', 'ember-metal'], function (_emberUtils, _emberMetal) {
42372
+ enifed('ember-metal/tests/run_loop/later_test', ['ember-metal'], function (_emberMetal) {
42464
42373
  'use strict';
42465
42374
 
42466
42375
  var originalSetTimeout = window.setTimeout;
@@ -42667,7 +42576,7 @@ enifed('ember-metal/tests/run_loop/later_test', ['ember-utils', 'ember-metal'],
42667
42576
  // happens when an expired timer callback takes a while to run,
42668
42577
  // which is what we simulate here.
42669
42578
  var newSetTimeoutUsed = void 0;
42670
- _emberMetal.run.backburner._platform = (0, _emberUtils.assign)({}, originalPlatform, {
42579
+ _emberMetal.run.backburner._platform = {
42671
42580
  setTimeout: function () {
42672
42581
  var wait = arguments[arguments.length - 1];
42673
42582
  newSetTimeoutUsed = true;
@@ -42675,7 +42584,7 @@ enifed('ember-metal/tests/run_loop/later_test', ['ember-utils', 'ember-metal'],
42675
42584
 
42676
42585
  return originalPlatform.setTimeout.apply(originalPlatform, arguments);
42677
42586
  }
42678
- });
42587
+ };
42679
42588
 
42680
42589
  var count = 0;
42681
42590
  (0, _emberMetal.run)(function () {
@@ -43580,8 +43489,8 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
43580
43489
  QUnit.module('Ember.WeakMap');
43581
43490
 
43582
43491
  QUnit.test('has weakMap like qualities', function (assert) {
43583
- var map = new _emberMetal.WeakMap();
43584
- var map2 = new _emberMetal.WeakMap();
43492
+ var map = new _emberMetal.WeakMapPolyfill();
43493
+ var map2 = new _emberMetal.WeakMapPolyfill();
43585
43494
 
43586
43495
  var a = {};
43587
43496
  var b = {};
@@ -43624,20 +43533,11 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
43624
43533
  assert.strictEqual(map.get(b), undefined);
43625
43534
  });
43626
43535
 
43627
- QUnit.test('WeakMap constructor requres new', function (assert) {
43628
- var expectedError = new TypeError('Constructor WeakMap requires \'new\'');
43629
-
43630
- assert.throws(function () {
43631
- // jshint newcap: false
43632
- (0, _emberMetal.WeakMap)();
43633
- }, expectedError);
43634
- });
43635
-
43636
43536
  QUnit.test('constructing a WeakMap with an invalid iterator throws an error', function (assert) {
43637
43537
  var expectedError = new TypeError('The weak map constructor polyfill only supports an array argument');
43638
43538
 
43639
43539
  assert.throws(function () {
43640
- new _emberMetal.WeakMap({ a: 1 });
43540
+ new _emberMetal.WeakMapPolyfill({ a: 1 });
43641
43541
  }, expectedError);
43642
43542
  });
43643
43543
 
@@ -43646,7 +43546,7 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
43646
43546
  var b = {};
43647
43547
  var c = {};
43648
43548
 
43649
- var map = new _emberMetal.WeakMap([[a, 1], [b, 2], [c, 3]]);
43549
+ var map = new _emberMetal.WeakMapPolyfill([[a, 1], [b, 2], [c, 3]]);
43650
43550
 
43651
43551
  assert.strictEqual(map.get(a), 1);
43652
43552
  assert.strictEqual(map.get(b), 2);
@@ -43655,7 +43555,7 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
43655
43555
 
43656
43556
  QUnit.test('that error is thrown when using a primitive key', function (assert) {
43657
43557
  var expectedError = new TypeError('Invalid value used as weak map key');
43658
- var map = new _emberMetal.WeakMap();
43558
+ var map = new _emberMetal.WeakMapPolyfill();
43659
43559
 
43660
43560
  assert.throws(function () {
43661
43561
  return map.set('a', 1);
@@ -43675,7 +43575,7 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
43675
43575
  });
43676
43576
 
43677
43577
  QUnit.test('that .has and .delete work as expected', function (assert) {
43678
- var map = new _emberMetal.WeakMap();
43578
+ var map = new _emberMetal.WeakMapPolyfill();
43679
43579
  var a = {};
43680
43580
 
43681
43581
  var foo = { id: 1, name: 'My file', progress: 0 };
@@ -43695,7 +43595,7 @@ enifed('ember-metal/tests/weak_map_test', ['ember-metal'], function (_emberMetal
43695
43595
  });
43696
43596
 
43697
43597
  QUnit.test('that .toString works as expected', function (assert) {
43698
- var map = new _emberMetal.WeakMap();
43598
+ var map = new _emberMetal.WeakMapPolyfill();
43699
43599
 
43700
43600
  assert.strictEqual(map.toString(), '[object WeakMap]');
43701
43601
  });
@@ -48031,16 +47931,18 @@ enifed('ember-runtime/tests/controllers/controller_test', ['ember-runtime/contro
48031
47931
 
48032
47932
  QUnit.module('Controller Content -> Model Alias');
48033
47933
 
48034
- QUnit.test('`model` is aliased as `content`', function () {
48035
- expect(1);
47934
+ QUnit.test('`content` is a deprecated alias of `model`', function () {
47935
+ expect(2);
48036
47936
  var controller = _controller.default.extend({
48037
47937
  model: 'foo-bar'
48038
47938
  }).create();
48039
47939
 
48040
- equal(controller.get('content'), 'foo-bar', 'content is an alias of model');
47940
+ expectDeprecation(function () {
47941
+ equal(controller.get('content'), 'foo-bar', 'content is an alias of model');
47942
+ });
48041
47943
  });
48042
47944
 
48043
- QUnit.test('`content` is moved to `model` when `model` is unset', function () {
47945
+ QUnit.test('`content` is not moved to `model` when `model` is unset', function () {
48044
47946
  expect(2);
48045
47947
  var controller = void 0;
48046
47948
 
@@ -48050,18 +47952,19 @@ enifed('ember-runtime/tests/controllers/controller_test', ['ember-runtime/contro
48050
47952
  }).create();
48051
47953
  });
48052
47954
 
48053
- equal(controller.get('model'), 'foo-bar', 'model is set properly');
48054
- equal(controller.get('content'), 'foo-bar', 'content is set properly');
47955
+ notEqual(controller.get('model'), 'foo-bar', 'model is set properly');
47956
+ equal(controller.get('content'), 'foo-bar', 'content is not set properly');
48055
47957
  });
48056
47958
 
48057
- QUnit.test('specifying `content` (without `model` specified) results in deprecation', function () {
48058
- expect(1);
47959
+ QUnit.test('specifying `content` (without `model` specified) does not result in deprecation', function () {
47960
+ expect(2);
47961
+ expectNoDeprecation();
48059
47962
 
48060
- expectDeprecation(function () {
48061
- _controller.default.extend({
48062
- content: 'foo-bar'
48063
- }).create();
48064
- }, 'Do not specify `content` on a Controller, use `model` instead.');
47963
+ var controller = _controller.default.extend({
47964
+ content: 'foo-bar'
47965
+ }).create();
47966
+
47967
+ equal((0, _emberMetal.get)(controller, 'content'), 'foo-bar');
48065
47968
  });
48066
47969
 
48067
47970
  QUnit.test('specifying `content` (with `model` specified) does not result in deprecation', function () {
@@ -57096,9 +56999,9 @@ enifed('ember-runtime/tests/system/object/create_test', ['ember-metal', 'ember-r
57096
56999
 
57097
57000
  QUnit.test('throws if you try to pass anything a string as a parameter', function () {
57098
57001
 
57099
- expectAssertion(function () {
57002
+ throws(function () {
57100
57003
  return _object.default.create('some-string');
57101
- }, 'Ember.Object.create only accepts objects.');
57004
+ }, 'EmberObject.create only accepts an objects.');
57102
57005
  });
57103
57006
 
57104
57007
  QUnit.test('EmberObject.create can take undefined as a parameter', function () {
@@ -58601,6 +58504,13 @@ enifed('ember-runtime/tests/system/string/capitalize_test', ['ember-environment'
58601
58504
  deepEqual('private-docs/owner-invoice'.capitalize(), 'Private-docs/Owner-invoice');
58602
58505
  }
58603
58506
  });
58507
+
58508
+ QUnit.test('capitalize string with accent character', function () {
58509
+ deepEqual((0, _string.capitalize)('šabc'), 'Šabc');
58510
+ if (_emberEnvironment.ENV.EXTEND_PROTOTYPES.String) {
58511
+ deepEqual('šabc'.capitalize(), 'Šabc');
58512
+ }
58513
+ });
58604
58514
  });
58605
58515
  enifed('ember-runtime/tests/system/string/classify_test', ['ember-environment', 'ember-runtime/system/string'], function (_emberEnvironment, _string) {
58606
58516
  'use strict';
@@ -61211,7 +61121,7 @@ enifed('ember-testing/tests/adapters_test', ['ember-metal', 'ember-testing/test'
61211
61121
  deepEqual(caught, thrown);
61212
61122
  });
61213
61123
  });
61214
- enifed('ember-testing/tests/ext/rsvp_test', ['ember-testing/ext/rsvp', 'ember-testing/test/adapter', 'ember-metal', 'ember-debug'], function (_rsvp, _adapter, _emberMetal, _emberDebug) {
61124
+ 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) {
61215
61125
  'use strict';
61216
61126
 
61217
61127
  var originalTestAdapter = (0, _adapter.getAdapter)();
@@ -61295,6 +61205,34 @@ enifed('ember-testing/tests/ext/rsvp_test', ['ember-testing/ext/rsvp', 'ember-te
61295
61205
  equal(asyncEnded, 2);
61296
61206
  });
61297
61207
  });
61208
+
61209
+ QUnit.module('TestPromise');
61210
+
61211
+ QUnit.test('does not throw error when falsy value passed to then', function () {
61212
+ expect(1);
61213
+ return new _promise.default(function (resolve) {
61214
+ resolve();
61215
+ }).then(null).then(function () {
61216
+ ok(true);
61217
+ });
61218
+ });
61219
+
61220
+ QUnit.test('able to get last Promise', function () {
61221
+ expect(2);
61222
+
61223
+ var p1 = new _promise.default(function (resolve) {
61224
+ resolve();
61225
+ }).then(function () {
61226
+ ok(true);
61227
+ });
61228
+
61229
+ var p2 = new _promise.default(function (resolve) {
61230
+ resolve();
61231
+ });
61232
+
61233
+ deepEqual((0, _promise.getLastPromise)(), p2);
61234
+ return p1;
61235
+ });
61298
61236
  });
61299
61237
  enifed('ember-testing/tests/helper_registration_test', ['ember-metal', 'ember-testing/test', 'ember-application'], function (_emberMetal, _test, _emberApplication) {
61300
61238
  'use strict';
@@ -63753,65 +63691,6 @@ enifed('ember/tests/controller_test', ['ember-babel', 'ember-runtime', 'internal
63753
63691
  return _class;
63754
63692
  }(_internalTestHelpers.ApplicationTestCase));
63755
63693
  });
63756
- enifed('ember/tests/error_handler_test', ['ember', 'ember-metal'], function (_ember, _emberMetal) {
63757
- 'use strict';
63758
-
63759
- var ONERROR = _ember.default.onerror;
63760
- var ADAPTER = _ember.default.Test && _ember.default.Test.adapter;
63761
- var TESTING = _ember.default.testing;
63762
-
63763
- QUnit.module('error_handler', {
63764
- teardown: function () {
63765
- _ember.default.onerror = ONERROR;
63766
- _ember.default.testing = TESTING;
63767
- if (_ember.default.Test) {
63768
- _ember.default.Test.adapter = ADAPTER;
63769
- }
63770
- }
63771
- });
63772
-
63773
- function runThatThrows(message) {
63774
- return (0, _emberMetal.run)(function () {
63775
- throw new Error(message);
63776
- });
63777
- }
63778
-
63779
- test('by default there is no onerror', function (assert) {
63780
- _ember.default.onerror = undefined;
63781
- assert.throws(runThatThrows, Error);
63782
- assert.equal(_ember.default.onerror, undefined);
63783
- });
63784
-
63785
- test('when Ember.onerror is registered', function (assert) {
63786
- assert.expect(2);
63787
- _ember.default.onerror = function (error) {
63788
- assert.ok(true, 'onerror called');
63789
- throw error;
63790
- };
63791
- assert.throws(runThatThrows, Error);
63792
- // Ember.onerror = ONERROR;
63793
- });
63794
-
63795
- QUnit.test('Ember.run does not swallow exceptions by default (Ember.testing = true)', function () {
63796
- _ember.default.testing = true;
63797
- var error = new Error('the error');
63798
- throws(function () {
63799
- _ember.default.run(function () {
63800
- throw error;
63801
- });
63802
- }, error);
63803
- });
63804
-
63805
- QUnit.test('Ember.run does not swallow exceptions by default (Ember.testing = false)', function () {
63806
- _ember.default.testing = false;
63807
- var error = new Error('the error');
63808
- throws(function () {
63809
- _ember.default.run(function () {
63810
- throw error;
63811
- });
63812
- }, error);
63813
- });
63814
- });
63815
63694
  enifed('ember/tests/global-api-test', ['ember-metal', 'ember-runtime'], function (_emberMetal, _emberRuntime) {
63816
63695
  'use strict';
63817
63696
 
@@ -65990,7 +65869,7 @@ enifed('ember/tests/helpers/link_to_test/link_to_with_query_params_test', ['embe
65990
65869
 
65991
65870
  assert.expect(1);
65992
65871
 
65993
- expectAssertion(function () {
65872
+ assert.throws(function () {
65994
65873
  _this19.runTask(function () {
65995
65874
  _this19.createApplication();
65996
65875
 
@@ -66000,7 +65879,7 @@ enifed('ember/tests/helpers/link_to_test/link_to_with_query_params_test', ['embe
66000
65879
 
66001
65880
  _this19.addTemplate('application', '{{#link-to id=\'the-link\'}}Index{{/link-to}}');
66002
65881
  });
66003
- }, /You must provide one or more parameters to the link-to component/);
65882
+ }, /(You must provide one or more parameters to the link-to component.|undefined is not an object)/);
66004
65883
  };
66005
65884
 
66006
65885
  return _class2;
@@ -66186,7 +66065,7 @@ enifed('ember/tests/reexports_test', ['ember/index', 'internal-test-helpers'], f
66186
66065
  ['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' }],
66187
66066
  // ['create'], TODO: figure out what to do here
66188
66067
  // ['keys'], TODO: figure out what to do here
66189
- ['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'],
66068
+ ['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'],
66190
66069
 
66191
66070
  // ember-views
66192
66071
  ['$', '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'],
@@ -69222,7 +69101,9 @@ enifed('ember/tests/routing/basic_test', ['ember-utils', 'ember-console', 'ember
69222
69101
  }
69223
69102
  });
69224
69103
 
69225
- bootApplication();
69104
+ throws(function () {
69105
+ return bootApplication();
69106
+ }, /More context objects were passed/);
69226
69107
 
69227
69108
  equal((0, _emberViews.jQuery)('#error').length, 1, 'Error template was rendered.');
69228
69109
  });
@@ -74278,7 +74159,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
74278
74159
  });
74279
74160
 
74280
74161
  QUnit.test('Default error event moves into nested route', function () {
74281
- expect(5);
74162
+ expect(6);
74282
74163
 
74283
74164
  templates['grandma'] = 'GRANDMA {{outlet}}';
74284
74165
  templates['grandma/error'] = 'ERROR: {{model.msg}}';
@@ -74310,7 +74191,11 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
74310
74191
  }
74311
74192
  });
74312
74193
 
74313
- bootApplication('/grandma/mom/sally');
74194
+ throws(function () {
74195
+ bootApplication('/grandma/mom/sally');
74196
+ }, function (err) {
74197
+ return err.msg === 'did it broke?';
74198
+ });
74314
74199
 
74315
74200
  step(3, 'App finished booting');
74316
74201
 
@@ -74692,7 +74577,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
74692
74577
  });
74693
74578
 
74694
74579
  QUnit.test('Default error event moves into nested route, prioritizing more specifically named error route', function () {
74695
- expect(5);
74580
+ expect(6);
74696
74581
 
74697
74582
  templates['grandma'] = 'GRANDMA {{outlet}}';
74698
74583
  templates['grandma/error'] = 'ERROR: {{model.msg}}';
@@ -74725,7 +74610,11 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
74725
74610
  }
74726
74611
  });
74727
74612
 
74728
- bootApplication('/grandma/mom/sally');
74613
+ throws(function () {
74614
+ bootApplication('/grandma/mom/sally');
74615
+ }, function (err) {
74616
+ return err.msg === 'did it broke?';
74617
+ });
74729
74618
 
74730
74619
  step(3, 'App finished booting');
74731
74620
 
@@ -74826,7 +74715,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
74826
74715
  });
74827
74716
 
74828
74717
  QUnit.test('Prioritized error substate entry works with preserved-namespace nested routes', function () {
74829
- expect(1);
74718
+ expect(2);
74830
74719
 
74831
74720
  templates['foo/bar_error'] = 'FOOBAR ERROR: {{model.msg}}';
74832
74721
  templates['foo/bar'] = 'YAY';
@@ -74847,7 +74736,11 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
74847
74736
  }
74848
74737
  });
74849
74738
 
74850
- bootApplication('/foo/bar');
74739
+ throws(function () {
74740
+ bootApplication('/foo/bar');
74741
+ }, function (err) {
74742
+ return err.msg === 'did it broke?';
74743
+ });
74851
74744
 
74852
74745
  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)');
74853
74746
  });
@@ -74889,7 +74782,7 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
74889
74782
  });
74890
74783
 
74891
74784
  QUnit.test('Prioritized error substate entry works with auto-generated index routes', function () {
74892
- expect(1);
74785
+ expect(2);
74893
74786
 
74894
74787
  templates['foo/index_error'] = 'FOO ERROR: {{model.msg}}';
74895
74788
  templates['foo/index'] = 'YAY';
@@ -74916,13 +74809,17 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
74916
74809
  }
74917
74810
  });
74918
74811
 
74919
- bootApplication('/foo');
74812
+ throws(function () {
74813
+ return bootApplication('/foo');
74814
+ }, function (err) {
74815
+ return err.msg === 'did it broke?';
74816
+ });
74920
74817
 
74921
74818
  equal((0, _emberViews.jQuery)('#app', '#qunit-fixture').text(), 'FOO ERROR: did it broke?', 'foo.index_error was entered');
74922
74819
  });
74923
74820
 
74924
74821
  QUnit.test('Rejected promises returned from ApplicationRoute transition into top-level application_error', function () {
74925
- expect(2);
74822
+ expect(3);
74926
74823
 
74927
74824
  templates['application_error'] = '<p id="toplevel-error">TOPLEVEL ERROR: {{model.msg}}</p>';
74928
74825
 
@@ -74937,7 +74834,11 @@ enifed('ember/tests/routing/substates_test', ['ember-runtime', 'ember-routing',
74937
74834
  }
74938
74835
  });
74939
74836
 
74940
- bootApplication();
74837
+ throws(function () {
74838
+ return bootApplication();
74839
+ }, function (err) {
74840
+ return err.msg === 'BAD NEWS BEARS';
74841
+ });
74941
74842
 
74942
74843
  equal((0, _emberViews.jQuery)('#toplevel-error', '#qunit-fixture').text(), 'TOPLEVEL ERROR: BAD NEWS BEARS');
74943
74844
 
@@ -75706,12 +75607,10 @@ enifed('internal-test-helpers/test-cases/abstract-rendering', ['exports', 'ember
75706
75607
 
75707
75608
  var _this = (0, _emberBabel.possibleConstructorReturn)(this, _AbstractTestCase.call(this));
75708
75609
 
75709
- var bootOptions = _this.getBootOptions();
75710
-
75711
75610
  var owner = _this.owner = (0, _buildOwner.default)({
75712
75611
  ownerOptions: _this.getOwnerOptions(),
75713
- resolver: _this.getResolver(),
75714
- bootOptions: bootOptions
75612
+ bootOptions: _this.getBootOptions(),
75613
+ resolver: _this.getResolver()
75715
75614
  });
75716
75615
 
75717
75616
  _this.renderer = _this.owner.lookup('renderer:-dom');
@@ -75720,9 +75619,7 @@ enifed('internal-test-helpers/test-cases/abstract-rendering', ['exports', 'ember
75720
75619
 
75721
75620
  owner.register('event_dispatcher:main', _emberViews.EventDispatcher);
75722
75621
  owner.inject('event_dispatcher:main', '_viewRegistry', '-view-registry:main');
75723
- if (!bootOptions || bootOptions.isInteractive !== false) {
75724
- owner.lookup('event_dispatcher:main').setup(_this.getCustomDispatcherEvents(), _this.element);
75725
- }
75622
+ owner.lookup('event_dispatcher:main').setup(_this.getCustomDispatcherEvents(), _this.element);
75726
75623
  return _this;
75727
75624
  }
75728
75625