diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b00b08604d06a40a69aa6bc924bbb473775a4cd3..72057c13aed70f5f8d208ffa3fb1f700f71f1855 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,13 @@ stages: - test +services: + - mongo:latest + +variables: + MONGO_URI: 'mongodb://mongo/app_name' + NODE_ENV: 'test' + before_script: - npm install --global gulp gulp-cli babel babel-cli babel-core babel-register mocha gulp-mocha gulp-eslint - npm install @@ -8,6 +15,7 @@ before_script: run_tests: stage: test script: + - ping -W1 -c1 mongo - mv config.json.example config.json - gulp build - cd build/ diff --git a/src/libs/app.js b/src/libs/app.js index b0390720f2cb4badd2219dd4c9ba67887f3da5ed..68a814f84207956530f88553a3362e2be2855422 100644 --- a/src/libs/app.js +++ b/src/libs/app.js @@ -20,8 +20,6 @@ const mongoose = require(`${libs}/db/mongoose`); const db = mongoose(); -process.env.NODE_ENV = process.env.NODE_ENV || 'development'; - app.use(bodyParser.json()); app.use(bodyParser.urlencoded({ extended: false })); app.use(cookieParser()); diff --git a/src/libs/db/mongoose.js b/src/libs/db/mongoose.js index 13b3950da47638b2183ffb5e9c72dab41303c6d3..948ca833d8be6f903172a21a5804ba7d1222c565 100644 --- a/src/libs/db/mongoose.js +++ b/src/libs/db/mongoose.js @@ -7,7 +7,7 @@ const log = require(`${libs}/log`)(module); const mongoose = require('mongoose'); module.exports = () => { - const mongoUri = config.get('mongodb:uri'); + const mongoUri = process.env.MONGO_URI || config.get('mongodb:uri'); log.debug(`Connecting to MongDB on URI ${mongoUri}`); const db = mongoose.connect(mongoUri); diff --git a/src/server.js b/src/server.js index 4dde9b8e4231800ac40678ff66fec3086ffcd6af..ea465734273172ef0f3392e0292ceaeb3e08c7be 100644 --- a/src/server.js +++ b/src/server.js @@ -8,6 +8,8 @@ const log = require(`${libs}/log`)(module); const app = require(`${libs}/app`); +process.env.NODE_ENV = process.env.NODE_ENV || 'development'; + app.set('port', process.env.PORT || config.get('port') || 3000); app.set('ip', process.env.IP || config.get('ip') || '127.0.0.1');