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

You need to sign in or sign up before continuing.

Updated the tests to use complete()

1 parent b62c925f
Showing with 22 additions and 24 deletions
......@@ -54,25 +54,25 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
})
it('executes a query the internal way', function(done) {
this.sequelize.query(this.insertQuery, null, { raw: true }).success(function(result) {
expect(result).toBeNull()
done()
})
.error(function(err) {
this.sequelize.query(this.insertQuery, null, { raw: true })
.complete(function(err, result) {
if (err) {
console.log(err)
expect(err).not.toBeDefined()
}
expect(err).toBeNull()
expect(result).toBeNull()
done()
})
})
it('executes a query if only the sql is passed', function(done) {
this.sequelize.query(this.insertQuery).success(function(result) {
expect(result).not.toBeDefined()
done()
})
.error(function(err) {
this.sequelize.query(this.insertQuery)
.complete(function(err, result) {
if (err) {
console.log(err)
expect(err).not.toBeDefined()
}
expect(err).toBeNull()
expect(result).not.toBeDefined()
done()
})
})
......@@ -81,13 +81,12 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
this.sequelize.query(this.insertQuery).success(function() {
this.sequelize
.query("select * from " + qq(this.User.tableName) + "")
.success(function(users) {
expect(users.map(function(u){ return u.username })).toEqual(['john'])
done()
})
.error(function(err) {
.complete(function(err, users) {
if (err) {
console.log(err)
expect(err).not.toBeDefined()
}
expect(err).toBeNull()
expect(users.map(function(u){ return u.username })).toEqual(['john'])
done()
})
}.bind(this))
......@@ -97,13 +96,12 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
this.sequelize.query(this.insertQuery).success(function() {
this.sequelize
.query("select username as " + qq("user.username") + " from " + qq(this.User.tableName) + "")
.success(function(users) {
expect(users.map(function(u){ return u.user })).toEqual([{'username':'john'}])
done()
})
.error(function(err) {
.complete(function(err, users) {
if (err) {
console.log(err)
expect(err).not.toBeDefined()
}
expect(err).toBeNull()
expect(users.map(function(u){ return u.user })).toEqual([{'username':'john'}])
done()
})
}.bind(this))
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!