datastore/data_source: added more tests; fixed additional bug with re…

…turn status of commitRecords

frameworks/datastore/data_sources/data_source.js

@@ -456,7 +456,7 @@ SC.DataSource = SC.Object.extend( /** @scope SC.DataSource.prototype */ {
         ret = (cur === NO) ? NO : SC.MIXED_STATE ;
       }
     }
-    return ret ? ret : null ;
+    return !SC.none(ret) ? ret : null ;
   },
 
 

frameworks/datastore/tests/data_sources/data_source.js

@@ -9,7 +9,6 @@ var MyApp, wasCalled;
 module("SC.DataSource", {
   setup: function () {
     MyApp = window.MyApp = {};
-
     MyApp.store = SC.Store.create();
     MyApp.Foo = SC.Record.extend();
 
@@ -44,6 +43,11 @@ module("SC.DataSource", {
         return YES;
       }
     });
+    SC.RunLoop.begin();
+  },
+
+  teardown: function () {
+    SC.RunLoop.end();
   }
 });
 
@@ -54,7 +58,7 @@ test("The dataSource will forward calls to the appropriate methods", function ()
      "the fetch should return a record array");
   ok(wasCalled, "`fetch` should have been called");
   wasCalled = NO;
-  
+
   ok(MyApp.store.find(MyApp.Foo, "testing retrieve"),
      "retrieve should return a new record (because the dataSource handled the request YES)");
   ok(wasCalled, "`retrieve` should have been called");
@@ -83,3 +87,104 @@ test("The dataSource will forward calls to the appropriate methods", function ()
      "destroying the record should return YES");
   ok(wasCalled, "`destroyRecord` should have been called");
 });
+
+test("The dataSource will return YES when all records committed return YES", function () {
+  var ds = MyApp.DataSource.create({
+    createRecord: function () { return YES; },
+    updateRecord: function () { return YES; },
+    destroyRecord: function () { return YES; }
+  });
+
+  MyApp.store.set('dataSource', ds);
+
+  var rec1 = MyApp.store.createRecord(MyApp.Foo, {}),
+      rec2, rec3;
+
+  equals(MyApp.store.commitRecords(), YES,
+         "commiting a single new record should return YES");
+
+  MyApp.store.writeStatus(rec1.get('storeKey'), SC.Record.READY_CLEAN);
+
+  rec1.set('zero', 0);
+  rec2 = MyApp.store.createRecord(MyApp.Foo, {});
+
+  equals(MyApp.store.commitRecords(), YES,
+         "commiting records for an 'update' and 'create' should return YES");
+
+  MyApp.store.writeStatus(rec1.get('storeKey'), SC.Record.READY_CLEAN);
+  MyApp.store.writeStatus(rec2.get('storeKey'), SC.Record.READY_CLEAN);
+
+  rec1.destroy();
+  rec2.set('one', 1);
+  rec3 = MyApp.store.createRecord(MyApp.Foo, {});
+
+  equals(MyApp.store.commitRecords(), YES,
+         "commiting records for an 'update', 'create', and 'destroy' should return YES");
+});
+
+test("The dataSource will return SC.MIXED_STATE when all records committed return YES and NO", function () {
+  var ds = MyApp.DataSource.create({
+    createRecord: function () { return NO; },
+    updateRecord: function () { return YES; },
+    destroyRecord: function () { return NO; }
+  });
+
+  MyApp.store.set('dataSource', ds);
+
+  var rec1 = MyApp.store.createRecord(MyApp.Foo, {}),
+      rec2, rec3;
+
+  equals(MyApp.store.commitRecords(), NO,
+         "commiting a single new record should return NO");
+
+  MyApp.store.writeStatus(rec1.get('storeKey'), SC.Record.READY_CLEAN);
+
+  rec1.set('zero', 0);
+  rec2 = MyApp.store.createRecord(MyApp.Foo, {});
+
+  equals(MyApp.store.commitRecords(), SC.MIXED_STATE,
+         "commiting records for an 'update' and 'create' should return %@".fmt(SC.MIXED_STATE));
+
+  MyApp.store.writeStatus(rec1.get('storeKey'), SC.Record.READY_CLEAN);
+  MyApp.store.writeStatus(rec2.get('storeKey'), SC.Record.READY_CLEAN);
+
+  rec1.destroy();
+  rec2.set('one', 1);
+  rec3 = MyApp.store.createRecord(MyApp.Foo, {});
+
+  equals(MyApp.store.commitRecords(), SC.MIXED_STATE,
+         "commiting records for an 'update', 'create', and 'destroy' should return %@".fmt(SC.MIXED_STATE));
+});
+
+test("The dataSource will return NO when all records committed return NO", function () {
+  var ds = MyApp.DataSource.create({
+    createRecord: function () { return NO; },
+    updateRecord: function () { return NO; },
+    destroyRecord: function () { return NO; }
+  });
+  MyApp.store.set('dataSource', ds);
+
+  var rec1 = MyApp.store.createRecord(MyApp.Foo, {}),
+      rec2, rec3;
+
+  equals(MyApp.store.commitRecords(), NO,
+         "commiting a single new record should return NO");
+
+  MyApp.store.writeStatus(rec1.get('storeKey'), SC.Record.READY_CLEAN);
+
+  rec1.set('zero', 0);
+  rec2 = MyApp.store.createRecord(MyApp.Foo, {});
+
+  equals(MyApp.store.commitRecords(), NO,
+         "commiting records for an 'update' and 'create' should return NO");
+
+  MyApp.store.writeStatus(rec1.get('storeKey'), SC.Record.READY_CLEAN);
+  MyApp.store.writeStatus(rec2.get('storeKey'), SC.Record.READY_CLEAN);
+
+  rec1.destroy();
+  rec2.set('one', 1);
+  rec3 = MyApp.store.createRecord(MyApp.Foo, {});
+
+  equals(MyApp.store.commitRecords(), NO,
+         "commiting records for an 'update', 'create', and 'destroy' should return NO");
+});