Folder structure #398

Merged
bones7242 merged 76 commits from folder-structure into master 2018-03-20 00:01:08 +01:00
7 changed files with 6 additions and 14 deletions
Showing only changes of commit 0c1f81cced - Show all commits

4
.gitignore vendored
View file

@ -1,4 +1,4 @@
node_modules
.idea
/config/sequelizeCliConfig.js
/config/testingConfig.js
/devConfig/sequelizeCliConfig.js
/devConfig/testingConfig.js

View file

@ -1,7 +0,0 @@
const testConfig = module.exports = {
testChannel : '@test',
testChannelId : '3b5bc6b6819172c6e2f3f90aa855b14a956b4a82',
testChannelPassword: '1234',
};
module.exports = testConfig;

View file

@ -28,10 +28,9 @@ function SpeechServer ({ mysqlConfig, siteConfig, slackConfig }) {
mysqlAppConfig.configure(mysqlConfig);
const slackAppConfig = require('./config/slackConfig.js');
slackAppConfig.configure(slackConfig);
// print the config variables
console.log('configured config files');
require('./helpers/configVarCheck.js')(mysqlAppConfig);
require('./helpers/configVarCheck.js')(slackAppConfig);
// // print the config variables
// require('./helpers/configVarCheck.js')(mysqlAppConfig);
// require('./helpers/configVarCheck.js')(slackAppConfig);
};
this.configureLogging = () => {
require('./helpers/configureLogger.js')(logger);

View file

@ -2,7 +2,7 @@ const chai = require('chai');
const expect = chai.expect;
const chaiHttp = require('chai-http');
const { site: { host } } = require('../../config/speechConfig.js');
const { testChannel, testChannelId, testChannelPassword } = require('../../config/testingConfig.js');
const { testChannel, testChannelId, testChannelPassword } = require('../../devConfig/testingConfig.js');
const requestTimeout = 20000;
const publishTimeout = 120000;
const fs = require('fs');