不要怂,就是干,撸起袖子干!

Commit 19cf1494 by Ruben Bridgewater

Refactor more tests to use promises and remove unused async from tests

1 parent 6087e907
...@@ -7,7 +7,6 @@ var chai = require('chai') ...@@ -7,7 +7,6 @@ var chai = require('chai')
, Support = require(__dirname + '/support') , Support = require(__dirname + '/support')
, DataTypes = require(__dirname + '/../../lib/data-types') , DataTypes = require(__dirname + '/../../lib/data-types')
, datetime = require('chai-datetime') , datetime = require('chai-datetime')
, async = require('async')
, _ = require('lodash') , _ = require('lodash')
, dialect = Support.getTestDialect(); , dialect = Support.getTestDialect();
......
...@@ -6,8 +6,7 @@ var chai = require('chai') ...@@ -6,8 +6,7 @@ var chai = require('chai')
, Sequelize = require(__dirname + '/../../../index') , Sequelize = require(__dirname + '/../../../index')
, Promise = Sequelize.Promise , Promise = Sequelize.Promise
, DataTypes = require(__dirname + '/../../../lib/data-types') , DataTypes = require(__dirname + '/../../../lib/data-types')
, datetime = require('chai-datetime') , datetime = require('chai-datetime');
, async = require('async');
chai.use(datetime); chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
...@@ -215,7 +214,7 @@ describe(Support.getTestDialectTeaser('Include'), function() { ...@@ -215,7 +214,7 @@ describe(Support.getTestDialectTeaser('Include'), function() {
return model.create(values).then(function (instance) { return model.create(values).then(function (instance) {
if (previousInstance) { if (previousInstance) {
return previousInstance['set'+ Sequelize.Utils.uppercaseFirst(model.name)](instance).then(function() { return previousInstance['set'+ Sequelize.Utils.uppercaseFirst(model.name)](instance).then(function() {
previousInstance = instance; previousInstance = instance;
}); });
} else { } else {
previousInstance = b = instance; previousInstance = b = instance;
...@@ -275,7 +274,7 @@ describe(Support.getTestDialectTeaser('Include'), function() { ...@@ -275,7 +274,7 @@ describe(Support.getTestDialectTeaser('Include'), function() {
Post.belongsTo(User, { foreignKey: 'owner_id', as: 'Owner', constraints: false }); Post.belongsTo(User, { foreignKey: 'owner_id', as: 'Owner', constraints: false });
return this.sequelize.sync({force: true}).then(function () { return this.sequelize.sync({force: true}).then(function () {
return User.find({ return User.find({
where: { id: 2 }, where: { id: 2 },
include: [ include: [
{ model: Post, as: 'UserPosts', where: {"private": true} } { model: Post, as: 'UserPosts', where: {"private": true} }
......
...@@ -10,7 +10,6 @@ var chai = require('chai') ...@@ -10,7 +10,6 @@ var chai = require('chai')
, datetime = require('chai-datetime') , datetime = require('chai-datetime')
, _ = require('lodash') , _ = require('lodash')
, moment = require('moment') , moment = require('moment')
, async = require('async')
, current = Support.sequelize; , current = Support.sequelize;
chai.use(datetime); chai.use(datetime);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!