ember-source 2.16.0 → 2.16.1

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.16.0
+ * @version   2.16.1
  */
 
 var enifed, requireModule, Ember;
@@ -12973,7 +12973,7 @@ enifed('ember-glimmer/tests/integration/components/contextual-components-test',
 
       expectAssertion(function () {
         _this36.render('{{component (component "input" type="text")}}');
-      }, 'You cannot use the input helper as a contextual helper. Please extend Ember.TextField or Ember.Checkbox to use it as a contextual component.');
+      }, 'You cannot use the input helper as a contextual helper. Please extend TextField or Checkbox to use it as a contextual component.');
     };
 
     _class.prototype['@test GH#14632 give useful warning when calling contextual components with textarea as a name'] = function testGH14632GiveUsefulWarningWhenCallingContextualComponentsWithTextareaAsAName() {
@@ -12981,7 +12981,7 @@ enifed('ember-glimmer/tests/integration/components/contextual-components-test',
 
       expectAssertion(function () {
         _this37.render('{{component (component "textarea" type="text")}}');
-      }, 'You cannot use the textarea helper as a contextual helper. Please extend Ember.TextArea to use it as a contextual component.');
+      }, 'You cannot use the textarea helper as a contextual helper. Please extend TextArea to use it as a contextual component.');
     };
 
     return _class;
@@ -15672,7 +15672,7 @@ enifed('ember-glimmer/tests/integration/components/curly-components-test', ['emb
       if (_features.MANDATORY_SETTER) {
         expectAssertion(function () {
           component.bar = 'foo-bar';
-        }, /You must use Ember\.set\(\) to set the `bar` property \(of .+\) to `foo-bar`\./);
+        }, /You must use set\(\) to set the `bar` property \(of .+\) to `foo-bar`\./);
 
         this.assertText('initial value - initial value');
       }
@@ -29984,7 +29984,9 @@ enifed('ember-glimmer/tests/integration/helpers/partial-test', ['ember-babel', '
   'use strict';
 
   var _templateObject = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#each model.items as |template i|}}\n        {{model.type}}: {{partial template}}\n      {{/each}}'], ['\n      {{#each model.items as |template i|}}\n        {{model.type}}: {{partial template}}\n      {{/each}}']),
-      _templateObject2 = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#with item.thing as |t|}}\n        {{partial t}}\n      {{else}}\n        Nothing!\n      {{/with}}'], ['\n      {{#with item.thing as |t|}}\n        {{partial t}}\n      {{else}}\n        Nothing!\n      {{/with}}']);
+      _templateObject2 = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#with item.thing as |t|}}\n        {{partial t}}\n      {{else}}\n        Nothing!\n      {{/with}}'], ['\n      {{#with item.thing as |t|}}\n        {{partial t}}\n      {{else}}\n        Nothing!\n      {{/with}}']),
+      _templateObject3 = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#outer.inner as |inner|}}\n        inner.name: {{inner.name}}\n      {{/outer.inner}}\n    '], ['\n      {{#outer.inner as |inner|}}\n        inner.name: {{inner.name}}\n      {{/outer.inner}}\n    ']),
+      _templateObject4 = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#outer-component name=name as |outer|}}\n        {{partial \'some-partial\'}}\n      {{/outer-component}}'], ['\n      {{#outer-component name=name as |outer|}}\n        {{partial \'some-partial\'}}\n      {{/outer-component}}']);
 
   (0, _testCase.moduleFor)('Helpers test: {{partial}}', function (_RenderingTest) {
     (0, _emberBabel.inherits)(_class, _RenderingTest);
@@ -30135,6 +30137,38 @@ enifed('ember-glimmer/tests/integration/helpers/partial-test', ['ember-babel', '
       this.assertText('Nothing!');
     };
 
+    _class.prototype['@test partials which contain contextual components'] = function testPartialsWhichContainContextualComponents() {
+      var _this6 = this;
+
+      this.registerComponent('outer-component', {
+        template: '{{yield (hash inner=(component "inner-component" name=name))}}'
+      });
+
+      this.registerComponent('inner-component', {
+        template: '{{yield (hash name=name)}}'
+      });
+
+      this.registerPartial('_some-partial', (0, _abstractTestCase.strip)(_templateObject3));
+
+      this.render((0, _abstractTestCase.strip)(_templateObject4), { name: 'Sophie' });
+
+      this.assertStableRerender();
+
+      this.assertText('inner.name: Sophie');
+
+      this.runTask(function () {
+        return (0, _emberMetal.set)(_this6.context, 'name', 'Ben');
+      });
+
+      this.assertText('inner.name: Ben');
+
+      this.runTask(function () {
+        return (0, _emberMetal.set)(_this6.context, 'name', 'Sophie');
+      });
+
+      this.assertText('inner.name: Sophie');
+    };
+
     return _class;
   }(_testCase.RenderingTest));
 });
@@ -38447,7 +38481,7 @@ enifed('ember-metal/tests/accessors/mandatory_setters_test', ['ember/features',
       obj.someProp = 'foo-bar';
     });
 
-    QUnit.test('should assert if set without Ember.set when property is being watched', function () {
+    QUnit.test('should assert if set without set when property is being watched', function () {
       var obj = {
         someProp: null,
         toString: function () {
@@ -38459,10 +38493,10 @@ enifed('ember-metal/tests/accessors/mandatory_setters_test', ['ember/features',
 
       expectAssertion(function () {
         obj.someProp = 'foo-bar';
-      }, 'You must use Ember.set() to set the `someProp` property (of custom-object) to `foo-bar`.');
+      }, 'You must use set() to set the `someProp` property (of custom-object) to `foo-bar`.');
     });
 
-    QUnit.test('should not assert if set with Ember.set when property is being watched', function () {
+    QUnit.test('should not assert if set with set when property is being watched', function () {
       var obj = {
         someProp: null,
         toString: function () {
@@ -38615,7 +38649,7 @@ enifed('ember-metal/tests/accessors/mandatory_setters_test', ['ember/features',
 
       expectAssertion(function () {
         obj2.someProp = 'foo-bar';
-      }, 'You must use Ember.set() to set the `someProp` property (of custom-object) to `foo-bar`.');
+      }, 'You must use set() to set the `someProp` property (of custom-object) to `foo-bar`.');
     });
 
     QUnit.test('inheritance remains live', function () {
@@ -39546,7 +39580,7 @@ enifed('ember-metal/tests/computed_test', ['ember-runtime', 'internal-test-helpe
   QUnit.test('computed properties check for the presence of a function or configuration object', function () {
     expectAssertion(function () {
       (0, _emberMetal.computed)('nolastargument');
-    }, 'Ember.computed expects a function or an object as last argument.');
+    }, 'computed expects a function or an object as last argument.');
   });
 
   QUnit.test('computed properties defined with an object only allow `get` and `set` keys', function () {
@@ -39556,7 +39590,7 @@ enifed('ember-metal/tests/computed_test', ['ember-runtime', 'internal-test-helpe
         set: function () {},
         other: function () {}
       });
-    }, 'Config object passed to an Ember.computed can only contain `get` or `set` keys.');
+    }, 'Config object passed to computed can only contain `get` or `set` keys.');
   });
 
   QUnit.test('defining computed property should invoke property on get', function () {
@@ -41063,13 +41097,13 @@ enifed('ember-metal/tests/events_test', ['ember-metal'], function (_emberMetal)
       _emberMetal.Mixin.create({
         foo1: (0, _emberMetal.on)('bar')
       });
-    }, 'Ember.on expects function as last argument');
+    }, 'on expects function as last argument');
 
     expectAssertion(function () {
       _emberMetal.Mixin.create({
         foo1: (0, _emberMetal.on)(function () {})
       });
-    }, 'Ember.on called without valid event names');
+    }, 'on called without valid event names');
   });
 
   QUnit.test('a listener added as part of a mixin may be overridden', function () {
@@ -43634,7 +43668,7 @@ enifed('ember-metal/tests/mixin/observer_test', ['internal-test-helpers', 'ember
   });
 
   (0, _internalTestHelpers.testBoth)('providing the arguments in reverse order is deprecated', function (get, set) {
-    expectDeprecation(/Passing the dependentKeys after the callback function in Ember\.observer is deprecated. Ensure the callback function is the last argument/);
+    expectDeprecation(/Passing the dependentKeys after the callback function in observer is deprecated. Ensure the callback function is the last argument/);
 
     _emberMetal.Mixin.create({
       count: 0,
@@ -43801,13 +43835,13 @@ enifed('ember-metal/tests/observer_test', ['ember-environment', 'internal-test-h
   (0, _internalTestHelpers.testBoth)('observer should assert to invalid input', function (get, set) {
     expectAssertion(function () {
       (0, _emberMetal.observer)(function () {});
-    }, 'Ember.observer called without valid path');
+    }, 'observer called without valid path');
 
-    expectDeprecation('Passing the dependentKeys after the callback function in Ember.observer is deprecated. Ensure the callback function is the last argument.');
+    expectDeprecation('Passing the dependentKeys after the callback function in observer is deprecated. Ensure the callback function is the last argument.');
 
     expectAssertion(function () {
       (0, _emberMetal.observer)(null);
-    }, 'Ember.observer called without a function');
+    }, 'observer called without a function');
   });
 
   (0, _internalTestHelpers.testBoth)('observer should fire when property is modified', function (get, set) {
@@ -44794,7 +44828,7 @@ enifed('ember-metal/tests/observer_test', ['ember-environment', 'internal-test-h
   QUnit.module('Ember.immediateObserver (Deprecated)');
 
   (0, _internalTestHelpers.testBoth)('immediate observers should fire synchronously', function (get, set) {
-    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `Ember.observer` instead./);
+    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `observer` instead./);
     var obj = {};
     var observerCalled = 0;
     var mixin = void 0;
@@ -44869,7 +44903,7 @@ enifed('ember-metal/tests/observer_test', ['ember-environment', 'internal-test-h
   }
 
   (0, _internalTestHelpers.testBoth)('immediate observers watching multiple properties via brace expansion fire synchronously', function (get, set) {
-    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `Ember.observer` instead./);
+    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `observer` instead./);
     var obj = {};
     var observerCalled = 0;
     var mixin = void 0;
@@ -44905,7 +44939,7 @@ enifed('ember-metal/tests/observer_test', ['ember-environment', 'internal-test-h
   });
 
   (0, _internalTestHelpers.testBoth)('immediate observers are for internal properties only', function (get, set) {
-    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `Ember.observer` instead./);
+    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `observer` instead./);
     expectAssertion(function () {
       (0, _emberMetal._immediateObserver)('foo.bar', function () {
         return this;
@@ -50753,6 +50787,13 @@ enifed('ember-runtime/tests/computed/reduce_computed_macros_test', ['ember-metal
     deepEqual(obj.get('sortedItems').mapBy('fname'), ['Robb', 'Jaime', 'Cersei'], 'after changing removed item array is not updated');
   });
 
+  QUnit.test('sort works if array property is null (non array value) on first evaluation of computed prop', function () {
+    obj.set('items', null);
+    deepEqual(obj.get('sortedItems'), []);
+    obj.set('items', (0, _native_array.A)([{ fname: 'Cersei', lname: 'Lanister' }]));
+    deepEqual(obj.get('sortedItems'), [{ fname: 'Cersei', lname: 'Lanister' }]);
+  });
+
   QUnit.test('updating sort properties updates the sorted array', function () {
     deepEqual(obj.get('sortedItems').mapBy('fname'), ['Cersei', 'Jaime', 'Bran', 'Robb'], 'precond - array is initially sorted');
 
@@ -75112,6 +75153,64 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       });
     };
 
+    _class.prototype['@test Setting bound query param property to null or undefined does not serialize to url'] = function testSettingBoundQueryParamPropertyToNullOrUndefinedDoesNotSerializeToUrl(assert) {
+      var _this36 = this;
+
+      assert.expect(9);
+
+      this.router.map(function () {
+        this.route('home');
+      });
+
+      this.setSingleQPController('home', 'foo', [1, 2]);
+
+      return this.visitAndAssert('/home').then(function () {
+        var controller = _this36.getController('home');
+
+        assert.deepEqual(controller.get('foo'), [1, 2]);
+        _this36.assertCurrentPath('/home');
+
+        _this36.setAndFlush(controller, 'foo', (0, _emberRuntime.A)([1, 3]));
+        _this36.assertCurrentPath('/home?foo=%5B1%2C3%5D');
+
+        return _this36.transitionTo('/home').then(function () {
+          assert.deepEqual(controller.get('foo'), [1, 2]);
+          _this36.assertCurrentPath('/home');
+
+          _this36.setAndFlush(controller, 'foo', null);
+          _this36.assertCurrentPath('/home', 'Setting property to null');
+
+          _this36.setAndFlush(controller, 'foo', (0, _emberRuntime.A)([1, 3]));
+          _this36.assertCurrentPath('/home?foo=%5B1%2C3%5D');
+
+          _this36.setAndFlush(controller, 'foo', undefined);
+          _this36.assertCurrentPath('/home', 'Setting property to undefined');
+        });
+      });
+    };
+
+    _class.prototype['@test {{link-to}} with null or undefined QPs does not get serialized into url'] = function testLinkToWithNullOrUndefinedQPsDoesNotGetSerializedIntoUrl(assert) {
+      var _this37 = this;
+
+      assert.expect(3);
+
+      this.addTemplate('home', '{{link-to \'Home\' \'home\' (query-params foo=nullValue) id=\'null-link\'}}{{link-to \'Home\' \'home\' (query-params foo=undefinedValue) id=\'undefined-link\'}}');
+
+      this.router.map(function () {
+        this.route('home');
+      });
+
+      this.setSingleQPController('home', 'foo', [], {
+        nullValue: null,
+        undefinedValue: undefined
+      });
+
+      return this.visitAndAssert('/home').then(function () {
+        assert.equal(_this37.$('#null-link').attr('href'), '/home');
+        assert.equal(_this37.$('#undefined-link').attr('href'), '/home');
+      });
+    };
+
     _class.prototype['@test A child of a resource route still defaults to parent route\'s model even if the child route has a query param'] = function testAChildOfAResourceRouteStillDefaultsToParentRouteSModelEvenIfTheChildRouteHasAQueryParam(assert) {
       assert.expect(2);
 
@@ -75135,7 +75234,7 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
     };
 
     _class.prototype['@test opting into replace does not affect transitions between routes'] = function testOptingIntoReplaceDoesNotAffectTransitionsBetweenRoutes(assert) {
-      var _this36 = this;
+      var _this38 = this;
 
       assert.expect(5);
 
@@ -75157,27 +75256,27 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       }));
 
       return this.visit('/').then(function () {
-        var controller = _this36.getController('bar');
+        var controller = _this38.getController('bar');
 
-        _this36.expectedPushURL = '/foo';
+        _this38.expectedPushURL = '/foo';
         (0, _emberMetal.run)((0, _emberViews.jQuery)('#foo-link'), 'click');
 
-        _this36.expectedPushURL = '/bar';
+        _this38.expectedPushURL = '/bar';
         (0, _emberMetal.run)((0, _emberViews.jQuery)('#bar-no-qp-link'), 'click');
 
-        _this36.expectedReplaceURL = '/bar?raytiley=woot';
-        _this36.setAndFlush(controller, 'raytiley', 'woot');
+        _this38.expectedReplaceURL = '/bar?raytiley=woot';
+        _this38.setAndFlush(controller, 'raytiley', 'woot');
 
-        _this36.expectedPushURL = '/foo';
+        _this38.expectedPushURL = '/foo';
         (0, _emberMetal.run)((0, _emberViews.jQuery)('#foo-link'), 'click');
 
-        _this36.expectedPushURL = '/bar?raytiley=isthebest';
+        _this38.expectedPushURL = '/bar?raytiley=isthebest';
         (0, _emberMetal.run)((0, _emberViews.jQuery)('#bar-link'), 'click');
       });
     };
 
     _class.prototype['@test undefined isn\'t serialized or deserialized into a string'] = function testUndefinedIsnTSerializedOrDeserializedIntoAString(assert) {
-      var _this37 = this;
+      var _this39 = this;
 
       assert.expect(4);
 
@@ -75198,10 +75297,10 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       }));
 
       return this.visitAndAssert('/').then(function () {
-        assert.equal(_this37.$('#the-link').attr('href'), '/example', 'renders without undefined qp serialized');
+        assert.equal(_this39.$('#the-link').attr('href'), '/example', 'renders without undefined qp serialized');
 
-        return _this37.transitionTo('example', { queryParams: { foo: undefined } }).then(function () {
-          _this37.assertCurrentPath('/example');
+        return _this39.transitionTo('example', { queryParams: { foo: undefined } }).then(function () {
+          _this39.assertCurrentPath('/example');
         });
       });
     };
@@ -75219,7 +75318,7 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
     };
 
     _class.prototype['@test warn user that Route\'s queryParams configuration must be an Object, not an Array'] = function testWarnUserThatRouteSQueryParamsConfigurationMustBeAnObjectNotAnArray(assert) {
-      var _this38 = this;
+      var _this40 = this;
 
       assert.expect(1);
 
@@ -75228,12 +75327,12 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       }));
 
       expectAssertion(function () {
-        _this38.visit('/');
+        _this40.visit('/');
       }, 'You passed in `[{"commitBy":{"replace":true}}]` as the value for `queryParams` but `queryParams` cannot be an Array');
     };
 
     _class.prototype['@test handle route names that clash with Object.prototype properties'] = function testHandleRouteNamesThatClashWithObjectPrototypeProperties(assert) {
-      var _this39 = this;
+      var _this41 = this;
 
       assert.expect(1);
 
@@ -75250,8 +75349,8 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       }));
 
       return this.visit('/').then(function () {
-        _this39.transitionTo('constructor', { queryParams: { foo: '999' } });
-        var controller = _this39.getController('constructor');
+        _this41.transitionTo('constructor', { queryParams: { foo: '999' } });
+        var controller = _this41.getController('constructor');
         assert.equal((0, _emberMetal.get)(controller, 'foo'), '999');
       });
     };
@@ -77546,11 +77645,32 @@ enifed('ember/tests/routing/router_service_test/transitionTo_test', ['ember-babe
         });
       };
 
-      _class.prototype['@test RouterService#transitionTo with aliased query params uses the original provided key'] = function testRouterServiceTransitionToWithAliasedQueryParamsUsesTheOriginalProvidedKey(assert) {
+      _class.prototype['@test RouterService#transitionTo with unspecified query params'] = function testRouterServiceTransitionToWithUnspecifiedQueryParams(assert) {
         var _this10 = this;
 
         assert.expect(1);
 
+        this.add('controller:parent.child', _emberRuntime.Controller.extend({
+          queryParams: ['sort', 'page', 'category', 'extra'],
+          sort: 'ASC',
+          page: null,
+          category: undefined
+        }));
+
+        var queryParams = this.buildQueryParams({ sort: 'ASC' });
+
+        return this.visit('/').then(function () {
+          return _this10.routerService.transitionTo('parent.child', queryParams);
+        }).then(function () {
+          assert.equal(_this10.routerService.get('currentURL'), '/child?sort=ASC');
+        });
+      };
+
+      _class.prototype['@test RouterService#transitionTo with aliased query params uses the original provided key'] = function testRouterServiceTransitionToWithAliasedQueryParamsUsesTheOriginalProvidedKey(assert) {
+        var _this11 = this;
+
+        assert.expect(1);
+
         this.add('controller:parent.child', _emberRuntime.Controller.extend({
           queryParams: {
             'cont_sort': 'url_sort'
@@ -77561,14 +77681,14 @@ enifed('ember/tests/routing/router_service_test/transitionTo_test', ['ember-babe
         var queryParams = this.buildQueryParams({ url_sort: 'ASC' });
 
         return this.visit('/').then(function () {
-          return _this10.routerService.transitionTo('parent.child', queryParams);
+          return _this11.routerService.transitionTo('parent.child', queryParams);
         }).then(function () {
-          assert.equal(_this10.routerService.get('currentURL'), '/child?url_sort=ASC');
+          assert.equal(_this11.routerService.get('currentURL'), '/child?url_sort=ASC');
         });
       };
 
       _class.prototype['@test RouterService#transitionTo with aliased query params uses the original provided key when controller property name'] = function testRouterServiceTransitionToWithAliasedQueryParamsUsesTheOriginalProvidedKeyWhenControllerPropertyName(assert) {
-        var _this11 = this;
+        var _this12 = this;
 
         assert.expect(1);
 
@@ -77583,7 +77703,7 @@ enifed('ember/tests/routing/router_service_test/transitionTo_test', ['ember-babe
 
         return this.visit('/').then(function () {
           expectAssertion(function () {
-            return _this11.routerService.transitionTo('parent.child', queryParams);
+            return _this12.routerService.transitionTo('parent.child', queryParams);
           }, 'You passed the `cont_sort` query parameter during a transition into parent.child, please update to url_sort');
         });
       };

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.16.0
+ * @version   2.16.1
  */
 
 var enifed, requireModule, Ember;
@@ -12061,7 +12061,7 @@ enifed('ember-glimmer/tests/integration/components/contextual-components-test',
 
       expectAssertion(function () {
         _this36.render('{{component (component "input" type="text")}}');
-      }, 'You cannot use the input helper as a contextual helper. Please extend Ember.TextField or Ember.Checkbox to use it as a contextual component.');
+      }, 'You cannot use the input helper as a contextual helper. Please extend TextField or Checkbox to use it as a contextual component.');
     };
 
     _class.prototype['@test GH#14632 give useful warning when calling contextual components with textarea as a name'] = function () {
@@ -12069,7 +12069,7 @@ enifed('ember-glimmer/tests/integration/components/contextual-components-test',
 
       expectAssertion(function () {
         _this37.render('{{component (component "textarea" type="text")}}');
-      }, 'You cannot use the textarea helper as a contextual helper. Please extend Ember.TextArea to use it as a contextual component.');
+      }, 'You cannot use the textarea helper as a contextual helper. Please extend TextArea to use it as a contextual component.');
     };
 
     return _class;
@@ -28259,7 +28259,9 @@ enifed('ember-glimmer/tests/integration/helpers/partial-test', ['ember-babel', '
   'use strict';
 
   var _templateObject = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#each model.items as |template i|}}\n        {{model.type}}: {{partial template}}\n      {{/each}}'], ['\n      {{#each model.items as |template i|}}\n        {{model.type}}: {{partial template}}\n      {{/each}}']),
-      _templateObject2 = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#with item.thing as |t|}}\n        {{partial t}}\n      {{else}}\n        Nothing!\n      {{/with}}'], ['\n      {{#with item.thing as |t|}}\n        {{partial t}}\n      {{else}}\n        Nothing!\n      {{/with}}']);
+      _templateObject2 = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#with item.thing as |t|}}\n        {{partial t}}\n      {{else}}\n        Nothing!\n      {{/with}}'], ['\n      {{#with item.thing as |t|}}\n        {{partial t}}\n      {{else}}\n        Nothing!\n      {{/with}}']),
+      _templateObject3 = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#outer.inner as |inner|}}\n        inner.name: {{inner.name}}\n      {{/outer.inner}}\n    '], ['\n      {{#outer.inner as |inner|}}\n        inner.name: {{inner.name}}\n      {{/outer.inner}}\n    ']),
+      _templateObject4 = (0, _emberBabel.taggedTemplateLiteralLoose)(['\n      {{#outer-component name=name as |outer|}}\n        {{partial \'some-partial\'}}\n      {{/outer-component}}'], ['\n      {{#outer-component name=name as |outer|}}\n        {{partial \'some-partial\'}}\n      {{/outer-component}}']);
 
   (0, _testCase.moduleFor)('Helpers test: {{partial}}', function (_RenderingTest) {
     (0, _emberBabel.inherits)(_class, _RenderingTest);
@@ -28409,6 +28411,38 @@ enifed('ember-glimmer/tests/integration/helpers/partial-test', ['ember-babel', '
       this.assertText('Nothing!');
     };
 
+    _class.prototype['@test partials which contain contextual components'] = function () {
+      var _this6 = this;
+
+      this.registerComponent('outer-component', {
+        template: '{{yield (hash inner=(component "inner-component" name=name))}}'
+      });
+
+      this.registerComponent('inner-component', {
+        template: '{{yield (hash name=name)}}'
+      });
+
+      this.registerPartial('_some-partial', (0, _abstractTestCase.strip)(_templateObject3));
+
+      this.render((0, _abstractTestCase.strip)(_templateObject4), { name: 'Sophie' });
+
+      this.assertStableRerender();
+
+      this.assertText('inner.name: Sophie');
+
+      this.runTask(function () {
+        return (0, _emberMetal.set)(_this6.context, 'name', 'Ben');
+      });
+
+      this.assertText('inner.name: Ben');
+
+      this.runTask(function () {
+        return (0, _emberMetal.set)(_this6.context, 'name', 'Sophie');
+      });
+
+      this.assertText('inner.name: Sophie');
+    };
+
     return _class;
   }(_testCase.RenderingTest));
 });
@@ -36937,7 +36971,7 @@ enifed('ember-metal/tests/computed_test', ['ember-runtime', 'internal-test-helpe
   QUnit.test('computed properties check for the presence of a function or configuration object', function () {
     expectAssertion(function () {
       (0, _emberMetal.computed)('nolastargument');
-    }, 'Ember.computed expects a function or an object as last argument.');
+    }, 'computed expects a function or an object as last argument.');
   });
 
   QUnit.test('computed properties defined with an object only allow `get` and `set` keys', function () {
@@ -36947,7 +36981,7 @@ enifed('ember-metal/tests/computed_test', ['ember-runtime', 'internal-test-helpe
         set: function () {},
         other: function () {}
       });
-    }, 'Config object passed to an Ember.computed can only contain `get` or `set` keys.');
+    }, 'Config object passed to computed can only contain `get` or `set` keys.');
   });
 
   QUnit.test('defining computed property should invoke property on get', function () {
@@ -38431,13 +38465,13 @@ enifed('ember-metal/tests/events_test', ['ember-metal'], function (_emberMetal)
       _emberMetal.Mixin.create({
         foo1: (0, _emberMetal.on)('bar')
       });
-    }, 'Ember.on expects function as last argument');
+    }, 'on expects function as last argument');
 
     expectAssertion(function () {
       _emberMetal.Mixin.create({
         foo1: (0, _emberMetal.on)(function () {})
       });
-    }, 'Ember.on called without valid event names');
+    }, 'on called without valid event names');
   });
 
   QUnit.test('a listener added as part of a mixin may be overridden', function () {
@@ -40851,7 +40885,7 @@ enifed('ember-metal/tests/mixin/observer_test', ['internal-test-helpers', 'ember
   });
 
   (0, _internalTestHelpers.testBoth)('providing the arguments in reverse order is deprecated', function (get, set) {
-    expectDeprecation(/Passing the dependentKeys after the callback function in Ember\.observer is deprecated. Ensure the callback function is the last argument/);
+    expectDeprecation(/Passing the dependentKeys after the callback function in observer is deprecated. Ensure the callback function is the last argument/);
 
     _emberMetal.Mixin.create({
       count: 0,
@@ -40994,13 +41028,13 @@ enifed('ember-metal/tests/observer_test', ['ember-environment', 'internal-test-h
   (0, _internalTestHelpers.testBoth)('observer should assert to invalid input', function () {
     expectAssertion(function () {
       (0, _emberMetal.observer)(function () {});
-    }, 'Ember.observer called without valid path');
+    }, 'observer called without valid path');
 
-    expectDeprecation('Passing the dependentKeys after the callback function in Ember.observer is deprecated. Ensure the callback function is the last argument.');
+    expectDeprecation('Passing the dependentKeys after the callback function in observer is deprecated. Ensure the callback function is the last argument.');
 
     expectAssertion(function () {
       (0, _emberMetal.observer)(null);
-    }, 'Ember.observer called without a function');
+    }, 'observer called without a function');
   });
 
   (0, _internalTestHelpers.testBoth)('observer should fire when property is modified', function (get, set) {
@@ -41980,7 +42014,7 @@ enifed('ember-metal/tests/observer_test', ['ember-environment', 'internal-test-h
   QUnit.module('Ember.immediateObserver (Deprecated)');
 
   (0, _internalTestHelpers.testBoth)('immediate observers should fire synchronously', function (get, set) {
-    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `Ember.observer` instead./);
+    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `observer` instead./);
     var obj = {};
     var observerCalled = 0;
     var mixin = void 0;
@@ -42055,7 +42089,7 @@ enifed('ember-metal/tests/observer_test', ['ember-environment', 'internal-test-h
   }
 
   (0, _internalTestHelpers.testBoth)('immediate observers watching multiple properties via brace expansion fire synchronously', function (get, set) {
-    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `Ember.observer` instead./);
+    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `observer` instead./);
     var obj = {};
     var observerCalled = 0;
     var mixin = void 0;
@@ -42091,7 +42125,7 @@ enifed('ember-metal/tests/observer_test', ['ember-environment', 'internal-test-h
   });
 
   (0, _internalTestHelpers.testBoth)('immediate observers are for internal properties only', function () {
-    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `Ember.observer` instead./);
+    expectDeprecation(/Usage of `Ember.immediateObserver` is deprecated, use `observer` instead./);
     expectAssertion(function () {
       (0, _emberMetal._immediateObserver)('foo.bar', function () {
         return this;
@@ -47353,6 +47387,13 @@ enifed('ember-runtime/tests/computed/reduce_computed_macros_test', ['ember-metal
     deepEqual(obj.get('sortedItems').mapBy('fname'), ['Robb', 'Jaime', 'Cersei'], 'after changing removed item array is not updated');
   });
 
+  QUnit.test('sort works if array property is null (non array value) on first evaluation of computed prop', function () {
+    obj.set('items', null);
+    deepEqual(obj.get('sortedItems'), []);
+    obj.set('items', (0, _native_array.A)([{ fname: 'Cersei', lname: 'Lanister' }]));
+    deepEqual(obj.get('sortedItems'), [{ fname: 'Cersei', lname: 'Lanister' }]);
+  });
+
   QUnit.test('updating sort properties updates the sorted array', function () {
     deepEqual(obj.get('sortedItems').mapBy('fname'), ['Cersei', 'Jaime', 'Bran', 'Robb'], 'precond - array is initially sorted');
 
@@ -59301,7 +59342,6 @@ enifed('ember-template-compiler/plugins/transform-action-syntax', ['exports'], f
   exports.default = transformActionSyntax;
   /**
    @module ember
-   @submodule ember-glimmer
   */
 
   /**
@@ -59383,7 +59423,6 @@ enifed('ember-template-compiler/plugins/transform-attrs-into-args', ['exports'],
   exports.default = transformAttrsIntoArgs;
   /**
    @module ember
-   @submodule ember-glimmer
   */
 
   /**
@@ -59564,7 +59603,6 @@ enifed('ember-template-compiler/plugins/transform-each-in-into-each', ['exports'
   exports.default = transformEachInIntoEach;
   /**
    @module ember
-   @submodule ember-glimmer
   */
 
   /**
@@ -59607,7 +59645,6 @@ enifed('ember-template-compiler/plugins/transform-has-block-syntax', ['exports']
   exports.default = transformHasBlockSyntax;
   /**
    @module ember
-   @submodule ember-glimmer
   */
 
   /**
@@ -59711,7 +59748,6 @@ enifed('ember-template-compiler/plugins/transform-input-on-to-onEvent', ['export
 
   /**
    @module ember
-   @submodule ember-htmlbars
   */
 
   /**
@@ -59826,7 +59862,6 @@ enifed('ember-template-compiler/plugins/transform-input-type-syntax', ['exports'
   exports.default = transformInputTypeSyntax;
   /**
    @module ember
-   @submodule ember-glimmer
   */
 
   /**
@@ -60207,7 +60242,6 @@ enifed('ember-template-compiler/system/bootstrap', ['exports', 'ember-debug', 'e
   */
   /**
   @module ember
-  @submodule ember-templates
   */
 
   function bootstrap(_ref) {
@@ -60359,7 +60393,6 @@ enifed('ember-template-compiler/system/compile', ['exports', 'require', 'ember-t
   exports.default = compile;
   /**
   @module ember
-  @submodule ember-template-compiler
   */
   var template = void 0;
 
@@ -60393,7 +60426,6 @@ enifed('ember-template-compiler/system/precompile', ['exports', 'ember-template-
   exports.default = precompile;
   /**
   @module ember
-  @submodule ember-template-compiler
   */
 
   var glimmerPrecompile = void 0;
@@ -71313,6 +71345,64 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       });
     };
 
+    _class.prototype['@test Setting bound query param property to null or undefined does not serialize to url'] = function (assert) {
+      var _this36 = this;
+
+      assert.expect(9);
+
+      this.router.map(function () {
+        this.route('home');
+      });
+
+      this.setSingleQPController('home', 'foo', [1, 2]);
+
+      return this.visitAndAssert('/home').then(function () {
+        var controller = _this36.getController('home');
+
+        assert.deepEqual(controller.get('foo'), [1, 2]);
+        _this36.assertCurrentPath('/home');
+
+        _this36.setAndFlush(controller, 'foo', (0, _emberRuntime.A)([1, 3]));
+        _this36.assertCurrentPath('/home?foo=%5B1%2C3%5D');
+
+        return _this36.transitionTo('/home').then(function () {
+          assert.deepEqual(controller.get('foo'), [1, 2]);
+          _this36.assertCurrentPath('/home');
+
+          _this36.setAndFlush(controller, 'foo', null);
+          _this36.assertCurrentPath('/home', 'Setting property to null');
+
+          _this36.setAndFlush(controller, 'foo', (0, _emberRuntime.A)([1, 3]));
+          _this36.assertCurrentPath('/home?foo=%5B1%2C3%5D');
+
+          _this36.setAndFlush(controller, 'foo', undefined);
+          _this36.assertCurrentPath('/home', 'Setting property to undefined');
+        });
+      });
+    };
+
+    _class.prototype['@test {{link-to}} with null or undefined QPs does not get serialized into url'] = function (assert) {
+      var _this37 = this;
+
+      assert.expect(3);
+
+      this.addTemplate('home', '{{link-to \'Home\' \'home\' (query-params foo=nullValue) id=\'null-link\'}}{{link-to \'Home\' \'home\' (query-params foo=undefinedValue) id=\'undefined-link\'}}');
+
+      this.router.map(function () {
+        this.route('home');
+      });
+
+      this.setSingleQPController('home', 'foo', [], {
+        nullValue: null,
+        undefinedValue: undefined
+      });
+
+      return this.visitAndAssert('/home').then(function () {
+        assert.equal(_this37.$('#null-link').attr('href'), '/home');
+        assert.equal(_this37.$('#undefined-link').attr('href'), '/home');
+      });
+    };
+
     _class.prototype['@test A child of a resource route still defaults to parent route\'s model even if the child route has a query param'] = function (assert) {
       assert.expect(2);
 
@@ -71336,7 +71426,7 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
     };
 
     _class.prototype['@test opting into replace does not affect transitions between routes'] = function (assert) {
-      var _this36 = this;
+      var _this38 = this;
 
       assert.expect(5);
 
@@ -71358,27 +71448,27 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       }));
 
       return this.visit('/').then(function () {
-        var controller = _this36.getController('bar');
+        var controller = _this38.getController('bar');
 
-        _this36.expectedPushURL = '/foo';
+        _this38.expectedPushURL = '/foo';
         (0, _emberMetal.run)((0, _emberViews.jQuery)('#foo-link'), 'click');
 
-        _this36.expectedPushURL = '/bar';
+        _this38.expectedPushURL = '/bar';
         (0, _emberMetal.run)((0, _emberViews.jQuery)('#bar-no-qp-link'), 'click');
 
-        _this36.expectedReplaceURL = '/bar?raytiley=woot';
-        _this36.setAndFlush(controller, 'raytiley', 'woot');
+        _this38.expectedReplaceURL = '/bar?raytiley=woot';
+        _this38.setAndFlush(controller, 'raytiley', 'woot');
 
-        _this36.expectedPushURL = '/foo';
+        _this38.expectedPushURL = '/foo';
         (0, _emberMetal.run)((0, _emberViews.jQuery)('#foo-link'), 'click');
 
-        _this36.expectedPushURL = '/bar?raytiley=isthebest';
+        _this38.expectedPushURL = '/bar?raytiley=isthebest';
         (0, _emberMetal.run)((0, _emberViews.jQuery)('#bar-link'), 'click');
       });
     };
 
     _class.prototype['@test undefined isn\'t serialized or deserialized into a string'] = function (assert) {
-      var _this37 = this;
+      var _this39 = this;
 
       assert.expect(4);
 
@@ -71399,10 +71489,10 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       }));
 
       return this.visitAndAssert('/').then(function () {
-        assert.equal(_this37.$('#the-link').attr('href'), '/example', 'renders without undefined qp serialized');
+        assert.equal(_this39.$('#the-link').attr('href'), '/example', 'renders without undefined qp serialized');
 
-        return _this37.transitionTo('example', { queryParams: { foo: undefined } }).then(function () {
-          _this37.assertCurrentPath('/example');
+        return _this39.transitionTo('example', { queryParams: { foo: undefined } }).then(function () {
+          _this39.assertCurrentPath('/example');
         });
       });
     };
@@ -71420,7 +71510,7 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
     };
 
     _class.prototype['@test warn user that Route\'s queryParams configuration must be an Object, not an Array'] = function (assert) {
-      var _this38 = this;
+      var _this40 = this;
 
       assert.expect(1);
 
@@ -71429,12 +71519,12 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       }));
 
       expectAssertion(function () {
-        _this38.visit('/');
+        _this40.visit('/');
       }, 'You passed in `[{"commitBy":{"replace":true}}]` as the value for `queryParams` but `queryParams` cannot be an Array');
     };
 
     _class.prototype['@test handle route names that clash with Object.prototype properties'] = function (assert) {
-      var _this39 = this;
+      var _this41 = this;
 
       assert.expect(1);
 
@@ -71451,8 +71541,8 @@ enifed('ember/tests/routing/query_params_test', ['ember-babel', 'ember-runtime',
       }));
 
       return this.visit('/').then(function () {
-        _this39.transitionTo('constructor', { queryParams: { foo: '999' } });
-        var controller = _this39.getController('constructor');
+        _this41.transitionTo('constructor', { queryParams: { foo: '999' } });
+        var controller = _this41.getController('constructor');
         assert.equal((0, _emberMetal.get)(controller, 'foo'), '999');
       });
     };
@@ -73657,11 +73747,32 @@ enifed('ember/tests/routing/router_service_test/transitionTo_test', ['ember-babe
       });
     };
 
-    _class.prototype['@test RouterService#transitionTo with aliased query params uses the original provided key'] = function (assert) {
+    _class.prototype['@test RouterService#transitionTo with unspecified query params'] = function (assert) {
       var _this10 = this;
 
       assert.expect(1);
 
+      this.add('controller:parent.child', _emberRuntime.Controller.extend({
+        queryParams: ['sort', 'page', 'category', 'extra'],
+        sort: 'ASC',
+        page: null,
+        category: undefined
+      }));
+
+      var queryParams = this.buildQueryParams({ sort: 'ASC' });
+
+      return this.visit('/').then(function () {
+        return _this10.routerService.transitionTo('parent.child', queryParams);
+      }).then(function () {
+        assert.equal(_this10.routerService.get('currentURL'), '/child?sort=ASC');
+      });
+    };
+
+    _class.prototype['@test RouterService#transitionTo with aliased query params uses the original provided key'] = function (assert) {
+      var _this11 = this;
+
+      assert.expect(1);
+
       this.add('controller:parent.child', _emberRuntime.Controller.extend({
         queryParams: {
           'cont_sort': 'url_sort'
@@ -73672,14 +73783,14 @@ enifed('ember/tests/routing/router_service_test/transitionTo_test', ['ember-babe
       var queryParams = this.buildQueryParams({ url_sort: 'ASC' });
 
       return this.visit('/').then(function () {
-        return _this10.routerService.transitionTo('parent.child', queryParams);
+        return _this11.routerService.transitionTo('parent.child', queryParams);
       }).then(function () {
-        assert.equal(_this10.routerService.get('currentURL'), '/child?url_sort=ASC');
+        assert.equal(_this11.routerService.get('currentURL'), '/child?url_sort=ASC');
       });
     };
 
     _class.prototype['@test RouterService#transitionTo with aliased query params uses the original provided key when controller property name'] = function (assert) {
-      var _this11 = this;
+      var _this12 = this;
 
       assert.expect(1);
 
@@ -73694,7 +73805,7 @@ enifed('ember/tests/routing/router_service_test/transitionTo_test', ['ember-babe
 
       return this.visit('/').then(function () {
         expectAssertion(function () {
-          return _this11.routerService.transitionTo('parent.child', queryParams);
+          return _this12.routerService.transitionTo('parent.child', queryParams);
         }, 'You passed the `cont_sort` query parameter during a transition into parent.child, please update to url_sort');
       });
     };