diff --git a/tests/apps/dockerfile/app.json b/tests/apps/dockerfile/app.json index d3d57e1fe..80fd1ed17 100644 --- a/tests/apps/dockerfile/app.json +++ b/tests/apps/dockerfile/app.json @@ -23,6 +23,10 @@ "WEB_CONCURRENCY": { "description": "The number of processes to run.", "generator": "echo 5" + }, + "FROM_APP_JSON": { + "description": "The number of processes to run.", + "value": "'foo\nbar'" } }, "image": "gliderlabs/herokuish", diff --git a/tests/apps/dockerfile/check_deploy b/tests/apps/dockerfile/check_deploy index b652fb8f6..6c9b953ce 100755 --- a/tests/apps/dockerfile/check_deploy +++ b/tests/apps/dockerfile/check_deploy @@ -1,2 +1,18 @@ #!/usr/bin/env bash -set -e; output="$(curl -s -S "$1")"; echo "$output"; test "$output" == "Hello World!" +set -e; + +test_url () { + path="$1" + expected_output="$2" + url="$base_url$path" + output="$(curl -s -S "$url:3000")" + echo "$output" + test "$output" == "$expected_output" +} + +base_url="$1" +test_url / "Hello World!" +test_url /env/FROM_APP_JSON "'foo +bar'" +test_url /env/HELLO "Hello + 'world' " \ No newline at end of file diff --git a/tests/apps/dockerfile/index.js b/tests/apps/dockerfile/index.js index be6855ac3..027e20aa4 100644 --- a/tests/apps/dockerfile/index.js +++ b/tests/apps/dockerfile/index.js @@ -8,6 +8,10 @@ app.get('/', function(request, response) { response.send('Hello World!') }) +app.get('/env/:key', function(request, response) { + response.send(process.env[request.params["key"]]) +}) + app.listen(app.get('port'), function() { console.log("Node app is running at localhost:" + app.get('port')) }) diff --git a/tests/apps/dockerfile/post-deploy b/tests/apps/dockerfile/post-deploy new file mode 100755 index 000000000..973188fb0 --- /dev/null +++ b/tests/apps/dockerfile/post-deploy @@ -0,0 +1,9 @@ +#!/usr/bin/env bash +set -ex; + +REMOTE=$1 +REPO=$2 + +GREETING=$(printf "Hello + 'world' " | base64) +ssh "$REMOTE" config:set --encoded "$REPO" HELLO="$GREETING"