Merge pull request #54 from HSLdevcom/nodejs-proj

Make projeect structure more like a standard nodejs project
HSLdevcom · Mar 21, 2018 · fbc71d3 · fbc71d3
2 parents f217606 + 4e22d81
commit fbc71d3
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 28 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,14 +5,10 @@ branches:
     - /201[7-9][0-1][0-9][0-3][0-9]/
 
 services: docker
-install: true
 
-env:
-  - NODE_VERSION="8.10"
+install:
+ - npm install
 
-before_install:
-  - nvm install $NODE_VERSION
-
-language: C
+language: node_js
 
 script: ./travis-build.sh
diff --git a/README.md b/README.md
@@ -6,4 +6,4 @@
 Requires docker + node
 
 ```bash
-test/test.sh
+./test.sh
diff --git a/test/package-lock.json → package-lock.json b/test/package-lock.json → package-lock.json
diff --git a/test/package.json → package.json b/test/package.json → package.json
diff --git a/test/test.js → test.js b/test/test.js → test.js
diff --git a/test/test.sh → test.sh b/test/test.sh → test.sh
@@ -14,23 +14,16 @@ for HOST in $PROXIED_HOSTS;do ADDHOSTS="--add-host $HOST:$TARGETHOST $ADDHOSTS";
 
 echo $ADDHOSTS
 
-cd test
-
-npm install
-npm install -g forever
-
-
 CONTAINER_ID=`docker run -d -p 9000:8080 $ADDHOSTS hsldevcom/digitransit-proxy:integrationtest`
 
 curl -v http://127.0.0.1:9000
 
 
 echo started proxy-container $CONTAINER_ID
 echo starting echo server...
-#node server.js &
-#PID=$!
+node test_server.js &
+PID=$!
 
-forever start server.js
 sleep 5
 
 npm test

diff --git a/test/server.js → test_server.js b/test/server.js → test_server.js
diff --git a/travis-build.sh b/travis-build.sh
@@ -12,9 +12,6 @@ DOCKER_IMAGE=$ORG/digitransit-proxy:$DOCKER_TAG
 LATEST_IMAGE=$ORG/digitransit-proxy:latest
 PROD_IMAGE=$ORG/digitransit-proxy:prod
 
-echo Building digitransit-proxy: $DOCKER_IMAGE
-
-docker build  --tag=$DOCKER_IMAGE -f Dockerfile .
 
 if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
   docker login -u ${DOCKER_USER} -p ${DOCKER_AUTH}
@@ -26,16 +23,15 @@ if [ "${TRAVIS_PULL_REQUEST}" == "false" ]; then
     docker push ${PROD_IMAGE}
   else
     echo "processing master build $TRAVIS_COMMIT"
-    test/test.sh
+    ./test.sh
     docker build  --tag=$DOCKER_IMAGE -f Dockerfile .
     docker push ${DOCKER_IMAGE}
     docker tag ${DOCKER_IMAGE} ${LATEST_IMAGE}
     docker push ${LATEST_IMAGE}
   fi
 else
   echo "processing pr $TRAVIS_PULL_REQUEST"
-  node -v
-  test/test.sh
+  ./test.sh
   docker build  --tag=$DOCKER_IMAGE -f Dockerfile .
 fi