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

Commit 6087e907 by Ruben Bridgewater

Use then instead of done

1 parent 5207a136
Showing with 5 additions and 5 deletions
...@@ -761,7 +761,7 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -761,7 +761,7 @@ describe(Support.getTestDialectTeaser('Model'), function() {
it('should return a DAO when queryOptions are not set', function() { it('should return a DAO when queryOptions are not set', function() {
var self = this; var self = this;
return this.User.findAll({ where: { username: 'barfooz'}}).done(function(err, users) { return this.User.findAll({ where: { username: 'barfooz'}}).then(function(users) {
users.forEach(function(user) { users.forEach(function(user) {
expect(user).to.be.instanceOf(self.User.DAO); expect(user).to.be.instanceOf(self.User.DAO);
}); });
...@@ -770,7 +770,7 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -770,7 +770,7 @@ describe(Support.getTestDialectTeaser('Model'), function() {
it('should return a DAO when raw is false', function() { it('should return a DAO when raw is false', function() {
var self = this; var self = this;
return this.User.findAll({ where: { username: 'barfooz'}}, { raw: false }).done(function(err, users) { return this.User.findAll({ where: { username: 'barfooz'}}, { raw: false }).then(function(users) {
users.forEach(function(user) { users.forEach(function(user) {
expect(user).to.be.instanceOf(self.User.DAO); expect(user).to.be.instanceOf(self.User.DAO);
}); });
...@@ -779,7 +779,7 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -779,7 +779,7 @@ describe(Support.getTestDialectTeaser('Model'), function() {
it('should return raw data when raw is true', function() { it('should return raw data when raw is true', function() {
var self = this; var self = this;
return this.User.findAll({ where: { username: 'barfooz'}}, { raw: true }).done(function(err, users) { return this.User.findAll({ where: { username: 'barfooz'}}, { raw: true }).then(function(users) {
users.forEach(function(user) { users.forEach(function(user) {
expect(user).to.not.be.instanceOf(self.User.DAO); expect(user).to.not.be.instanceOf(self.User.DAO);
expect(users[0]).to.be.instanceOf(Object); expect(users[0]).to.be.instanceOf(Object);
...@@ -880,7 +880,7 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -880,7 +880,7 @@ describe(Support.getTestDialectTeaser('Model'), function() {
}); });
it('includes all nested associations', function() { it('includes all nested associations', function() {
return this.Continent.findAll({ include: [{ all: true, nested: true }] }).done(function(err, continents) { return this.Continent.findAll({ include: [{ all: true, nested: true }] }).then(function(continents) {
expect(continents).to.exist; expect(continents).to.exist;
expect(continents[0]).to.exist; expect(continents[0]).to.exist;
expect(continents[0].countries).to.exist; expect(continents[0].countries).to.exist;
...@@ -1241,7 +1241,7 @@ describe(Support.getTestDialectTeaser('Model'), function() { ...@@ -1241,7 +1241,7 @@ describe(Support.getTestDialectTeaser('Model'), function() {
name: Sequelize.STRING name: Sequelize.STRING
}); });
return Company.sync().done(function() { return Company.sync().then(function() {
return Company.findAll({ return Company.findAll({
order: [self.sequelize.col('name')] order: [self.sequelize.col('name')]
}); });
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!