From e3dc50e77204e9eeb8ac9e1c77a8bdc9f80960a0 Mon Sep 17 00:00:00 2001 From: Salvatore Iovene Date: Mon, 14 Jan 2013 11:34:44 +0200 Subject: [PATCH] Cleans up the test runner a bit. --- package.json | 3 ++- tests/run.sh | 15 ++++++++++++--- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index e5d2b69..5f080ca 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "grunt-exec": "0.3.0", "uglify-js": "1.3.3", "jshint": "0.6.1", - "hogan.js": ">= 2.0.0" + "hogan.js": ">= 2.0.0", + "connect": ">= 2.7.2" } } diff --git a/tests/run.sh b/tests/run.sh index da41587..7d5b0bd 100755 --- a/tests/run.sh +++ b/tests/run.sh @@ -1,6 +1,15 @@ #!/bin/sh -node tests/server.js & +echo "Starting server..." +node tests/server.js >/dev/null & + +echo "Waiting for server to be ready..." sleep 2 + +echo "Starting tests..." phantomjs tests/phantom.js "http://localhost:3000/tests" -kill -9 `cat tests/pid.txt` -rm tests/pid.txt + +echo "Cleaning up..." +kill -9 `cat tests/pid.txt` >/dev/null +rm tests/pid.txt > /dev/null + +echo "All done." -- 2.7.4