Hotfix and refactor more tests

test/integration/dialects/mysql/connector-manager.test.js

@@ -10,25 +10,24 @@ chai.config.includeStack = true;
 
 
 if (Support.dialectIsMySQL()) {
 if (Support.dialectIsMySQL()) {
   describe('[MYSQL Specific] Connector Manager', function() {
   describe('[MYSQL Specific] Connector Manager', function() {
-    it('works correctly after being idle', function(done) {
+    it('works correctly after being idle', function() {
       var User = this.sequelize.define('User', { username: DataTypes.STRING })
       var User = this.sequelize.define('User', { username: DataTypes.STRING })
         , spy = sinon.spy();
         , spy = sinon.spy();
 
 
-      User.sync({force: true}).then(function() {
-        User.create({username: 'user1'}).then(function() {
-          User.count().then(function(count) {
+      return User.sync({force: true}).then(function() {
+        return User.create({username: 'user1'}).then(function() {
+          return User.count().then(function(count) {
             expect(count).to.equal(1);
             expect(count).to.equal(1);
             spy();
             spy();
-
-            setTimeout(function() {
-              User.count().then(function(count) {
+            return this.sequelize.Promise.delay(1000).then(function() {
+              return User.count().then(function(count) {
                 expect(count).to.equal(1);
                 expect(count).to.equal(1);
                 spy();
                 spy();
-                if (spy.calledTwice) {
-                  done();
+                if (!spy.calledTwice) {
+                  throw new Error('Spy was not called twice');
                 }
                 }
               });
               });
-            }, 1000);
+            });
           });
           });
         });
         });
       });
       });

test/integration/model/find.test.js

@@ -260,7 +260,7 @@ describe(Support.getTestDialectTeaser('Model'), function() {
           , count = 0;
           , count = 0;
 
 
         return this.User.bulkCreate([{username: 'jack'}, {username: 'jack'}]).then(function() {
         return this.User.bulkCreate([{username: 'jack'}, {username: 'jack'}]).then(function() {
-          return this.sequelize.Promise.map(permutations, function(perm) {
+          return self.sequelize.Promise.map(permutations, function(perm) {
             return self.User.find(perm).then(function(user) {
             return self.User.find(perm).then(function(user) {
               expect(user).to.be.null;
               expect(user).to.be.null;
               count++;
               count++;
@@ -297,7 +297,7 @@ describe(Support.getTestDialectTeaser('Model'), function() {
         self.Task = self.sequelize.define('Task', { title: Sequelize.STRING });
         self.Task = self.sequelize.define('Task', { title: Sequelize.STRING });
         self.Worker = self.sequelize.define('Worker', { name: Sequelize.STRING });
         self.Worker = self.sequelize.define('Worker', { name: Sequelize.STRING });
 
 
-        return this.init = function(callback) {
+        this.init = function(callback) {
           return self.sequelize.sync({ force: true }).then(function() {
           return self.sequelize.sync({ force: true }).then(function() {
             return self.Worker.create({ name: 'worker' }).then(function(worker) {
             return self.Worker.create({ name: 'worker' }).then(function(worker) {
               return self.Task.create({ title: 'homework' }).then(function(task) {
               return self.Task.create({ title: 'homework' }).then(function(task) {