From 52b60a22fd6c48549f20fdbea34b55135e704a14 Mon Sep 17 00:00:00 2001
From: Raul Ochoa <rochoaf@gmail.com>
Date: Wed, 15 Jul 2015 16:09:43 +0200
Subject: [PATCH] Makes all tests to run together

---
 Makefile                                             | 12 ++++--------
 .../ported/support/ported_server_options.js          |  4 ++++
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Makefile b/Makefile
index b572bb2b..3f6ebf43 100644
--- a/Makefile
+++ b/Makefile
@@ -25,13 +25,9 @@ test: config/environments/test.js
 		test/unit/cartodb/cache/model/*.js \
 		test/integration/*.js \
 		test/acceptance/*.js \
-		test/acceptance/cache/*.js
-
-test-ported: config/environments/test.js
-	@echo "***tests ported***"
-	@$(SHELL) ./run_tests.sh ${RUNTESTFLAGS} \
-		test/unit/cartodb/ported/*.js \
-		test/acceptance/ported/*.js
+		test/acceptance/cache/*.js \
+		test/acceptance/ported/*.js \
+		test/unit/cartodb/ported/*.js
 
 test-unit: config/environments/test.js
 	@echo "***tests***"
@@ -54,7 +50,7 @@ jshint:
 	@echo "***jshint***"
 	@./node_modules/.bin/jshint lib/ test/ app.js
 
-test-all: jshint test test-ported
+test-all: jshint test
 
 coverage:
 	@RUNTESTFLAGS=--with-coverage make test
diff --git a/test/acceptance/ported/support/ported_server_options.js b/test/acceptance/ported/support/ported_server_options.js
index b17eef6d..b4ca6a5a 100644
--- a/test/acceptance/ported/support/ported_server_options.js
+++ b/test/acceptance/ported/support/ported_server_options.js
@@ -58,6 +58,10 @@ module.exports = _.extend({}, serverOptions, {
         _.extend(req.params, req.query);
         req.params.user = 'localhost';
         req.context = {user: 'localhost'};
+
+        req.params.dbhost = global.environment.postgres.host;
+        req.params.dbport = req.params.dbport || global.environment.postgres.port;
+
         req.params.dbuser = 'test_windshaft_publicuser';
         if (req.params.dbname !== 'windshaft_test2') {
             req.params.dbuser = 'test_windshaft_cartodb_user_1';