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

Commit 50563cb0 by Sascha Depold

run tests for pg native also on travis

1 parent c44af7fb
...@@ -13,6 +13,7 @@ notifications: ...@@ -13,6 +13,7 @@ notifications:
env: env:
- DB=mysql DIALECT=mysql - DB=mysql DIALECT=mysql
- DB=mysql DIALECT=postgres - DB=mysql DIALECT=postgres
- DB=mysql DIALECT=postgres-native
- DB=mysql DIALECT=sqlite - DB=mysql DIALECT=sqlite
language: node_js language: node_js
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
"scripts": { "scripts": {
"test": "npm run test-jasmine && npm run test-buster", "test": "npm run test-jasmine && npm run test-buster",
"test-jasmine": "./node_modules/.bin/jasmine-node spec-jasmine/", "test-jasmine": "./node_modules/.bin/jasmine-node spec-jasmine/",
"test-buster": "npm run test-buster-mysql && npm run test-buster-postgres && npm run test-buster-sqlite", "test-buster": "npm run test-buster-mysql && npm run test-buster-postgres && npm run test-buster-postgres-native && npm run test-buster-sqlite",
"test-buster-travis": "./node_modules/.bin/buster-test", "test-buster-travis": "./node_modules/.bin/buster-test",
"test-buster-mysql": "DIALECT=mysql ./node_modules/.bin/buster-test", "test-buster-mysql": "DIALECT=mysql ./node_modules/.bin/buster-test",
"test-buster-postgres": "DIALECT=postgres ./node_modules/.bin/buster-test", "test-buster-postgres": "DIALECT=postgres ./node_modules/.bin/buster-test",
......
...@@ -8,7 +8,7 @@ if (typeof require === 'function') { ...@@ -8,7 +8,7 @@ if (typeof require === 'function') {
buster.spec.expose() buster.spec.expose()
buster.testRunner.timeout = 500 buster.testRunner.timeout = 500
describe("[" + dialect.toUpperCase() + "] BelongsTo", function() { describe("[" + Helpers.getTestDialectTeaser() + "] BelongsTo", function() {
before(function(done) { before(function(done) {
Helpers.initTests({ Helpers.initTests({
beforeComplete: function(sequelize) { beforeComplete: function(sequelize) {
......
...@@ -8,7 +8,7 @@ if (typeof require === 'function') { ...@@ -8,7 +8,7 @@ if (typeof require === 'function') {
buster.spec.expose() buster.spec.expose()
buster.testRunner.timeout = 500 buster.testRunner.timeout = 500
describe("[" + dialect.toUpperCase() + "] HasMany", function() { describe("[" + Helpers.getTestDialectTeaser() + "] HasMany", function() {
before(function(done) { before(function(done) {
var self = this var self = this
......
...@@ -8,7 +8,7 @@ if (typeof require === 'function') { ...@@ -8,7 +8,7 @@ if (typeof require === 'function') {
buster.spec.expose() buster.spec.expose()
buster.testRunner.timeout = 1500 buster.testRunner.timeout = 1500
describe("[" + dialect.toUpperCase() + "] HasOne", function() { describe("[" + Helpers.getTestDialectTeaser() + "] HasOne", function() {
before(function(done) { before(function(done) {
var self = this var self = this
......
...@@ -7,7 +7,7 @@ if (typeof require === 'function') { ...@@ -7,7 +7,7 @@ if (typeof require === 'function') {
buster.spec.expose() buster.spec.expose()
describe("[" + dialect.toUpperCase() + "] Mixin", function() { describe("[" + Helpers.getTestDialectTeaser() + "] Mixin", function() {
before(function(done) { before(function(done) {
Helpers.initTests({ Helpers.initTests({
dialect: dialect, dialect: dialect,
......
...@@ -70,6 +70,16 @@ var BusterHelpers = module.exports = { ...@@ -70,6 +70,16 @@ var BusterHelpers = module.exports = {
return envDialect return envDialect
}, },
getTestDialectTeaser: function() {
var dialect = this.getTestDialect()
if (process.env.DIALECT === 'postgres-native') {
dialect = 'postgres-native'
}
return dialect.toUpperCase()
},
checkMatchForDialects: function(dialect, value, expectations) { checkMatchForDialects: function(dialect, value, expectations) {
if (!!expectations[dialect]) { if (!!expectations[dialect]) {
expect(value).toMatch(expectations[dialect]) expect(value).toMatch(expectations[dialect])
......
...@@ -7,7 +7,7 @@ if(typeof require === 'function') { ...@@ -7,7 +7,7 @@ if(typeof require === 'function') {
buster.spec.expose() buster.spec.expose()
describe("[" + dialect.toUpperCase() + "] DAOFactory", function() { describe("[" + Helpers.getTestDialectTeaser() + "] DAOFactory", function() {
before(function(done) { before(function(done) {
Helpers.initTests({ Helpers.initTests({
dialect: dialect, dialect: dialect,
......
...@@ -6,7 +6,7 @@ if(typeof require === 'function') { ...@@ -6,7 +6,7 @@ if(typeof require === 'function') {
buster.spec.expose() buster.spec.expose()
describe("[" + dialect.toUpperCase() + "] DAO", function() { describe("[" + Helpers.getTestDialectTeaser() + "] DAO", function() {
before(function(done) { before(function(done) {
var self = this var self = this
......
...@@ -7,7 +7,7 @@ if(typeof require === 'function') { ...@@ -7,7 +7,7 @@ if(typeof require === 'function') {
buster.spec.expose() buster.spec.expose()
describe("[" + dialect.toUpperCase() + "] DAO", function() { describe("[" + Helpers.getTestDialectTeaser() + "] DAO", function() {
describe('validations', function() { describe('validations', function() {
before(function(done) { before(function(done) {
Helpers.initTests({ Helpers.initTests({
......
...@@ -9,7 +9,7 @@ if(typeof require === 'function') { ...@@ -9,7 +9,7 @@ if(typeof require === 'function') {
buster.spec.expose() buster.spec.expose()
buster.testRunner.timeout = 1000 buster.testRunner.timeout = 1000
describe("[" + dialect.toUpperCase() + "] QueryChainer", function() { describe("[" + Helpers.getTestDialectTeaser() + "] QueryChainer", function() {
before(function() { before(function() {
this.queryChainer = new QueryChainer() this.queryChainer = new QueryChainer()
}) })
......
...@@ -7,7 +7,7 @@ if(typeof require === 'function') { ...@@ -7,7 +7,7 @@ if(typeof require === 'function') {
buster.spec.expose() buster.spec.expose()
describe("[" + dialect.toUpperCase() + "] Sequelize", function() { describe("[" + Helpers.getTestDialectTeaser() + "] Sequelize", function() {
before(function(done) { before(function(done) {
Helpers.initTests({ Helpers.initTests({
beforeComplete: function(sequelize) { this.sequelize = sequelize }.bind(this), beforeComplete: function(sequelize) { this.sequelize = sequelize }.bind(this),
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!