Merge pull request #12 from RioBus/dev

Fixing test workflow

Author: fmsouza

README.md

@@ -39,7 +39,13 @@ Execute a aplicação:
 
 Os dados dos ônibus são salvos no banco de dados NoSQL [MongoDB](https://www.mongodb.org/). Certifique-se de que ele 
 esteja ligado antes de executar a aplicação. As configurações de conexão devem ser definidas nas variáveis de ambiente do
-Sistema Operacional de acordo com as configurações padrão descritas em ```env.config.sh```.
+Sistema Operacional de acordo com o modelo:
+
+> RIOBUS_DB_NAME - Nome do banco
+> RIOBUS_DB_HOST - Endereço do SGBD
+> RIOBUS_DB_PORT - Porta do banco
+> RIOBUS_DB_USER - Usuário do banco
+> RIOBUS_DB_PASS - Senha de acesso ao banco
 
 Comandos NPM
 ------------
@@ -51,9 +57,9 @@ npm start
 > Roda a aplicação
 
 npm install
-> Inslata as dependências locais e globais do projeto.
+> Inslata as dependências do projeto.
 
 Compatibilidade
 ---------------
 
-* node.js >= 0.11
+* node.js >= 4.0.0

package.json

@@ -4,8 +4,9 @@
   "description": "RioBus data-provider application",
   "main": "src/app.js",
   "scripts": {
-    "test": "mocha test/**/* --timeout 5000",
-    "start": "node src/app.js"
+    "test": "mocha test/* test/**/* --timeout 20000",
+    "start": "node src/app.js",
+    "install": "npm install -g mocha-co"
   },
   "compiler": "commonjs",
   "repository": {
@@ -41,7 +42,6 @@
     "robe": "^0.12.0"
   },
   "devDependencies": {
-    "mocha": "^2.2.5",
-    "co-mocha": "^1.1.2"
+    "mocha-co": "^1.17.1-co.1"
   }
 }

test/dao/busDAO.js

@@ -1,6 +1,5 @@
 'use strict';
 /* global describe, it, before, global, __dirname, after; */
-require('co-mocha')(require('mocha'));
 const base = `${__dirname}/../../src`;
 
 const Assert = require('assert');
@@ -19,7 +18,7 @@ describe('BusDAO', () => {
 		dao = new BusDAO(conn);
 	});
 
-	it('should insert data', function*(done) {
+	it('should insert data', function*() {
 		let data = new Bus('line', 'order', 0, 0, 23, 45, (new Date()).toDateString(), 'sense');
 		const common = yield dao.commonSave(data);
 		const history = yield dao.historySave(data);
@@ -45,7 +44,6 @@ describe('BusDAO', () => {
 		Assert.notEqual(common._id, undefined);
 		Assert.notEqual(history._id, undefined);
 		saved = [ common, history ];
-		done();
 	});
 
 	after(function*() {

test/dao/itineraryDAO.js

@@ -1,6 +1,5 @@
 'use strict';
 /* global describe, it, before, global, __dirname, after; */
-require('co-mocha')(require('mocha'));
 const base = `${__dirname}/../../src`;
 
 const Assert = require('assert');
@@ -18,7 +17,7 @@ describe('ItineraryDAO', () => {
 		dao = new ItineraryDAO(conn);
 	});
 
-	it('should insert data', function*(done) {
+	it('should insert data', function*() {
 		let data = new Itinerary('line', 'description', 'agency', 'keywords');
 		const response = yield dao.save(data);
 		Assert.equal(response.line, data.line);
@@ -27,13 +26,11 @@ describe('ItineraryDAO', () => {
 		Assert.equal(response.keywords, data.keywords);
 		Assert.notEqual(response._id, undefined);
 		saved = response;
-		done();
 	});
 
-	it('should retrieve the recently inserted data', function*(done) {
+	it('should retrieve the recently inserted data', function*() {
 		const response = yield dao.getAll();
 		Assert.equal(response.length, 1);
-		done();
 	});
 
 	after(function*() {

test/database.js

@@ -1,52 +1,45 @@
 'use strict';
 /* global describe, it, before; */
-require('co-mocha')(require('mocha'));
 
 const Assert = require('assert');
 const Database = require('../src/core').Database;
 
-var db, collection;
-
 describe('Database', () => {
 
-	it('should connect to database', function*(done) {
+	var db, collection;
+	
+	it('should connect to database', function*() {
 		db = yield Database.connect();
 		Assert.notEqual(db, null);
-		done();
 	});
 
-	it('should access the collection test', function*(done) {
+	it('should access the collection test', function*() {
 		collection = db.collection('test');
 		Assert.notEqual(collection, null);
-		done();
 	});
 
-	it('should insert data in the collection', function*(done) {
+	it('should insert data in the collection', function*() {
 		yield collection.insert({ name: 'Fulano' });
 
 		var item = yield collection.findOne({ name: 'Fulano' });
 		Assert.equal(item.name, 'Fulano');
-		done();
 	});
 
-	it('should update Fulano in the collection', function*(done) {
+	it('should update Fulano in the collection', function*() {
 		var item = yield collection.findOne({ name: 'Fulano' });
 		item.name = 'Ciclano';
 		yield item.save();
 		Assert.equal(item.name, 'Ciclano');
-		done();
 	});
 
-	it('should retrieve all documents in test collection', function*(done) {
+	it('should retrieve all documents in test collection', function*() {
 		var items = yield collection.find({});
 		Assert.notEqual(items.length, 0);
-		done();
 	});
 
-	it('should remove all documents in test collection', function*(done) {
+	it('should remove all documents in test collection', function*() {
 		yield collection.remove({});
 		var items = yield collection.find({});
 		Assert.equal(items.length, 0);
-		done();
 	});
 });

test/downloader/busDownloader.js

@@ -1,6 +1,5 @@
 'use strict';
 /* global describe, it, before; */
-require('co-mocha')(require('mocha'));
 const Assert = require('assert');
 
 const base = '../../src';
@@ -18,32 +17,28 @@ describe('BusDownloader', () => {
 		urlBRT = `http://${urlConfig.host}${urlConfig.path.bus.BRT}`;
 	});
 
-	it('should download the current REGULAR buses states', function*(done) {
-		var data = yield BusDownloader.fromURL(urlREGULAR);
-		Assert.notEqual(data, undefined);
-		Assert.notEqual(data, null);
-		Assert(data instanceof Array);
-		Assert(data[0] instanceof Bus);
-		list = data;
-		done();
+	it('should download the current REGULAR buses states', function*() {
+		list = yield BusDownloader.fromURL(urlREGULAR);
+		Assert.notEqual(list, undefined);
+		Assert.notEqual(list, null);
+		Assert(list instanceof Array);
+		Assert(list[0] instanceof Bus);
 	});
 
-	it('should have the number count of docs in the array equal to the number of orders', (done) => {
+	it('should have the number count of docs in the array equal to the number of orders', () => {
 		const distinctOrders = [];
 		for(let bus of list) {
 			if(distinctOrders.indexOf(bus.order)>-1) continue;
 			distinctOrders.push(bus.order);
 		}
 		Assert.equal(distinctOrders.length, list.length);
-		done();
 	});
 
-	it('should download the current BRT buses states', function*(done) {
+	it('should download the current BRT buses states', function*() {
 		var data = yield BusDownloader.fromURL(urlBRT);
 		Assert.notEqual(data, undefined);
 		Assert.notEqual(data, null);
 		Assert(data instanceof Array);
 		Assert(data[0] instanceof Bus);
-		done();
 	});
 });

test/downloader/itineraryDownloader.js

@@ -1,6 +1,5 @@
 'use strict';
 /* global describe, it, before; */
-require('co-mocha')(require('mocha'));
 const Assert = require('assert');
 
 const base = '../../src';
@@ -9,11 +8,10 @@ const ItineraryDownloader = require(`${base}/downloader/itineraryDownloader`);
 
 describe('ItineraryDownloader', () => {
 
-	it('should download the itinerary to line 485', function*(done) {
+	it('should download the itinerary to line 485', function*() {
 		var data = yield ItineraryDownloader.fromLine('485');
 		Assert.notEqual(data, null);
 		Assert.notEqual(data, undefined);
 		Assert(data instanceof Itinerary);
-		done();
 	});
 });