Patch 1

ampersand-collection.js

@@ -38,8 +38,8 @@ assign(Collection.prototype, AmpersandEvents, {
     // overridable serialize method
     serialize: function () {
         return this.map(function (model) {
-            if (model.serialize) {
-                return model.serialize();
+            if (model.toJSON) {
+                return model.toJSON();
             } else {
                 var out = {};
                 assign(out, model);

test/main.js

@@ -522,3 +522,35 @@ test('Collection should rethrow change events on a model', function (t) {
 
     model.name = 'shmoe';
 });
+
+test('Collection should call toJSON-func on a model during it\' own serialize-func', function (t) {
+    var MyChild = State.extend({
+        props: {
+            test1: ['boolean', true, true],
+        },
+        session: {
+            check: ['boolean', true, false],
+        },
+        toJSON: function () {
+            this.check = true;
+            return this.serialize();
+        }
+    });
+    var MyCollection = Collection.extend({
+        model: MyChild
+    });
+
+    var a = new MyCollection([{
+        test1: true
+    },{
+        test1: true
+    }]);
+    var json = a.toJSON();
+
+    t.equal(a.models[0].check, true);
+    t.equal(a.models[1].check, true);
+    t.deepEqual(json[0],a.models[0].serialize());
+    t.deepEqual(json[1],a.models[1].serialize());
+
+    t.end();
+});