From 9d7f83e2d92f9a72c8fd139bbc5be58e4d95f4e9 Mon Sep 17 00:00:00 2001
From: Vytor Calixto <vytorcalixto@gmail.com>
Date: Mon, 3 Oct 2016 11:37:04 -0300
Subject: [PATCH] Add monog_uri and mongo service do CI
---
.gitlab-ci.yml | 8 ++++++++
src/libs/app.js | 2 --
src/libs/db/mongoose.js | 2 +-
src/server.js | 2 ++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b00b0860..72057c13 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 b0390720..68a814f8 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 13b3950d..948ca833 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 4dde9b8e..ea465734 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');
--
GitLab