verdnatura-mirror
/
loopback-connector-mysql
mirror of https://github.com/loopbackio/loopback-connector-mysql.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #187 from strongloop/fix-default-test-configs 

Fix pretest and init test configs
This commit is contained in:
Simon Ho 2016-08-19 12:38:05 -07:00 committed by GitHub
parent 2c4b2f86b1 a004b03d0f
commit 4ce71a3489
2 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pretest.js
View File

@ -1,16 +1,20 @@
'use strict'; 'use strict';
// TODO: used for testing support for parallel testing on ci.strongloop.com which
// provides MYSQL_* env vars instead of TEST_MYSQL_* env vars.
process.env.TEST_MYSQL_USER = process.env.TEST_MYSQL_USER || process.env.MYSQL_USER;
process.env.TEST_MYSQL_PASSWORD = process.env.TEST_MYSQL_PASSWORD || process.env.MYSQL_PASSWORD;
process.env.TEST_MYSQL_HOST = process.env.TEST_MYSQL_HOST || process.env.MYSQL_HOST;
process.env.TEST_MYSQL_PORT = process.env.TEST_MYSQL_PORT || process.env.MYSQL_PORT;
if (!process.env.TEST_MYSQL_USER) { if (!process.env.TEST_MYSQL_USER &&
console.log('not seeding DB with example db'); !process.env.MYSQL_USER &&
return; !process.env.CI) {
return console.log('Not seeding DB with test db');
} }
process.env.TEST_MYSQL_HOST =
process.env.TEST_MYSQL_HOST || process.env.MYSQL_HOST || 'localhost';
process.env.TEST_MYSQL_PORT =
process.env.TEST_MYSQL_PORT || process.env.MYSQL_PORT || 3306;
process.env.TEST_MYSQL_USER =
process.env.TEST_MYSQL_USER || process.env.MYSQL_USER || 'test';
process.env.TEST_MYSQL_PASSWORD =
process.env.TEST_MYSQL_PASSWORD || process.env.MYSQL_PASSWORD || 'test';
var fs = require('fs'); var fs = require('fs');
var cp = require('child_process'); var cp = require('child_process');

16
test/init.js
View File

@ -4,12 +4,6 @@
// License text available at https://opensource.org/licenses/MIT // License text available at https://opensource.org/licenses/MIT
'use strict'; 'use strict';
// TODO: used for testing support for parallel testing on ci.strongloop.com which
// provides MYSQL_* env vars instead of TEST_MYSQL_* env vars.
process.env.TEST_MYSQL_USER = process.env.TEST_MYSQL_USER || process.env.MYSQL_USER;
process.env.TEST_MYSQL_PASSWORD = process.env.TEST_MYSQL_PASSWORD || process.env.MYSQL_PASSWORD;
process.env.TEST_MYSQL_HOST = process.env.TEST_MYSQL_HOST || process.env.MYSQL_HOST;
process.env.TEST_MYSQL_PORT = process.env.TEST_MYSQL_PORT || process.env.MYSQL_PORT;
module.exports = require('should'); module.exports = require('should');
@ -19,11 +13,13 @@ var config = require('rc')('loopback', {test: {mysql: {}}}).test.mysql;
console.log(config); console.log(config);
global.getConfig = function(options) { global.getConfig = function(options) {
var dbConf = { var dbConf = {
host: process.env.TEST_MYSQL_HOST || config.host || 'localhost', host: process.env.TEST_MYSQL_HOST || process.env.MYSQL_HOST ||
port: process.env.TEST_MYSQL_PORT || config.port || 3306, config.host || 'localhost',
port: process.env.TEST_MYSQL_PORT || process.env.MYSQL_PORT ||
config.port || 3306,
database: 'myapp_test', database: 'myapp_test',
username: process.env.TEST_MYSQL_USER || config.username, username: process.env.MYSQL_USER || config.username,
password: process.env.TEST_MYSQL_PASSWORD || config.password, password: process.env.MYSQL_PASSWORD || config.password,
createDatabase: true, createDatabase: true,
}; };