cartodb4/Windshaft-cartodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Makes all tests to run together

Browse Source
This commit is contained in:
Raul Ochoa 2015-07-15 16:09:43 +02:00
parent 116da64e5c
commit 52b60a22fd
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Makefile
View File

@ -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

4
test/acceptance/ported/support/ported_server_options.js
View File

@ -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';