Use built-in promises

package.json

@@ -69,8 +69,7 @@
     "istanbul": "~0.1.45",
     "coveralls": "~2.7.1",
     "async": "~0.2.10",
-    "coffee-script": "~1.7.1",
-    "q": "~1.0.0"
+    "coffee-script": "~1.7.1"
   },
   "keywords": [
     "mysql",

test/sequelize.transaction.test.js

@@ -119,127 +119,34 @@ describe(Support.getTestDialectTeaser("Sequelize#transaction"), function () {
 
   describe('complex long running example', function() {
     it("works", function(done) {
-      var Q = require('q'),
-          http = require('http'),
-          sequelize = this.sequelize,
-
-          properties = {
-              id : {type : Support.Sequelize.INTEGER, primaryKey : true, autoIncrement : true},
-              name : { type : Support.Sequelize.STRING }
-          },
-
-          Test = sequelize.define('Test', properties);
-
-      function createTable() {
-          var deferred = Q.defer();
-
-          sequelize.sync({ force: true }).success(function () {
-              console.info('Database: created table');
-              deferred.resolve();
-          }).error(function (error) {
-              console.error(error);
-              deferred.reject();
-          });
-
-          return deferred.promise;
-      }
-
-      function createUser(transaction) {
-          var deferred = Q.defer();
-
-          Test.create({name: 'Peter'}, {transaction: transaction})
-              .success(function (createdUser) {
-                  console.info('Database: created new user');
-                  deferred.resolve(createdUser);
-              }).error(function (error) {
-                  console.error(error);
-                  deferred.reject();
-              });
-
-          return deferred.promise;
-      }
-
-      function foobarbaz(u) {
-          var deferred = Q.defer();
-
-          setTimeout(function() { deferred.resolve() }, 1000)
-
-          // http.get("http://mandrillapp.com/api/1.0/messages/send-template.json", function (response) {
-          //     console.log("Got response: " + response.statusCode);
-          //     deferred.resolve(u);
-          // }).on('error', function (e) {
-          //     console.log("Got error: " + e.message);
-          //     deferred.reject();
-          // });
-
-          return deferred.promise;
-      }
-
-      function doStuff(transaction) {
-          return createUser(transaction)
-              .then(function() { return readTests('Before http call without transaction') })
-              .then(function() { return readTests('Before http call with transaction', transaction) })
-              .then(function(){ return foobarbaz() })
-              .then(function() { return readTests('Directly after http call without transaction') })
-              .then(function() { return readTests('Directly after http call with transaction', transaction) })
-
-      }
-
-      function readTests(msg, transaction) {
-          var deferred = Q.defer()
-
-          console.log("-", msg)
-
-          Test.count({ transaction: transaction }).done(function(err, count) {
-              console.log(err, count)
-              !!err ? deferred.reject() : deferred.resolve()
-          })
-
-          return deferred.promise
-      }
-
-      function run() {
-          var deferred = Q.defer();
+      var sequelize   = this.sequelize
 
-          sequelize.transaction(function (transaction) {
-              transaction.done(function() {
-                  console.log()
-                  console.log('xxxxxxxxx transaction has been executed')
-                  console.log()
-              })
+      var Test = sequelize.define('Test', {
+        id:   { type: Support.Sequelize.INTEGER, primaryKey: true, autoIncrement: true},
+        name: { type: Support.Sequelize.STRING }
+      })
 
-              doStuff(transaction)
-                  .then(function() { return readTests('After the http call without transaction') })
-                  .then(function() { return readTests('After the http call with transaction', transaction) })
-                  .then(function (result) {
-                      transaction.commit().success(function () {
-                          console.log('Commit!');
-                          deferred.resolve();
-                      });
-                  })
-                  .fail(function (error) {
-                      transaction.rollback().success(function () {
-                          console.log('Rollback!');
-                          deferred.reject();
-                      });
-                  });
-          });
-
-          return deferred.promise;
-      }
-
-      createTable()
-          .then(function() { return readTests('After table creation without transaction') })
-          .then(run)
-          .then(function() { return readTests('After committing the transaction') })
-          .done(function () {
-              Test.all().success(function(tasks) {
-                expect(tasks.length).to.equal(1)
-                console.log('Done!');
-                done()
+      sequelize
+        .sync({ force: true })
+        .then(function() {
+          sequelize.transaction(function(transaction) {
+            Test
+              .create({ name: 'Peter' }, { transaction: transaction })
+              .then(function() {
+                setTimeout(function() {
+                  transaction
+                    .commit()
+                    .then(function() {
+                      return Test.count({ transaction: transaction })
+                    })
+                    .then(function(count) {
+                      expect(count).to.equal(1)
+                      done()
+                    })
+                }, 1000)
               })
-          });
-
+          })
+        })
     })
   })
 })