Skip to content

public / sequelize

Go to a project

不要怂，就是干，撸起袖子干！

Commit 7412958b by Konstantinos Vaggelakos
Options

Updated the tests to use complete()

1 parent b62c925f
Inline Side-by-side
Showing with 22 additions and 24 deletions
spec/sequelize.spec.js
...@@ -54,25 +54,25 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { ...@@ -54,25 +54,25 @@ 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 })
expect(result).toBeNull() .complete(function(err, result) {
done() if (err) {
})
.error(function(err) {
console.log(err) console.log(err)
expect(err).not.toBeDefined() }
expect(err).toBeNull()
expect(result).toBeNull()
done() 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)
expect(result).not.toBeDefined() .complete(function(err, result) {
done() if (err) {
})
.error(function(err) {
console.log(err) console.log(err)
expect(err).not.toBeDefined() }
expect(err).toBeNull()
expect(result).not.toBeDefined()
done() done()
}) })
}) })
...@@ -81,13 +81,12 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { ...@@ -81,13 +81,12 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
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) {
expect(users.map(function(u){ return u.username })).toEqual(['john']) if (err) {
done()
})
.error(function(err) {
console.log(err) console.log(err)
expect(err).not.toBeDefined() }
expect(err).toBeNull()
expect(users.map(function(u){ return u.username })).toEqual(['john'])
done() done()
}) })
}.bind(this)) }.bind(this))
...@@ -97,13 +96,12 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() { ...@@ -97,13 +96,12 @@ describe(Helpers.getTestDialectTeaser("Sequelize"), function() {
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) {
expect(users.map(function(u){ return u.user })).toEqual([{'username':'john'}]) if (err) {
done()
})
.error(function(err) {
console.log(err) console.log(err)
expect(err).not.toBeDefined() }
expect(err).toBeNull()
expect(users.map(function(u){ return u.user })).toEqual([{'username':'john'}])
done() 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!