reworked to use promises

test/include/findAll.test.js

@@ -254,56 +254,64 @@ describe(Support.getTestDialectTeaser("Include"), function () {
       Product.hasMany(Tag, {through: ProductTag})
       Product.hasMany(Tag, {through: ProductTag})
       Tag.hasMany(Product, {through: ProductTag})
       Tag.hasMany(Product, {through: ProductTag})
 
 
-      this.sequelize.sync({force: true}).done(function () {
-        async.auto({
-          sets: function(callback) {
-            Set.bulkCreate([
+      this.sequelize.sync({force: true}).then(function () {
+
+        return Set.bulkCreate([
                        {title: 'office'}
                        {title: 'office'}
-            ]).done(function () {
-              Set.findAll().done(callback)
-            })
-          },
-          products: function (callback) {
-            Product.bulkCreate([
+        ])
+        .then( function() {
+          return Product.bulkCreate([
                              {title: 'Chair'},
                              {title: 'Chair'},
                              {title: 'Desk'},
                              {title: 'Desk'},
                              {title: 'Dress'}
                              {title: 'Dress'}
-            ]).done(function () {
-              Product.findAll().done(callback)
+          ])
         })
         })
-          },
-          tags: function(callback) {
-            Tag.bulkCreate([
+        .then( function() {
+          return Tag.bulkCreate([
                          {name: 'A'},
                          {name: 'A'},
                          {name: 'B'},
                          {name: 'B'},
                          {name: 'C'}
                          {name: 'C'}
           ]).done(function () {
           ]).done(function () {
-              Tag.findAll().done(callback)
+            return Tag.findAll()
           })
           })
-          },
-          productSets: ['sets','products', function(callback, results) {
-            var chainer = new Sequelize.Utils.QueryChainer()
-            chainer.add(results.sets[0].addProduct(results.products[0]))
-            chainer.add(results.sets[0].addProduct(results.products[1]))
-            chainer.run().done(callback)
-          }],
-          productTags: ['products', 'tags', function (callback, results) {
-            var chainer = new Sequelize.Utils.QueryChainer()
-            chainer.add(results.products[0].addTag(results.tags[0], {priority: 1}))
-            chainer.add(results.products[0].addTag(results.tags[1], {priority: 2}))
-
-            chainer.add(results.products[1].addTag(results.tags[1], {priority: 1}))
-
-            chainer.add(results.products[2].addTag(results.tags[0], {priority: 3}))
-            chainer.add(results.products[2].addTag(results.tags[1], {priority: 1}))
-            chainer.add(results.products[2].addTag(results.tags[2], {priority: 2}))
-
-            chainer.run().done(callback)
-          }]
-        }, function (err) {
-          expect(err).not.to.be.ok
-
-          Set.findAll({
+        })
+        .then(function() {
+          return Set.findAll()
+        })
+        .then(function(sets) {
+          return [sets, Product.findAll()]
+        })
+        .spread( function(sets, products) {
+          return sets[0].addProduct(products[0])
+          .then( function() {
+            return sets[0].addProduct(products[1])
+          }).then( function() {
+            return [sets, products]
+          })
+        })
+        .spread( function(sets, products) {
+          return [sets, products, Tag.findAll()]
+        })
+        .spread( function(sets, products, tags) {
+          return products[0].addTag(tags[0], {priority:1})
+          .then( function() {
+            return products[0].addTag(tags[1], {priority:2})
+          })
+          .then( function() {
+            return products[0].addTag(tags[2], {priority:1})
+          })
+          .then( function() {
+            return products[1].addTag(tags[1], {priority:2})
+          })
+          .then( function() {
+            return products[2].addTag(tags[1], {priority:3})
+          })
+          .then( function() {
+            return products[2].addTag(tags[2], {priority:0})
+          })
+        })
+        .then( function() {
+          return Set.findAll({
             include: [
             include: [
               {
               {
               model: Product,
               model: Product,
@@ -313,18 +321,19 @@ describe(Support.getTestDialectTeaser("Include"), function () {
                 where: {
                 where: {
                   name: 'A'
                   name: 'A'
                 }
                 }
-                  }
-                ]
+              }]
             }],
             }],
             limit: 1
             limit: 1
-          }).done(function (err, products) {
-            expect(err).not.to.be.ok
+          })
+        })
+        .then( function() {
           done()
           done()
         })
         })
+        .catch(function (err) {
+            expect(err).not.to.be.ok
+            done()
           })
           })
         })
         })
-
-
       })
       })
     it('should support an include with multiple different association types', function (done) {
     it('should support an include with multiple different association types', function (done) {
       var User = this.sequelize.define('User', {})
       var User = this.sequelize.define('User', {})