sproutcore 1.9.1 → 1.9.2

data/lib/frameworks/sproutcore/frameworks/bootstrap/system/browser.js

@@ -193,7 +193,7 @@ SC.detectBrowser = function(userAgent, language) {
   // Normalize the os name.
   if (isIOSDevice) { osAndVersion[1] = SC.OS.ios; }
   else if (osAndVersion[1] === 'mac os x' || osAndVersion[1] === 'mac os') { osAndVersion[1] = SC.OS.mac; }
-  else if (osAndVersion[1] === 'windows nt') { osAndVersion[1] = SC.OS.windows; }
+  else if (osAndVersion[1] === 'windows nt') { osAndVersion[1] = SC.OS.win; }
 
   // Normalize the os version.
   osAndVersion[2] = osAndVersion[2] ? osAndVersion[2].replace(/_/g, '.') : '0';

data/lib/frameworks/sproutcore/frameworks/bootstrap/tests/system/browser.js

@@ -41,7 +41,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.chrome,
     version: '16.0.912.36',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.webkit,
     engineVersion: '535.7'
@@ -62,7 +62,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.opera,
     version: '8.65',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '5.1',
     engine: SC.ENGINE.opera,
     engineVersion: '8.65'
@@ -71,7 +71,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.opera,
     version: '10.62',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.presto,
     engineVersion: '2.6.30'
@@ -80,7 +80,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.opera,
     version: '11.51',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '5.1',
     engine: SC.ENGINE.presto,
     engineVersion: '2.9.168'
@@ -89,7 +89,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.opera,
     version: '12.00',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.presto,
     engineVersion: '2.9.181'
@@ -119,7 +119,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.ie,
     version: '7.0',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.0',
     engine: SC.ENGINE.trident,
     engineVersion: '7.0'
@@ -128,7 +128,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.ie,
     version: '8.0',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.0',
     engine: SC.ENGINE.trident,
     engineVersion: '4.0'
@@ -137,7 +137,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.ie,
     version: '9.0',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '9.0',
     engine: SC.ENGINE.trident,
     engineVersion: '9.0'
@@ -146,7 +146,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.ie,
     version: '10.0',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.trident,
     engineVersion: '6.0'
@@ -155,7 +155,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.ie,
     version: '10.6',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.trident,
     engineVersion: '5.0'
@@ -164,11 +164,20 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.ie,
     version: '10.0',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.2',
     engine: SC.ENGINE.trident,
     engineVersion: '6.0'
   },
+  "Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0)": {
+    device: SC.DEVICE.desktop,
+    name: SC.BROWSER.ie,
+    version: '9.0',
+    os: SC.OS.win,
+    osVersion: '6.1',
+    engine: SC.ENGINE.trident,
+    engineVersion: '5.0'
+  },
 
 // MOZILLA
 
@@ -176,7 +185,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.ENGINE.gecko,
     version: '0',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.gecko,
     engineVersion: '2.0b4'
@@ -215,7 +224,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.firefox,
     version: '3.5.13',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.gecko,
     engineVersion: '1.9.1.13'
@@ -224,7 +233,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.firefox,
     version: '3.6.10',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.gecko,
     engineVersion: '1.9.2.10'
@@ -233,7 +242,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.firefox,
     version: '4.0b7pre',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.gecko,
     engineVersion: '2.0b7pre'
@@ -242,7 +251,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.firefox,
     version: '6.0',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.gecko,
     engineVersion: '6.0'
@@ -299,7 +308,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.safari,
     version: '4.1',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '5.0',
     engine: SC.ENGINE.webkit,
     engineVersion: '533.16'
@@ -308,7 +317,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.safari,
     version: '5.0.1',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '5.2',
     engine: SC.ENGINE.webkit,
     engineVersion: '533.17.8'
@@ -317,7 +326,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.safari,
     version: '5.0.2',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.webkit,
     engineVersion: '533.18.1'
@@ -326,7 +335,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.safari,
     version: '5.0.3',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.0',
     engine: SC.ENGINE.webkit,
     engineVersion: '533.19.4'
@@ -335,7 +344,7 @@ var userAgents = {
     device: SC.DEVICE.desktop,
     name: SC.BROWSER.safari,
     version: '5.0.4',
-    os: SC.OS.windows,
+    os: SC.OS.win,
     osVersion: '6.1',
     engine: SC.ENGINE.webkit,
     engineVersion: '533.20.25'
@@ -485,6 +494,9 @@ for (var userAgent in userAgents) {
     browser = SC.detectBrowser(userAgent);
     expected = userAgents[userAgent];
     for (var key in expected) {
+      if ( !browser.hasOwnProperty(key) || browser[key] == null) {
+        ok(false,"Property %@ not set, expected %@".fmt(key, expected[key]));
+      }
       if (browser[key] && typeof browser[key] !== "function") {
         equals(browser[key], expected[key], "'" + key + "' should be '" + expected[key] + "'");
       }

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/platform.js

@@ -44,6 +44,8 @@ SC.platform = SC.Object.create({
      - Android is assumed to support touch, but incorrectly reports that it does not.
      - See: https://github.com/Modernizr/Modernizr/issues/84 for a discussion on detecting
        touch capability.
+     - See: https://github.com/highslide-software/highcharts.com/issues/1331 for a discussion 
+       about why we need to check if ontouchstart is null in addition to check if it's defined
   */
   /**
     YES if the current device supports touch events, NO otherwise.
@@ -53,7 +55,7 @@ SC.platform = SC.Object.create({
 
     @property {Boolean}
   */
-  touch: 'ontouchstart' in window || SC.browser.name === SC.BROWSER.android,
+  touch: !SC.none(window.ontouchstart) || SC.browser.name === SC.BROWSER.android,
 
   /**
     YES if the current browser supports bounce on scroll.

data/lib/frameworks/sproutcore/frameworks/core_foundation/system/root_responder.js

@@ -2017,8 +2017,13 @@ SC.RootResponder = SC.Object.extend(
   drag: function() { return false; },
 
   contextmenu: function(evt) {
-    var view = this.targetViewForEvent(evt) ;
-    return this.sendEvent('contextMenu', evt, view);
+    var view = this.targetViewForEvent(evt);
+
+    // Determine if any views took responsibility for the event.
+    view = this.sendEvent('contextMenu', evt, view);
+    ret = view ? evt.hasCustomEventHandling : YES;
+
+    return ret;
   },
 
   // ..........................................................

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view.js

@@ -1466,10 +1466,13 @@ SC.CoreView.reopen(
     Used to block the contextMenu per view.
 
     @param evt {SC.Event} the contextmenu event
-    @returns YES if the contextmenu can show up
+    @returns YES if the contextmenu will be allowed to show up
   */
   contextMenu: function(evt) {
-    if (this.get('isContextMenuEnabled')) { return YES; }
+    if (this.get('isContextMenuEnabled')) {
+      evt.allowDefault();
+      return YES;
+    }
   }
 
 });

data/lib/frameworks/sproutcore/frameworks/core_foundation/views/view/animation.js

@@ -66,6 +66,13 @@ SC.View.reopen(
     }
 
     if (callback) { options.callback = callback; }
+    else if (options.callback) {
+      //@if(debug)
+        // Provide a little developer support if they are doing something that should be considered wrong.
+        SC.warn("Developer Warning: The callback method should be given as an argument not as part of the options object.  Future versions of SproutCore will no longer support having the callback in the options hash.  See discussion at:  https://github.com/sproutcore/sproutcore/issues/861.");
+      //@endif
+      callback = options.callback;
+    }
 
     // In the case of zero duration, just adjust and call the callback.
     if (options.duration === 0) {

data/lib/frameworks/sproutcore/frameworks/datastore/data_sources/data_source.js

@@ -194,7 +194,7 @@ SC.MIXED_STATE = '__MIXED__';
 
    * `dataSourceDidFetchQuery(query)` — the data source must call this when
      it has completed fetching any related data for the query. This returns the
-     query results (record array) status into a `READY` state.
+     query results (i.e. the record array) status into a `READY` state.
    * `dataSourceDidErrorQuery(query, error)` — the data source should call
      this if it encounters an error in executing the query. This puts the query
      results into an `ERROR` state.

data/lib/frameworks/sproutcore/frameworks/datastore/system/many_array.js

@@ -8,13 +8,13 @@
 /**
   @class
 
-  A `ManyArray` is used to map an array of record ids back to their 
+  A `ManyArray` is used to map an array of record ids back to their
   record objects which will be materialized from the owner store on demand.
-  
-  Whenever you create a `toMany()` relationship, the value returned from the 
+
+  Whenever you create a `toMany()` relationship, the value returned from the
   property will be an instance of `ManyArray`.  You can generally customize the
   behavior of ManyArray by passing settings to the `toMany()` helper.
-  
+
   @extends SC.Enumerable
   @extends SC.Array
   @since SproutCore 1.0
@@ -53,7 +53,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
   /**
     The `ManyAttribute` that created this array.
-  
+
     @default null
     @type SC.ManyAttribute
   */
@@ -71,7 +71,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
   }.property('record').cacheable(),
 
   /**
-    The `storeKey` for the parent record of this many array.  Editing this 
+    The `storeKey` for the parent record of this many array.  Editing this
     array will place the parent record into a `READY_DIRTY` state.
 
     @type Number
@@ -83,7 +83,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
 
   /**
-    Returns the `storeId`s in read-only mode.  Avoids modifying the record 
+    Returns the `storeId`s in read-only mode.  Avoids modifying the record
     unnecessarily.
 
     @type SC.Array
@@ -95,9 +95,9 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
 
   /**
-    Returns an editable array of `storeId`s.  Marks the owner records as 
-    modified. 
-    
+    Returns an editable array of `storeId`s.  Marks the owner records as
+    modified.
+
     @type {SC.Array}
     @property
   */
@@ -176,7 +176,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
 
   /** @private
     Returned length is a pass-through to the `storeIds` array.
-    
+
     @type Number
     @property
   */
@@ -231,7 +231,7 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
         len      = recs ? (recs.get ? recs.get('length') : recs.length) : 0,
         record   = this.get('record'),
         pname    = this.get('propertyName'),
-        i, keys, ids, toRemove, inverse, attr, inverseRecord;
+        i, ids, toRemove, inverse, attr, inverseRecord;
 
     // map to store keys
     ids = [] ;
@@ -326,11 +326,11 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
     @param {SC.Record} inverseRecord the record this array is a part of
     @returns {SC.ManyArray} receiver
   */
-  addInverseRecord: function(inverseRecord) {
-
+  addInverseRecord: function (inverseRecord) {
+    // Fast path!
     if (!inverseRecord) return this;
-    var id = inverseRecord.get('id'),
-        storeIds = this.get('editableStoreIds'),
+
+    var storeIds = this.get('editableStoreIds'),
         orderBy  = this.get('orderBy'),
         len      = storeIds.get('length'),
         idx, record;
@@ -348,26 +348,32 @@ SC.ManyArray = SC.Object.extend(SC.Enumerable, SC.Array,
     return this;
   },
 
-  /** @private
-      binary search to find insertion location
-  */
-  _findInsertionLocation: function(rec, min, max, orderBy) {
-    var idx   = min+Math.floor((max-min)/2),
+  /** @private binary search to find insertion location */
+  _findInsertionLocation: function (rec, min, max, orderBy) {
+    var idx   = min + Math.floor((max - min) / 2),
         cur   = this.objectAt(idx),
         order = this._compare(rec, cur, orderBy);
+
     if (order < 0) {
-      if (idx===0) return idx;
-      else return this._findInsertionLocation(rec, 0, idx, orderBy);
+      // The location is before the first index.
+      if (idx === 0) return idx;
+
+      // The location is in the lower subset.
+      else return this._findInsertionLocation(rec, 0, idx - 1, orderBy);
     } else if (order > 0) {
-      if (idx >= max) return idx;
-      else return this._findInsertionLocation(rec, idx, max, orderBy);
-    } else return idx;
+      // The location is after the current index.
+      if (idx >= max) return idx + 1;
+
+      // The location is in the upper subset.
+      else return this._findInsertionLocation(rec, idx + 1, max, orderBy);
+    } else {
+      // The location is the current index.
+      return idx;
+    }
   },
 
-  /** @private
-      function to compare to objects
-  */
-  _compare: function(a, b, orderBy) {
+  /** @private function to compare two objects*/
+  _compare: function (a, b, orderBy) {
     var t = SC.typeOf(orderBy),
         ret, idx, len;
 

data/lib/frameworks/sproutcore/frameworks/datastore/tests/system/many_array/core_methods.js

@@ -9,17 +9,17 @@
 var store, storeKey, storeId, rec, storeIds, recs, arrayRec;
 module("SC.ManyArray core methods", {
   setup: function() {
-    
+
     // setup dummy app and store
     MyApp = SC.Object.create({
       store: SC.Store.create()
     });
-    
+
     // setup a dummy model
     MyApp.Foo = SC.Record.extend({});
-    
+
     SC.RunLoop.begin();
-    
+
     // load some data
     storeIds = [1,2,3,4];
     MyApp.store.loadRecords(MyApp.Foo, [
@@ -29,25 +29,25 @@ module("SC.ManyArray core methods", {
       { guid: 4, firstName: "Johnny", lastName: "Cash", age: 17 },
       { guid: 50, firstName: "Holder", fooMany: storeIds }
     ]);
-     
+
     storeKey = MyApp.store.storeKeyFor(MyApp.Foo, 1);
-    
+
     // get record
     rec = MyApp.store.materializeRecord(storeKey);
     storeId = rec.get('id');
-    
+
     // get many array.
     arrayRec = MyApp.store.materializeRecord(MyApp.store.storeKeyFor(MyApp.Foo, 50));
-    
-    recs = SC.ManyArray.create({ 
+
+    recs = SC.ManyArray.create({
       record: arrayRec,
-      propertyName: "fooMany", 
+      propertyName: "fooMany",
       recordType: MyApp.Foo,
       isEditable: YES
     });
-    arrayRec.relationships = [recs]; 
+    arrayRec.relationships = [recs];
   },
-  
+
   teardown: function() {
     SC.RunLoop.end();
   }
@@ -55,25 +55,25 @@ module("SC.ManyArray core methods", {
 
 // ..........................................................
 // LENGTH
-// 
+//
 
 test("should pass through length", function() {
-  equals(recs.get('length'), storeIds.length, 'rec should pass through length');  
+  equals(recs.get('length'), storeIds.length, 'rec should pass through length');
 });
 
 test("changing storeIds length should change length of rec array also", function() {
 
   var oldlen = recs.get('length');
-  
+
   storeIds.pushObject(SC.Store.generateStoreKey()); // change length
-  
+
   ok(storeIds.length > oldlen, 'precond - storeKeys.length should have changed');
-  equals(recs.get('length'), storeIds.length, 'rec should pass through length');    
+  equals(recs.get('length'), storeIds.length, 'rec should pass through length');
 });
 
 // ..........................................................
 // objectAt
-// 
+//
 
 test("should materialize record for object", function() {
   equals(storeIds[0], storeId, 'precond - storeIds[0] should be storeId');
@@ -86,12 +86,12 @@ test("reading past end of array length should return undefined", function() {
 
 test("modifying the underlying storeId should change the returned materialized record", function() {
   // read record once to make it materialized
-  equals(recs.objectAt(0), rec, 'recs.objectAt(0) should materialize record');  
-  
+  equals(recs.objectAt(0), rec, 'recs.objectAt(0) should materialize record');
+
   // create a new record.
   var rec2 = MyApp.store.createRecord(MyApp.Foo, { guid: 5, firstName: "Fred" });
   var storeId2 = rec2.get('id');
-  
+
   // add to beginning of storeKey array
   storeIds.unshiftObject(storeId2);
   equals(recs.get('length'), 5, 'should now have length of 5');
@@ -102,39 +102,39 @@ test("modifying the underlying storeId should change the returned materialized r
 test("reading a record not loaded in store should trigger retrieveRecord", function() {
   var callCount = 0;
 
-  // patch up store to record a call and to make it look like data is not 
+  // patch up store to record a call and to make it look like data is not
   // loaded.
-  
+
   MyApp.store.removeDataHash(storeKey, SC.Record.EMPTY);
   MyApp.store.retrieveRecord = function() { callCount++; };
-  
+
   var rec = recs.objectAt(0);
   equals(MyApp.store.readStatus(rec), SC.Record.EMPTY, 'precond - storeKey must not be loaded');
-  
+
   equals(callCount, 1, 'store.retrieveRecord() should have been called');
 });
 
 // ..........................................................
 // replace()
-// 
+//
 
 test("adding a record to the ManyArray should pass through storeIds", function() {
 
   // read record once to make it materialized
-  equals(recs.objectAt(0), rec, 'recs.objectAt(0) should materialize record');  
-  
+  equals(recs.objectAt(0), rec, 'recs.objectAt(0) should materialize record');
+
   // create a new record.
   var rec2 = MyApp.store.createRecord(MyApp.Foo, { guid: 5, firstName: "rec2" });
   var storeId2 = rec2.get('id');
-  
+
   // add record to beginning of record array
   recs.unshiftObject(rec2);
-  
+
   // verify record array
   equals(recs.get('length'), 5, 'should now have length of 2');
   equals(recs.objectAt(0), rec2, 'recs.objectAt(0) should return new record');
   equals(recs.objectAt(1), rec, 'recs.objectAt(1) should return old record');
-  
+
   // verify storeKeys
   storeIds = arrayRec.readAttribute('fooMany'); // array might have changed
   equals(storeIds.objectAt(0), storeId2, 'storeKeys[0] should return new storeKey');
@@ -143,7 +143,7 @@ test("adding a record to the ManyArray should pass through storeIds", function()
 
 // ..........................................................
 // Property Observing
-// 
+//
 
 test("changing the underlying storeIds should notify observers of records", function() {
 
@@ -152,8 +152,8 @@ test("changing the underlying storeIds should notify observers of records", func
     cnt: 0,
     observer: function() { this.cnt++; }
   });
-  recs.addObserver('[]', obj, obj.observer); 
-  
+  recs.addObserver('[]', obj, obj.observer);
+
   // now modify storeKeys
   storeIds.pushObject(5);
   equals(obj.cnt, 1, 'observer should have fired after changing storeKeys');
@@ -165,34 +165,34 @@ test("swapping storeIds array should change ManyArray and observers", function()
   var rec2 = MyApp.store.createRecord(MyApp.Foo, { guid: 5, firstName: "rec2" });
   var storeId2 = rec2.get('id');
   var storeIds2 = [storeId2];
-  
+
   // setup observer
   var obj = SC.Object.create({
     cnt: 0,
     observer: function() { this.cnt++; }
   });
-  recs.addObserver('[]', obj, obj.observer); 
-  
+  recs.addObserver('[]', obj, obj.observer);
+
   // read record once to make it materialized
-  equals(recs.objectAt(0), rec, 'recs.objectAt(0) should materialize record');  
-  
+  equals(recs.objectAt(0), rec, 'recs.objectAt(0) should materialize record');
+
   // now swap storeKeys
   obj.cnt = 0 ;
   arrayRec.writeAttribute('fooMany', storeIds2);
 
   SC.RunLoop.end();
   SC.RunLoop.begin();
-  
+
   // verify observer fired and record changed
   equals(obj.cnt, 1, 'observer should have fired after swap');
   equals(recs.objectAt(0), rec2, 'recs.objectAt(0) should return new rec');
-  
+
   // modify storeKey2, make sure observer fires and content changes
   obj.cnt = 0;
   storeIds2.unshiftObject(storeId);
   equals(obj.cnt, 1, 'observer should have fired after edit');
   equals(recs.get('length'), 2, 'should reflect new length');
-  equals(recs.objectAt(0), rec, 'recs.objectAt(0) should return pushed rec');  
+  equals(recs.objectAt(0), rec, 'recs.objectAt(0) should return pushed rec');
 
 });
 
@@ -202,3 +202,45 @@ test("reduced properties", function() {
   equals(recs.get('@min(age)'), 7, 'min reducer should return the correct value');
   equals(recs.get('@average(age)'), (32+30+7+17)/4.0, 'average reducer should return the correct value');
 });
+
+test("Test that _findInsertionLocation returns the correct location.", function () {
+  var location,
+    newRec,
+    sortByFirstName = function (a, b) {
+      if (a.get('firstName') == b.get('firstName')) return 0;
+      else if (a.get('firstName') < b.get('firstName')) return -1;
+      else return 1;
+    };
+
+  // Order the many array manually by firstName.
+  arrayRec.set('fooMany', [3,2,1,4]);
+  recs._storeIdsContentDidChange(0, 4, 4);
+
+  // Check the insertion location of a record that should appear first.
+  newRec = SC.Object.create({ guid: 5, firstName: "Adam", lastName: "Doe", age: 15 });
+  location = recs._findInsertionLocation(newRec, 0, recs.get('length') - 1, sortByFirstName);
+
+  equals(location, 0, "The insertion location should be");
+
+  // Check the insertion location of a record that should appear in the middle.
+  newRec = SC.Object.create({ guid: 5, firstName: "Farmer", lastName: "Doe", age: 95 });
+  location = recs._findInsertionLocation(newRec, 0, recs.get('length') - 1, sortByFirstName);
+
+  equals(location, 1, "The insertion location should be");
+
+  newRec = SC.Object.create({ guid: 5, firstName: "Jen", lastName: "Doe", age: 95 });
+  location = recs._findInsertionLocation(newRec, 0, recs.get('length') - 1, sortByFirstName);
+
+  equals(location, 2, "The insertion location should be");
+
+  newRec = SC.Object.create({ guid: 5, firstName: "Johnny", lastName: "Doe", age: 95 });
+  location = recs._findInsertionLocation(newRec, 0, recs.get('length') - 1, sortByFirstName);
+
+  equals(location, 3, "The insertion location should be");
+
+  // Check the insertion location of a record that should appear last.
+  newRec = SC.Object.create({ guid: 5, firstName: "Zues", lastName: "Doe", age: 95 });
+  location = recs._findInsertionLocation(newRec, 0, recs.get('length') - 1, sortByFirstName);
+
+  equals(location, 4, "The insertion location should be");
+});