Minor refactor.

Added Dockerfile to create image for dhis2-system-test. This will make it easier to automate system test execution.
System test should only start once application (database and web) is ready to accept connections.

Author: pgracio

Dockerfile

@@ -0,0 +1,14 @@
+FROM node:4.4.5-slim
+
+ENV DOCKERIZE_VERSION v0.2.0
+
+RUN apt-get update && apt-get install -y wget && npm install chakram --save-dev && npm install -g mocha
+
+RUN wget https://github.com/jwilder/dockerize/releases/download/$DOCKERIZE_VERSION/dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz \
+    && tar -C /usr/local/bin -xzvf dockerize-linux-amd64-$DOCKERIZE_VERSION.tar.gz
+
+ENV NODE_PATH /usr/local/lib/node_modules
+
+WORKDIR /dhis2
+
+COPY dhis2.js system-test/

README.md

@@ -9,8 +9,8 @@ http://dareid.github.io/chakram/
 Prerequisites
 -------------
 * [Install Docker](http://docs.docker.com/engine/installation/ "Documentation") 
-* [Install npm](http://https://docs.npmjs.com/getting-started/what-is-npm/ "Documentation") 
-* [Chakram Getting started](http://https://github.com/dareid/chakram#getting-started/ "Documentation") 
+* [Install npm](https://docs.npmjs.com/getting-started/what-is-npm/ "Documentation") 
+* [Chakram Getting started](https://github.com/dareid/chakram#getting-started/ "Documentation") 
 
 Execute
 -------------

dhis2.js

@@ -1,7 +1,9 @@
 var chakram = require('chakram'),
     expect = chakram.expect,
-    host = 'localhost',
-    port = '8085';
+    //host = 'localhost',
+    //port = '8085';
+    host = 'dhis2-web',
+    port = '8080';
 
 var authorization = {
     headers: {
@@ -11,7 +13,7 @@ var authorization = {
 };
 
 describe("DHIS2 - User Module - Create User", function () {
-
+    // TODO: the second time the test is executed it fails. Delete user if user exists before create?
     it("should create a new User", function () {
         var johnDoe = {
             "firstName": "John",

docker-compose.yml

@@ -12,10 +12,20 @@ services:
       - "5432:5432"
   web:
     container_name: dhis2-web
-    image: pgracio/dhis2-web:latest
+    image: pgracio/dhis2-web:2.23-tomcat7-jre8
     environment:
       JAVA_OPTS: "-Xmx1024m -Xms4000m"
     links:
       - database
     ports:
-      - "8085:8080"
+      - "8085:8080"
+    depends_on:
+      - database
+    entrypoint: ./wait-for-it.sh -t 0 database:5432 --
+    command: catalina.sh run # https://github.com/docker/compose/issues/3140
+  system-test:
+    container_name: dhis2-system-test
+    image: pgracio/dhis2-system-test
+    depends_on:
+      - web
+    command: dockerize "-wait" "http://dhis2-web:8080" "-timeout" "120s" "mocha" "system-test/dhis2.js"

wait-for-it.sh

@@ -0,0 +1,155 @@
+#!/usr/bin/env bash
+#   https://github.com/vishnubob/wait-for-it
+#   Use this script to test if a given TCP host/port are available
+
+cmdname=$(basename $0)
+
+echoerr() { if [[ $QUIET -ne 1 ]]; then echo "$@" 1>&2; fi }
+
+usage()
+{
+    cat << USAGE >&2
+Usage:
+    $cmdname host:port [-s] [-t timeout] [-- command args]
+    -h HOST | --host=HOST       Host or IP under test
+    -p PORT | --port=PORT       TCP port under test
+                                Alternatively, you specify the host and port as host:port
+    -s | --strict               Only execute subcommand if the test succeeds
+    -q | --quiet                Don't output any status messages
+    -t TIMEOUT | --timeout=TIMEOUT
+                                Timeout in seconds, zero for no timeout
+    -- COMMAND ARGS             Execute command with args after the test finishes
+USAGE
+    exit 1
+}
+wait_for()
+{
+    if [[ $TIMEOUT -gt 0 ]]; then
+        echoerr "$cmdname: waiting $TIMEOUT seconds for $HOST:$PORT"
+    else
+        echoerr "$cmdname: waiting for $HOST:$PORT without a timeout"
+    fi
+    start_ts=$(date +%s)
+    while :
+    do
+        (echo > /dev/tcp/$HOST/$PORT) >/dev/null 2>&1
+        result=$?
+        if [[ $result -eq 0 ]]; then
+            end_ts=$(date +%s)
+            echoerr "$cmdname: $HOST:$PORT is available after $((end_ts - start_ts)) seconds"
+            break
+        fi
+        sleep 1
+    done
+    return $result
+}
+wait_for_wrapper()
+{
+    # In order to support SIGINT during timeout: http://unix.stackexchange.com/a/57692
+    if [[ $QUIET -eq 1 ]]; then
+        timeout $TIMEOUT $0 --quiet --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+    else
+        timeout $TIMEOUT $0 --child --host=$HOST --port=$PORT --timeout=$TIMEOUT &
+    fi
+    PID=$!
+    trap "kill -INT -$PID" INT
+    wait $PID
+    RESULT=$?
+    if [[ $RESULT -ne 0 ]]; then
+        echoerr "$cmdname: timeout occurred after waiting $TIMEOUT seconds for $HOST:$PORT"
+    fi
+    return $RESULT
+}
+# process arguments
+while [[ $# -gt 0 ]]
+do
+    case "$1" in
+        *:* )
+        hostport=(${1//:/ })
+        HOST=${hostport[0]}
+        PORT=${hostport[1]}
+        shift 1
+        ;;
+        --child)
+        CHILD=1
+        shift 1
+        ;;
+        -q | --quiet)
+        QUIET=1
+        shift 1
+        ;;
+        -s | --strict)
+        STRICT=1
+        shift 1
+        ;;
+        -h)
+        HOST="$2"
+        if [[ $HOST == "" ]]; then break; fi
+        shift 2
+        ;;
+        --host=*)
+        HOST="${1#*=}"
+        shift 1
+        ;;
+        -p)
+        PORT="$2"
+        if [[ $PORT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --port=*)
+        PORT="${1#*=}"
+        shift 1
+        ;;
+        -t)
+        TIMEOUT="$2"
+        if [[ $TIMEOUT == "" ]]; then break; fi
+        shift 2
+        ;;
+        --timeout=*)
+        TIMEOUT="${1#*=}"
+        shift 1
+        ;;
+        --)
+        shift
+        CLI="$@"
+        break
+        ;;
+        --help)
+        usage
+        ;;
+        *)
+        echoerr "Unknown argument: $1"
+        usage
+        ;;
+    esac
+done
+if [[ "$HOST" == "" || "$PORT" == "" ]]; then
+    echoerr "Error: you need to provide a host and port to test."
+    usage
+fi
+TIMEOUT=${TIMEOUT:-15}
+STRICT=${STRICT:-0}
+CHILD=${CHILD:-0}
+QUIET=${QUIET:-0}
+if [[ $CHILD -gt 0 ]]; then
+    wait_for
+    RESULT=$?
+    exit $RESULT
+else
+    if [[ $TIMEOUT -gt 0 ]]; then
+        wait_for_wrapper
+        RESULT=$?
+    else
+        wait_for
+        RESULT=$?
+    fi
+fi
+if [[ $CLI != "" ]]; then
+    if [[ $RESULT -ne 0 && $STRICT -eq 1 ]]; then
+        echoerr "$cmdname: strict mode, refusing to execute subprocess"
+        exit $RESULT
+    fi
+    exec $CLI
+else
+    exit $RESULT
+fi