Skip to content

public / sequelize

Go to a project

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

Commit ac4048bf by Ruben Bridgewater
Options

Reduce chai use

1 parent d732d0cf
Inline Side-by-side
Showing with 9 additions and 51 deletions
test/integration/dialects/postgres/dao.test.js
...@@ -9,7 +9,6 @@ var chai = require('chai') ...@@ -9,7 +9,6 @@ var chai = require('chai')
, DataTypes = require(__dirname + '/../../../../lib/data-types') , DataTypes = require(__dirname + '/../../../../lib/data-types')
, sequelize = require(__dirname + '/../../../../lib/sequelize'); , sequelize = require(__dirname + '/../../../../lib/sequelize');
chai.use(require('chai-datetime'));
chai.config.includeStack = true; chai.config.includeStack = true;
if (dialect.match(/^postgres/)) { if (dialect.match(/^postgres/)) {
......
test/integration/include.test.js
...@@ -7,11 +7,9 @@ var chai = require('chai') ...@@ -7,11 +7,9 @@ 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')
, datetime = require('chai-datetime')
, _ = require('lodash') , _ = require('lodash')
, dialect = Support.getTestDialect(); , dialect = Support.getTestDialect();
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
var sortById = function(a, b) { var sortById = function(a, b) {
......
test/integration/include/find.test.js
...@@ -6,10 +6,8 @@ var chai = require('chai') ...@@ -6,10 +6,8 @@ var chai = require('chai')
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../support')
, Sequelize = require(__dirname + '/../../../index') , Sequelize = require(__dirname + '/../../../index')
, Promise = Sequelize.Promise , Promise = Sequelize.Promise
, DataTypes = require(__dirname + '/../../../lib/data-types') , DataTypes = require(__dirname + '/../../../lib/data-types');
, datetime = require('chai-datetime');
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Include'), function() { describe(Support.getTestDialectTeaser('Include'), function() {
......
test/integration/include/findAll.test.js
...@@ -7,10 +7,8 @@ var chai = require('chai') ...@@ -7,10 +7,8 @@ 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')
, datetime = require('chai-datetime')
, Promise = Sequelize.Promise; , Promise = Sequelize.Promise;
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
var sortById = function(a, b) { var sortById = function(a, b) {
......
test/integration/include/findAndCountAll.test.js
...@@ -4,10 +4,8 @@ var chai = require('chai') ...@@ -4,10 +4,8 @@ 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')
, datetime = require('chai-datetime')
, Promise = require('bluebird'); , Promise = require('bluebird');
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Include'), function() { describe(Support.getTestDialectTeaser('Include'), function() {
......
test/integration/include/paranoid.test.js
...@@ -3,10 +3,8 @@ ...@@ -3,10 +3,8 @@
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');
, datetime = require('chai-datetime');
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Paranoid'), function() { describe(Support.getTestDialectTeaser('Paranoid'), function() {
......
test/integration/include/schema.test.js
...@@ -6,11 +6,9 @@ var chai = require('chai') ...@@ -6,11 +6,9 @@ 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')
, datetime = require('chai-datetime')
, Promise = Sequelize.Promise , Promise = Sequelize.Promise
, dialect = Support.getTestDialect(); , dialect = Support.getTestDialect();
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
var sortById = function(a, b) { var sortById = function(a, b) {
......
test/integration/instance.test.js
...@@ -10,12 +10,10 @@ var chai = require('chai') ...@@ -10,12 +10,10 @@ var chai = require('chai')
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, config = require(__dirname + '/../config/config') , config = require(__dirname + '/../config/config')
, sinon = require('sinon') , sinon = require('sinon')
, datetime = require('chai-datetime')
, uuid = require('node-uuid') , uuid = require('node-uuid')
, current = Support.sequelize; , current = Support.sequelize;
chai.should(); chai.should();
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Instance'), function() { describe(Support.getTestDialectTeaser('Instance'), function() {
......
test/integration/instance/update.test.js
...@@ -8,11 +8,9 @@ var chai = require('chai') ...@@ -8,11 +8,9 @@ var chai = require('chai')
, 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')
, datetime = require('chai-datetime')
, config = require(__dirname + '/../../config/config') , config = require(__dirname + '/../../config/config')
, current = Support.sequelize; , current = Support.sequelize;
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Instance'), function() { describe(Support.getTestDialectTeaser('Instance'), function() {
......
test/integration/instance/values.test.js
...@@ -6,10 +6,8 @@ var chai = require('chai') ...@@ -6,10 +6,8 @@ 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');
, datetime = require('chai-datetime');
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('DAO'), function() { describe(Support.getTestDialectTeaser('DAO'), function() {
......
test/integration/model.test.js
...@@ -9,12 +9,10 @@ var chai = require('chai') ...@@ -9,12 +9,10 @@ var chai = require('chai')
, DataTypes = require(__dirname + '/../../lib/data-types') , DataTypes = require(__dirname + '/../../lib/data-types')
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, sinon = require('sinon') , sinon = require('sinon')
, datetime = require('chai-datetime')
, _ = require('lodash') , _ = require('lodash')
, moment = require('moment') , moment = require('moment')
, current = Support.sequelize; , current = Support.sequelize;
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/and-or-where.test.js
...@@ -6,10 +6,8 @@ var chai = require('chai') ...@@ -6,10 +6,8 @@ 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();
, datetime = require('chai-datetime');
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/attributes.test.js
...@@ -4,10 +4,8 @@ var chai = require('chai') ...@@ -4,10 +4,8 @@ var chai = require('chai')
, Sequelize = require('../../../index') , Sequelize = require('../../../index')
, Promise = Sequelize.Promise , Promise = Sequelize.Promise
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../support') , Support = require(__dirname + '/../support');
, datetime = require('chai-datetime');
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/attributes/field.test.js
...@@ -7,10 +7,8 @@ var chai = require('chai') ...@@ -7,10 +7,8 @@ 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();
, datetime = require('chai-datetime');
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/attributes/types.test.js
...@@ -6,10 +6,8 @@ var chai = require('chai') ...@@ -6,10 +6,8 @@ var chai = require('chai')
, Promise = Sequelize.Promise , Promise = Sequelize.Promise
, expect = chai.expect , expect = chai.expect
, Support = require(__dirname + '/../../support') , Support = require(__dirname + '/../../support')
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect();
, datetime = require('chai-datetime');
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/create.test.js
...@@ -10,12 +10,10 @@ var chai = require('chai') ...@@ -10,12 +10,10 @@ var chai = require('chai')
, 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()
, datetime = require('chai-datetime')
, _ = require('lodash') , _ = require('lodash')
, assert = require('assert') , assert = require('assert')
, current = Support.sequelize; , current = Support.sequelize;
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/find.test.js
...@@ -10,12 +10,8 @@ var chai = require('chai') ...@@ -10,12 +10,8 @@ var chai = require('chai')
, 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')
, datetime = require('chai-datetime')
, promised = require('chai-as-promised')
, current = Support.sequelize; , current = Support.sequelize;
chai.use(promised);
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/findAll.test.js
...@@ -10,12 +10,10 @@ var chai = require('chai') ...@@ -10,12 +10,10 @@ var chai = require('chai')
, DataTypes = require(__dirname + '/../../../lib/data-types') , DataTypes = require(__dirname + '/../../../lib/data-types')
, dialect = Support.getTestDialect() , dialect = Support.getTestDialect()
, config = require(__dirname + '/../../config/config') , config = require(__dirname + '/../../config/config')
, datetime = require('chai-datetime')
, _ = require('lodash') , _ = require('lodash')
, moment = require('moment') , moment = require('moment')
, current = Support.sequelize; , current = Support.sequelize;
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/findAll/order.test.js
...@@ -5,10 +5,8 @@ var chai = require('chai') ...@@ -5,10 +5,8 @@ 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')
, datetime = require('chai-datetime')
, current = Support.sequelize; , current = Support.sequelize;
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/scopes.test.js
...@@ -6,10 +6,8 @@ var chai = require('chai') ...@@ -6,10 +6,8 @@ var chai = require('chai')
, Sequelize = require('../../../index') , Sequelize = require('../../../index')
, 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');
, datetime = require('chai-datetime');
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/integration/model/upsert.test.js
...@@ -8,10 +8,8 @@ var chai = require('chai') ...@@ -8,10 +8,8 @@ var chai = require('chai')
, 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()
, datetime = require('chai-datetime')
, current = Support.sequelize; , current = Support.sequelize;
chai.use(datetime);
chai.config.includeStack = true; chai.config.includeStack = true;
describe(Support.getTestDialectTeaser('Model'), function() { describe(Support.getTestDialectTeaser('Model'), function() {
......
test/support.js
...@@ -9,6 +9,7 @@ var fs = require('fs') ...@@ -9,6 +9,7 @@ var fs = require('fs')
, chai = require('chai') , chai = require('chai')
, expect = chai.expect; , expect = chai.expect;
chai.use(require('chai-datetime'));
chai.use(require('chai-as-promised')); chai.use(require('chai-as-promised'));
// Make sure errors get thrown when testing // Make sure errors get thrown when testing
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!