sproutcore 1.10.3.1 → 1.11.0.rc1

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_array_complex.js

@@ -3,6 +3,7 @@
  *
  * @author Evin Grano
  */
+/*global same, equals, ok, test, module*/
 
 // ..........................................................
 // Basic Set up needs to move to the setup and teardown
@@ -301,7 +302,7 @@ test("Basic Write: Testing the Second Child Array", function() {
   ppl = testParent.get('people');
   p = ppl.objectAt(0);
   addrs = p.get('addresses');
-  a = addrs.objectAt('0');
+  a = addrs.objectAt(0);
 
   // New do the test on the address
   a.set('street', '123 New Street');
@@ -412,17 +413,48 @@ test("Basic Array Functionality: popObject", function() {
   same(pplAttr[1], pLast.get('attributes'), "verify that parent attributes are the same as the last individual child attributes");
 });
 
-test("Basic Array Functionality: shiftObject", function() {
-  var ppl, p;
+test("Basic Array Functionality: shiftObject access first", function() {
+  var ppl, p, removed, first, second;
   // Add something to the array
   ppl = testParent.get('people');
-  // PushObject Tests
-  ppl.shiftObject();
+
+  SC.run(function () {
+    first = ppl.objectAt(0);
+    second = ppl.objectAt(1);
+    equals(first.get('name'), 'Barack Obama', "The first instance has the name");
+    equals(second.get('name'), 'John Doe', "The second instance has the name");
+    removed = ppl.shiftObject();
+    equals(ppl.get('length'), 2, "after shiftObject() on parent, check that the length of the array of child records is 2");
+  });
+
+  SC.run(function () {
+    p = ppl.objectAt(0);
+    equals(removed.get('name'), 'Barack Obama', "The removed object should have name");
+    equals(p.get('name'), 'John Doe', "The new first instance should have name");
+    equals(first.get('name'), 'Barack Obama', "The previous instance should still have the name");
+    equals(second.get('name'), 'John Doe', "The previous instance should still have the name");
+    ok(testParent.get('status') & SC.Record.DIRTY, 'check that the parent record is dirty');
+  });
+});
+
+test("Basic Array Functionality: shiftObject access after", function() {
+  var ppl, p, removed, first, second;
+  // Add something to the array
   ppl = testParent.get('people');
-  equals(ppl.get('length'), 2, "after shiftObject() on parent, check that the length of the array of child records is 2");
-  p = ppl.objectAt('0');
-  equals(p.get('name'), 'John Doe', "after a shiftObject on parent, check to see if it has all the right values for the attributes");
-  ok(testParent.get('status') & SC.Record.DIRTY, 'check that the parent record is dirty');
+
+  SC.run(function () {
+    removed = ppl.shiftObject();
+    equals(ppl.get('length'), 2, "after shiftObject() on parent, check that the length of the array of child records is 2");
+  });
+
+  SC.run(function () {
+    first = ppl.objectAt(0);
+    second = ppl.objectAt(1);
+    equals(removed.get('name'), 'Barack Obama', "The removed object should have name");
+    equals(first.get('name'), 'John Doe', "The new first instance should have name");
+    equals(second.get('name'), 'Jane Doe', "The new second instance should have name");
+    ok(testParent.get('status') & SC.Record.DIRTY, 'check that the parent record is dirty');
+  });
 });
 
 test("Basic Array Functionality: unshiftObject", function() {
@@ -430,10 +462,15 @@ test("Basic Array Functionality: unshiftObject", function() {
   // Add something to the array
   ppl = testParent.get('people');
   // PushObject Tests
-  ppl.unshiftObject(personData1);
+  SC.run(function () {
+    ppl.unshiftObject(personData1);
+  });
+
   ppl = testParent.get('people');
   equals(ppl.get('length'), 4, "after unshiftObject() on parent, check that the length of the array of child records is 4");
-  p = ppl.objectAt(0);
+  SC.run(function () {
+    p = ppl.objectAt(0);
+  });
   ok(SC.kindOf(p, SC.Record), "check that newly added ChildRecord creates an actual instance that is a kind of a SC.Record Object");
   ok(SC.instanceOf(p, NestedRecord.Person), "check that newly added ChildRecord creates an actual instance of a Person Object");
   equals(p.get('name'), 'Testikles, God Of Fertility', "after a pushObject on parent, check to see if it has all the right values for the attributes");
@@ -443,8 +480,10 @@ test("Basic Array Functionality: unshiftObject", function() {
   // Verify the Attrs
   pplAttr = testParent.readAttribute('people');
   equals(pplAttr.length, 4, "after unshiftObject() on parent, check that the length of the attribute array of child records is 4");
-  pFirst = ppl.objectAt(0);
-  pLast = ppl.objectAt(3);
+  SC.run(function () {
+    pFirst = ppl.objectAt(0);
+    pLast = ppl.objectAt(3);
+  });
   same(pplAttr[0], pFirst.get('attributes'), "verify that parent attributes are the same as the first individual child attributes");
   same(pplAttr[3], pLast.get('attributes'), "verify that parent attributes are the same as the last individual child attributes");
 });
@@ -453,11 +492,12 @@ test("Test: normalization on complex nested records", function() {
   var ppl, addresses, pAttrs;
   // Add something to the array
   ppl = testParent.get('people');
-  addresses = ppl.objectAt(0).get('addresses');
 
-  // PushObject Tests
-  addresses.pushObject({ type: 'Address', street: '2 Main Street', city: 'Awesome'});
-  testParent.normalize();
+  SC.run(function () {
+    addresses = ppl.objectAt(0).get('addresses');
+    addresses.pushObject({ type: 'Address', street: '2 Main Street', city: 'Awesome'});
+    testParent.normalize();
+  });
   pAttrs = testParent.get('attributes');
   equals(pAttrs.people[0].addresses[2].state, 'VA', "test normalization is the default value of VA");
 });

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/nested_records/nested_record_complex.js

@@ -3,6 +3,7 @@
  *
  * @author Evin Grano
  */
+ /* globals module, test, equals, same, ok */
 
 // ..........................................................
 // Basic Set up needs to move to the setup and teardown
@@ -246,6 +247,7 @@ function() {
 
   // Test Child Record creation
   oldP = testParent.get('person');
+  oldKey = oldP.get('id');
   testParent.set('person', {
     type: 'Person',
     name: 'Al Gore',
@@ -266,7 +268,6 @@ function() {
   storeRef = store.find(NestedRecord.Person, key);
   ok(storeRef, 'after a set() with an object, checking that the store has the instance of the child record with proper primary key');
   equals(p, storeRef, "after a set with an object, checking the parent reference is the same as the direct store reference");
-  oldKey = oldP.get('id');
   ok((oldKey === key), 'check to see that the old child record has the same key as the new child record');
 
   // Check for changes on the child bubble to the parent.
@@ -288,14 +289,17 @@ function() {
 
 test("Basic normalize()", function() {
   var pAttrs;
-  testParent.set('person', {
-    type: 'Person',
-    name: 'Al Gore',
-    address: {
-      type: 'Address',
-      street: '123 Crazy St',
-      city: 'Khacki Pants'
-    }
+
+  SC.run(function () {
+    testParent.set('person', {
+      type: 'Person',
+      name: 'Al Gore',
+      address: {
+        type: 'Address',
+        street: '123 Crazy St',
+        city: 'Khacki Pants'
+      }
+    });
   });
   testParent.normalize();
   pAttrs = testParent.get('attributes');

data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/polymorphism → datastore}/tests/models/polymorphism/many.js

@@ -6,10 +6,10 @@
 /*globals module ok equals same test MyApp */
 
 (function() {
-  
+
   var store, Employee, Company, Engineer, Executive, Accountant, Other,
       strobe, colin, charles, matt, yehuda, erin, digits;
-  
+
   module("Polymorphic SC.Record - toMany tests", {
     setup: function() {
       SC.RunLoop.begin();

data/lib/frameworks/sproutcore/frameworks/{experimental/frameworks/polymorphism → datastore}/tests/models/polymorphism/single.js

@@ -6,9 +6,9 @@
 /*globals module ok equals same test MyApp */
 
 (function() {
-  
+
   var store, Person, Place, Male, Female, home, colin, maggie;
-  
+
   module("Polymorphic SC.Record - toOne tests", {
     setup: function() {
       SC.RunLoop.begin();
@@ -64,4 +64,14 @@
     ok(SC.kindOf(home.get('person'), Female), "Changing toOne to record of different type works");
   });
 
+  test("Requesting a specific subclass returns only that type.", function() {
+    var males = store.find(Male),
+      females = store.find(Female),
+      people = store.find(Person);
+
+    equals(males.get('length'), 1, "Only a single male record should be returned.");
+    equals(females.get('length'), 1, "Only a single female record should be returned.");
+    equals(people.get('length'), 2, "Two person records should be returned.");
+  });
+
 })();

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record/writeAttribute.js

@@ -11,17 +11,22 @@ module("SC.Record#writeAttribute", {
     SC.RunLoop.begin();
     store = SC.Store.create();
     Foo = SC.Record.extend();
-    json = { 
-      foo: "bar", 
+    json = {
+      foo: "bar",
       number: 123,
       bool: YES,
       array: [1,2,3],
       guid: 1
     };
-    
+
     foo = store.createRecord(Foo, json);
     store.writeStatus(foo.storeKey, SC.Record.READY_CLEAN);
     SC.RunLoop.end();
+  },
+
+  teardown: function () {
+    store.destroy();
+    Foo = store = json = foo = null;
   }
 });
 
@@ -37,7 +42,7 @@ test("first time writing should mark record as dirty", function() {
   // action
   foo.writeAttribute("bar", "baz");
   SC.RunLoop.end();
-  
+
   // evaluate
   equals(foo.get('status'), SC.Record.READY_DIRTY, 'should make READY_DIRTY after write');
 });
@@ -50,24 +55,24 @@ test("state change should be deferred if writing inside of a beginEditing()/endE
   SC.RunLoop.begin();
   // action
   foo.beginEditing();
-  
+
   foo.writeAttribute("bar", "baz");
-  
+
   equals(foo.get('status'), SC.Record.READY_CLEAN, 'should not change state yet');
 
   foo.endEditing();
-  
+
   SC.RunLoop.end();
-  
+
   // evaluate
   equals(foo.get('status'), SC.Record.READY_DIRTY, 'should make READY_DIRTY after write');
-  
+
 }) ;
 
 test("raises exception if you try to write an attribute before an attribute hash has been set", function() {
   store.removeDataHash(foo.storeKey);
   equals(store.readDataHash(foo.storeKey), null, 'precond - should not have store key');
-  
+
   var cnt=0 ;
   try {
     foo.writeAttribute("foo", "bar");
@@ -80,19 +85,19 @@ test("raises exception if you try to write an attribute before an attribute hash
 
 
 test("Writing to an attribute in chained store sets correct status", function() {
-  
+
   var chainedStore = store.chain() ;
-  
+
   var chainedRecord = chainedStore.find(Foo, foo.get('id'));
   equals(chainedRecord.get('status'), SC.Record.READY_CLEAN, 'precon - status should be READY_CLEAN');
-  
+
   SC.RunLoop.begin();
   chainedRecord.writeAttribute('foo', 'newValue');
   SC.RunLoop.end();
   //chainedRecord.set('foo', 'newValue');
-  
+
   equals(chainedRecord.get('status'), SC.Record.READY_DIRTY, 'status should be READY_DIRTY');
-  
+
 });
 
 

data/lib/frameworks/sproutcore/frameworks/datastore/tests/models/record_attribute.js

@@ -127,6 +127,11 @@ module("SC.RecordAttribute core methods", {
     bar = MyApp.store.find(MyApp.Bar, 'bar1');
     equals(rec.storeKey, storeKeys[0], 'should find record');
 
+  },
+
+  teardown: function () {
+    MyApp.store.destroy();
+    window.MyApp = storeKeys = rec = rec2 = rec3 = bar = null;
   }
 });
 
@@ -247,8 +252,10 @@ test("writing an attribute should make many relationship aggregate dirty" ,funct
   equals(bar.get('status'), SC.Record.READY_CLEAN, "precond - bar should be READY_CLEAN");
   equals(rec2.get('status'), SC.Record.READY_CLEAN, "precond - rec2 should be READY_CLEAN");
 
-  bar.set('city', 'Oslo');
-  bar.get('store').flush();
+  SC.run(function () {
+    bar.set('city', 'Oslo');
+    bar.get('store').flush();
+  });
 
   equals(rec.get('status'), SC.Record.READY_DIRTY, "foo1 should be READY_DIRTY");
   equals(rec2.get('status'), SC.Record.READY_DIRTY, "foo2 should be READY_DIRTY");

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

@@ -3,7 +3,7 @@
 // Copyright: ©2006-2011 Apple Inc. and contributors.
 // License:   Licensed under MIT license (see license.js)
 // ==========================================================================
-/*globals module ok equals same test MyApp */
+/*globals module, ok, equals, same, test, MyApp */
 
 // test core array-mapping methods for ManyArray
 var store, storeKey, storeId, rec, storeIds, recs, arrayRec;
@@ -84,19 +84,30 @@ test("reading past end of array length should return undefined", function() {
   equals(recs.objectAt(2000), undefined, 'recs.objectAt(2000) should be undefined');
 });
 
-test("modifying the underlying storeId should change the returned materialized record", function() {
+/** Changed in Version 1.11
+  Previously, you could modify the datahash's storeIds array directly because it was observed,
+  however the act of observing the array adds the observable properties to it, which
+  in effect alters the array. This is now prohibited and all access must be done through the
+  proper KVO channels on the ManyArray.
+  */
+test("modifying the underlying storeId should *not* change the returned materialized record", function() {
+
   // read record once to make it materialized
+  var rec2 = recs.objectAt(1);
+
   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');
+  var newRec = MyApp.store.createRecord(MyApp.Foo, { guid: 5, firstName: "Fred" });
+  var storeId2 = newRec.get('id');
 
   // add to beginning of storeKey array
   storeIds.unshiftObject(storeId2);
+  recs.recordPropertyDidChange();
+
   equals(recs.get('length'), 5, 'should now have length of 5');
-  equals(recs.objectAt(0), rec2, 'objectAt(0) should return new record');
-  equals(recs.objectAt(1), rec, 'objectAt(1) should return old record');
+  equals(recs.objectAt(0), rec, 'objectAt(0) should return the old record still');
+  equals(recs.objectAt(1), rec2, 'objectAt(1) should return the old second record still');
 });
 
 test("reading a record not loaded in store should trigger retrieveRecord", function() {
@@ -145,7 +156,13 @@ 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() {
+/** Changed in Version 1.11
+  Previously, you could modify the datahash's storeIds array directly because it was observed,
+  however the act of observing the array adds the observable properties to it, which
+  in effect alters the array. This is now prohibited and all access must be done through the
+  proper KVO channels on the ManyArray.
+  */
+test("changing the underlying storeIds should *not* notify observers of records", function() {
 
   // setup observer
   var obj = SC.Object.create({
@@ -156,9 +173,15 @@ test("changing the underlying storeIds should notify observers of records", func
 
   // now modify storeKeys
   storeIds.pushObject(5);
-  equals(obj.cnt, 1, 'observer should have fired after changing storeKeys');
+  equals(obj.cnt, 0, 'observer should not have fired after changing storeKeys directly');
 });
 
+/** Changed in Version 1.11
+  Previously, you could modify the datahash's storeIds array directly because it was observed,
+  however the act of observing the array adds the observable properties to it, which
+  in effect alters the array. This is now prohibited and all access must be done through the
+  proper KVO channels on the ManyArray.
+  */
 test("swapping storeIds array should change ManyArray and observers", function() {
 
   // setup alternate storeKeys
@@ -169,7 +192,9 @@ test("swapping storeIds array should change ManyArray and observers", function()
   // setup observer
   var obj = SC.Object.create({
     cnt: 0,
-    observer: function() { this.cnt++; }
+    observer: function() {
+      this.cnt++;
+    }
   });
   recs.addObserver('[]', obj, obj.observer);
 
@@ -180,19 +205,20 @@ test("swapping storeIds array should change ManyArray and observers", function()
   obj.cnt = 0 ;
   arrayRec.writeAttribute('fooMany', storeIds2);
 
-  SC.RunLoop.end();
   SC.RunLoop.begin();
+  SC.RunLoop.end();
 
   // verify observer fired and record changed
   equals(obj.cnt, 1, 'observer should have fired after swap');
+  equals(recs.get('length'), 1, 'should reflect new length');
   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(obj.cnt, 0, 'observer should not have fired after direct edit');
+  equals(recs.get('length'), 2, 'should reflect new length still: DANGER!');
+  equals(recs.objectAt(0), rec2, 'recs.objectAt(0) should return old rec still');
 
 });
 
@@ -214,7 +240,8 @@ test("Test that _findInsertionLocation returns the correct location.", function
 
   // Order the many array manually by firstName.
   arrayRec.set('fooMany', [3,2,1,4]);
-  recs._storeIdsContentDidChange(0, 4, 4);
+  recs._records = null;
+  recs.arrayContentDidChange(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 });
@@ -244,3 +271,42 @@ test("Test that _findInsertionLocation returns the correct location.", function
 
   equals(location, 4, "The insertion location should be");
 });
+
+// ..........................................................
+// New records
+//
+
+test("Test new record support. INCOMPLETE.", function () {
+  var newRec = MyApp.store.createRecord(MyApp.Foo, { firstName: "Adam", lastName: "Doe", age: 15 }),
+    holder = MyApp.store.find(MyApp.Foo, 50);
+
+  recs.set('supportNewRecords', false);
+  try {
+    recs.pushObject(newRec);
+    ok(false, "Should not be able to push a record without an id without supportNewRecords.");
+  } catch (ex) {
+    ok(true, "Should not be able to push a record without an id without supportNewRecords.");
+  }
+
+  recs.set('supportNewRecords', true);
+  try {
+    recs.pushObject(newRec);
+    ok(true, "Should be able to push a record without an id normally.");
+  } catch (ex) {
+    ok(false, "Should be able to push a record without an id normally.");
+  }
+
+  equals(newRec.get('id'), undefined, "The transient record should still have an undefined id.");
+  equals(recs.objectAt(4), newRec, "The transient record should be accessible in the many array.");
+  //equals(holder.get('status'), SC.Record.READY_CLEAN, "The record should not be dirtied when the transient record is added.");
+  warn("The record should not be dirtied when the transient record is added. Not yet implemented.");
+
+  SC.run(function () {
+    newRec.set('id', 200);
+  });
+
+  equals(newRec.get('id'), 200, "The post-transient record should have an id of 200.");
+  //equals(holder.get('status'), SC.Record.READY_DIRTY, "The record should be dirtied when the relationship is actually updated.");
+  warn("The record should be dirtied when the relationship is actually updated. Not yet implemented.");
+
+});