diff --git a/docker/scripts/test-setup.sh b/docker/scripts/test-setup.sh new file mode 100644 index 00000000..f30a39d3 --- /dev/null +++ b/docker/scripts/test-setup.sh @@ -0,0 +1,22 @@ +#!/bin/bash + +/etc/init.d/postgresql start + +source /src/nodejs-install.sh + +# Install cartodb-postgresql extension +git clone https://github.com/CartoDB/cartodb-postgresql.git +cd cartodb-postgresql && make && make install && cd .. + +echo "Node.js version: " +node -v + +echo "npm version: " +npm -v + +echo "Clean install: " +npm ci +npm ls + +# run tests +npm test diff --git a/package.json b/package.json index b76e827f..1e573a06 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "test:teardown": "NODE_ENV=test node test teardown", "update-internal-deps": "rm -rf node_modules && npm install", "pretest:ci": "cp config/environments/test.js.example config/environments/test.js", - "test:ci": "docker run -e \"NODEJS_VERSION=$NODE_VERSION\" -v `pwd`:/srv $DOCKER_IMAGE bash run_tests_docker.sh && docker ps --filter status=dead --filter status=exited -aq | xargs docker rm -v", + "test:ci": "docker run -e \"NODEJS_VERSION=$NODE_VERSION\" -v `pwd`:/srv $DOCKER_IMAGE bash docker/scripts/test-setup.sh && docker ps --filter status=dead --filter status=exited -aq | xargs docker rm -v", "docker:bash": "docker run -it -v `pwd`:/srv $DOCKER_IMAGE bash" }, "engines": {