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

Commit 35919254 by Mick Hansen

Move schema tests around

1 parent e16a26f7
...@@ -20,13 +20,10 @@ var sortById = function(a, b) { ...@@ -20,13 +20,10 @@ var sortById = function(a, b) {
return a.id < b.id ? -1 : 1 return a.id < b.id ? -1 : 1
} }
if (dialect.match(/^postgres/)) { describe(Support.getTestDialectTeaser("Includes with schemas"), function () {
describe(Support.getTestDialectTeaser("Schema Based PG Include"), function () {
describe('findAll', function () { describe('findAll', function () {
beforeEach(function () { beforeEach(function () {
var self = this var self = this
this.sequelize.options.logging = console.log
this.fixtureA = function(done) { this.fixtureA = function(done) {
self.sequelize.dropAllSchemas().success(function(){ self.sequelize.dropAllSchemas().success(function(){
self.sequelize.createSchema("account").success(function(){ self.sequelize.createSchema("account").success(function(){
...@@ -243,13 +240,7 @@ if (dialect.match(/^postgres/)) { ...@@ -243,13 +240,7 @@ if (dialect.match(/^postgres/)) {
) )
}] }]
}, done.bind(this)) }, done.bind(this))
}).error(function(err) { }).error(done)
console.log("e: ", err)
}).success(function(s) {
console.log("s: ", s)
}).sql(function(sql) {
console.log("sql: ", sql)
})
}) })
}) })
} }
...@@ -1405,7 +1396,6 @@ it('should be possible to extend the on clause with a where option on a hasOne i ...@@ -1405,7 +1396,6 @@ it('should be possible to extend the on clause with a where option on a hasOne i
}) })
}) })
/
it('should be possible use limit, attributes and a where on a belongsTo with additional hasMany includes', function (done) { it('should be possible use limit, attributes and a where on a belongsTo with additional hasMany includes', function (done) {
var self = this var self = this
this.fixtureA(function () { this.fixtureA(function () {
...@@ -1526,5 +1516,4 @@ it('should be possible to extend the on clause with a where option on a hasOne i ...@@ -1526,5 +1516,4 @@ it('should be possible to extend the on clause with a where option on a hasOne i
}) })
}) })
}) })
} \ No newline at end of file
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!