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

Updated the tests to use complete()

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