Merge pull request #12208 from Batterii/computed-sort-fix

[BUGFIX release] Ember.computed.sort was crashing when it hit a null value. Fixes #12207.
emberjs · Aug 26, 2015 · a09587b · a09587b
2 parents 312617d + 579bb88
commit a09587b
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/packages/ember-runtime/lib/computed/reduce_computed_macros.js b/packages/ember-runtime/lib/computed/reduce_computed_macros.js
@@ -571,6 +571,8 @@ function propertySort(itemsKey, sortPropertiesKey) {
     var items = itemsKey === '@this' ? this : get(this, itemsKey);
     var sortProperties = get(this, sortPropertiesKey);
 
+    if (items === null || typeof items !== 'object') { return Ember.A(); }
+
     // TODO: Ideally we'd only do this if things have changed
     if (cp._sortPropObservers) {
       cp._sortPropObservers.forEach(args => removeObserver.apply(null, args));

diff --git a/packages/ember-runtime/tests/computed/reduce_computed_macros_test.js b/packages/ember-runtime/tests/computed/reduce_computed_macros_test.js
@@ -20,6 +20,7 @@ import {
   union,
   intersect
 } from 'ember-runtime/computed/reduce_computed_macros';
+import { isArray } from 'ember-runtime/utils';
 
 var obj;
 QUnit.module('map', {
@@ -1089,6 +1090,17 @@ QUnit.test('property paths in sort properties update the sorted array', function
   deepEqual(obj.get('sortedPeople'), [cersei, jaime, sansa], 'array is sorted correctly');
 });
 
+QUnit.test('if the dependentKey is neither an array nor object, it will return an empty array', () => {
+  set(obj, 'items', null);
+  ok(isArray(obj.get('sortedItems')), 'returns an empty arrays');
+
+  set(obj, 'array', undefined);
+  ok(isArray(obj.get('sortedItems')), 'returns an empty arrays');
+
+  set(obj, 'array', 'not an array');
+  ok(isArray(obj.get('sortedItems')), 'returns an empty arrays');
+});
+
 function sortByLnameFname(a, b) {
   var lna = get(a, 'lname');
   var lnb = get(b, 'lname');