Skip to content

public / sequelize

Go to a project

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

Commit 3569c7c6 by Mick Hansen
Options

move a bunch of tests around

1 parent 870572b6
Inline Side-by-side
Showing with 35 additions and 158 deletions
test/mysql/associations.test.js → test/dialects/mysql/associations.test.js
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, DataTypes = require(__dirname + "/../../lib/data-types") , DataTypes = require(__dirname + "/../../../lib/data-types")
chai.config.includeStack = true chai.config.includeStack = true
......
test/mysql/connector-manager.test.js → test/dialects/mysql/connector-manager.test.js
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, sinon = require('sinon') , sinon = require('sinon')
, DataTypes = require(__dirname + "/../../lib/data-types") , DataTypes = require(__dirname + "/../../../lib/data-types")
chai.config.includeStack = true chai.config.includeStack = true
......
test/mysql/dao-factory.test.js → test/dialects/mysql/dao-factory.test.js
/* jshint camelcase: false */ /* jshint camelcase: false */
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, DataTypes = require(__dirname + "/../../lib/data-types") , DataTypes = require(__dirname + "/../../../lib/data-types")
, config = require(__dirname + "/../config/config") , config = require(__dirname + "/../../config/config")
chai.config.includeStack = true chai.config.includeStack = true
......
test/mysql/query-generator.test.js → test/dialects/mysql/query-generator.test.js
...@@ -5,7 +5,7 @@ var chai = require('chai') ...@@ -5,7 +5,7 @@ var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../support')
, _ = require('lodash') , _ = require('lodash')
, QueryGenerator = require("../../lib/dialects/mysql/query-generator") , QueryGenerator = require("../../../lib/dialects/mysql/query-generator")
chai.config.includeStack = true chai.config.includeStack = true
......
test/postgres/associations.test.js → test/dialects/postgres/associations.test.js
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, config = require(__dirname + '/../config/config') , config = require(__dirname + '/../../config/config')
, DataTypes = require(__dirname + "/../../lib/data-types") , DataTypes = require(__dirname + "/../../../lib/data-types")
chai.config.includeStack = true chai.config.includeStack = true
......
test/postgres/dao.test.js → test/dialects/postgres/dao.test.js
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, DataTypes = require(__dirname + "/../../lib/data-types") , DataTypes = require(__dirname + "/../../../lib/data-types")
, _ = require('lodash') , _ = require('lodash')
, sequelize = require(__dirname + '/../../lib/sequelize'); , sequelize = require(__dirname + '/../../../lib/sequelize');
chai.config.includeStack = true chai.config.includeStack = true
......
test/postgres/hstore.test.js → test/dialects/postgres/hstore.test.js
/* jshint camelcase: false */ /* jshint camelcase: false */
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, hstore = require("../../lib/dialects/postgres/hstore") , hstore = require("../../../lib/dialects/postgres/hstore")
chai.config.includeStack = true chai.config.includeStack = true
......
test/postgres/query-generator.test.js → test/dialects/postgres/query-generator.test.js
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
/* jshint camelcase: false */ /* jshint camelcase: false */
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, QueryGenerator = require("../../lib/dialects/postgres/query-generator") , QueryGenerator = require("../../../lib/dialects/postgres/query-generator")
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, DataTypes = require(__dirname + "/../../lib/data-types") , DataTypes = require(__dirname + "/../../../lib/data-types")
, moment = require('moment') , moment = require('moment')
, util = require("util") , util = require("util")
, _ = require('lodash'); , _ = require('lodash');
......
test/sqlite/dao-factory.test.js → test/dialects/sqlite/dao-factory.test.js
/* jshint camelcase: false */ /* jshint camelcase: false */
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, DataTypes = require(__dirname + "/../../lib/data-types") , DataTypes = require(__dirname + "/../../../lib/data-types")
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, dbFile = __dirname + '/test.sqlite' , dbFile = __dirname + '/test.sqlite'
, storages = [dbFile] , storages = [dbFile]
......
test/sqlite/dao.test.js → test/dialects/sqlite/dao.test.js
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, DataTypes = require(__dirname + "/../../lib/data-types") , DataTypes = require(__dirname + "/../../../lib/data-types")
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
chai.config.includeStack = true chai.config.includeStack = true
......
test/sqlite/query-generator.test.js → test/dialects/sqlite/query-generator.test.js
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
var chai = require('chai') var chai = require('chai')
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../../support')
, DataTypes = require(__dirname + "/../../lib/data-types") , DataTypes = require(__dirname + "/../../../lib/data-types")
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, util = require("util") , util = require("util")
, _ = require('lodash') , _ = require('lodash')
, moment = require('moment') , moment = require('moment')
, QueryGenerator = require("../../lib/dialects/sqlite/query-generator"); , QueryGenerator = require("../../../lib/dialects/sqlite/query-generator");
chai.config.includeStack = true; chai.config.includeStack = true;
......
test/emitters/custom-event-emitter.test.js deleted 100644 → 0
/* jshint camelcase: false */
var chai = require('chai')
, expect = chai.expect
, Support = require(__dirname + '/../support')
, sinon = require('sinon')
, CustomEventEmitter = require("../../lib/emitters/custom-event-emitter")
chai.config.includeStack = true
describe(Support.getTestDialectTeaser("CustomEventEmitter"), function () {
describe("proxy", function () {
it("should correctly work with success listeners", function(done) {
var emitter = new CustomEventEmitter()
, proxy = new CustomEventEmitter()
, success = sinon.spy()
emitter.success(success)
proxy.success(function () {
process.nextTick(function () {
expect(success.called).to.be.true
done()
})
})
proxy.proxy(emitter)
proxy.emit('success')
})
it("should correctly work with error listeners", function(done) {
var emitter = new CustomEventEmitter()
, proxy = new CustomEventEmitter()
, error = sinon.spy()
emitter.error(error)
proxy.error(function() {
process.nextTick(function() {
expect(error.called).to.be.true
done()
})
})
proxy.proxy(emitter)
proxy.emit('error')
})
it("should correctly work with complete/done listeners", function(done) {
var emitter = new CustomEventEmitter()
, proxy = new CustomEventEmitter()
, complete = sinon.spy()
emitter.complete(complete)
proxy.complete(function() {
process.nextTick(function() {
expect(complete.called).to.be.true
done()
})
})
proxy.proxy(emitter)
proxy.emit('success')
})
})
describe("when emitting an error event with an array of errors", function() {
describe("if no error handler is given", function() {
it("should throw the first error", function(done) {
var emitter = new CustomEventEmitter()
expect(function () {
emitter.emit("error", [
[
new Error("First error"),
new Error("Second error")
], [
new Error("Third error")
]
])
}).to.throw("First error")
done()
})
})
describe("if an error handler is given", function() {
it("should return the whole array", function(done) {
var emitter = new CustomEventEmitter()
var errors = [
[
new Error("First error"),
new Error("Second error")
], [
new Error("Third error")
]
]
emitter.error(function (err) {
expect(err).to.equal(errors)
done()
})
emitter.emit("error", errors)
})
})
})
describe("when emitting an error event with a hash containing arrays of error strings", function() {
describe("if no error handler is given", function() {
it("should throw an error with the first error string", function(done) {
var emitter = new CustomEventEmitter()
var errors = {
myValidation: [ "Invalid Length" ],
someOtherValidation: [ "Naah don't like that value!", "It's weird, u know?" ]
}
expect(function () {
emitter.emit("error", errors)
}).to.throw(errors.myValidation[0])
done()
})
})
})
})
test/dao.test.js → test/instance.test.js
...@@ -15,7 +15,7 @@ var chai = require('chai') ...@@ -15,7 +15,7 @@ var chai = require('chai')
chai.use(datetime) chai.use(datetime)
chai.config.includeStack = true chai.config.includeStack = true
describe(Support.getTestDialectTeaser("DAO"), function () { describe(Support.getTestDialectTeaser("Instance"), function () {
beforeEach(function(done) { beforeEach(function(done) {
this.User = this.sequelize.define('User', { this.User = this.sequelize.define('User', {
username: { type: DataTypes.STRING }, username: { type: DataTypes.STRING },
......
test/dao.validations.test.js → test/instance.validations.test.js
...@@ -9,7 +9,7 @@ var chai = require('chai') ...@@ -9,7 +9,7 @@ var chai = require('chai')
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser("DaoValidator"), function() { describe(Support.getTestDialectTeaser("InstanceValidator"), function() {
describe('validations', function() { describe('validations', function() {
var checks = { var checks = {
is: { is: {
......
test/dao-factory.test.js → test/model.test.js
...@@ -18,7 +18,7 @@ var chai = require('chai') ...@@ -18,7 +18,7 @@ var chai = require('chai')
chai.use(datetime) chai.use(datetime)
chai.config.includeStack = true chai.config.includeStack = true
describe(Support.getTestDialectTeaser("DAOFactory"), function () { describe(Support.getTestDialectTeaser("Model"), function () {
beforeEach(function(done) { beforeEach(function(done) {
this.User = this.sequelize.define('User', { this.User = this.sequelize.define('User', {
username: DataTypes.STRING, username: DataTypes.STRING,
......
test/dao-factory/and-or-where.test.js → test/model/and-or-where.test.js
...@@ -11,7 +11,7 @@ var chai = require('chai') ...@@ -11,7 +11,7 @@ var chai = require('chai')
chai.use(datetime) chai.use(datetime)
chai.config.includeStack = true chai.config.includeStack = true
describe(Support.getTestDialectTeaser("DAOFactory"), function () { describe(Support.getTestDialectTeaser("Model"), function () {
beforeEach(function(done) { beforeEach(function(done) {
this.User = this.sequelize.define('User', { this.User = this.sequelize.define('User', {
username: DataTypes.STRING, username: DataTypes.STRING,
......
test/dao-factory/create.test.js → test/model/create.test.js
...@@ -16,7 +16,7 @@ var chai = require('chai') ...@@ -16,7 +16,7 @@ var chai = require('chai')
chai.use(datetime) chai.use(datetime)
chai.config.includeStack = true chai.config.includeStack = true
describe(Support.getTestDialectTeaser("DAOFactory"), function () { describe(Support.getTestDialectTeaser("Model"), function () {
beforeEach(function () { beforeEach(function () {
return Support.prepareTransactionTest(this.sequelize).bind(this).then(function(sequelize) { return Support.prepareTransactionTest(this.sequelize).bind(this).then(function(sequelize) {
this.sequelize = sequelize; this.sequelize = sequelize;
......
test/dao-factory/find.test.js → test/model/find.test.js
...@@ -18,7 +18,7 @@ chai.use(promised); ...@@ -18,7 +18,7 @@ chai.use(promised);
chai.use(datetime) chai.use(datetime)
chai.config.includeStack = true chai.config.includeStack = true
describe(Support.getTestDialectTeaser("DAOFactory"), function () { describe(Support.getTestDialectTeaser("Model"), function () {
beforeEach(function(done) { beforeEach(function(done) {
this.User = this.sequelize.define('User', { this.User = this.sequelize.define('User', {
username: DataTypes.STRING, username: DataTypes.STRING,
......
test/dao-factory/findAll.test.js → test/model/findAll.test.js
...@@ -17,7 +17,7 @@ var chai = require('chai') ...@@ -17,7 +17,7 @@ var chai = require('chai')
chai.use(datetime) chai.use(datetime)
chai.config.includeStack = true chai.config.includeStack = true
describe(Support.getTestDialectTeaser("DAOFactory"), function () { describe(Support.getTestDialectTeaser("Model"), function () {
beforeEach(function(done) { beforeEach(function(done) {
this.User = this.sequelize.define('User', { this.User = this.sequelize.define('User', {
username: DataTypes.STRING, username: DataTypes.STRING,
......
test/dao-factory/scopes.test.js → test/model/scopes.test.js
...@@ -12,7 +12,7 @@ var chai = require('chai') ...@@ -12,7 +12,7 @@ var chai = require('chai')
chai.use(datetime); chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser("DAOFactory"), function () { describe(Support.getTestDialectTeaser("Model"), function () {
beforeEach(function() { beforeEach(function() {
return Support.prepareTransactionTest(this.sequelize).bind(this).then(function(sequelize) { return Support.prepareTransactionTest(this.sequelize).bind(this).then(function(sequelize) {
this.sequelize = sequelize; this.sequelize = sequelize;
......
test/dao-factory/update.test.js → test/model/update.test.js
...@@ -18,7 +18,7 @@ var chai = require('chai') ...@@ -18,7 +18,7 @@ var chai = require('chai')
chai.use(datetime); chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser("DAOFactory"), function () { describe(Support.getTestDialectTeaser("Model"), function () {
beforeEach(function () { beforeEach(function () {
this.clock = sinon.useFakeTimers(); this.clock = sinon.useFakeTimers();
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!