Merge pull request #1097 from JonathanGeoffroy/issue993

rewrite amberVersionTest.sh test using shell.js

external/amber-cli/package.json

@@ -33,7 +33,7 @@
     "amberc": "./support/amberc-cli.js"
   },
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1"
+    "test": "node ./tests/amberVersionTest.js"
   },
   "dependencies": {
     "amber": "^0.13.0",
@@ -42,5 +42,9 @@
     "bower": "^1.3.9",
     "amber-dev": "^0.2.2",
     "grunt-cli": "^0.1.13"
+  },
+  "devDependencies": {
+    "shelljs":"^0.3.0",
+    "colors":"^1.0.3"
   }
 }

external/amber-cli/tests/amberVersionTest.js

@@ -0,0 +1,21 @@
+// Tests if the `amber version` command returns the expected amber version number, according to the configuration file `package.json`
+// Displays 'ok' in green if test succeeds, else 'not ok' in red.
+
+require('shelljs/global');
+require('colors');
+
+var JSON_PACKAGE_PATH = '../package.json'; // {amber directory}/external/amber-cli/package.json
+var AMBER_VERSION_COMMAND = './support/amber-cli.js version';
+
+var amberResult = exec("node " + AMBER_VERSION_COMMAND, {silent: true}).output;
+var expectedAmberVersion = require(JSON_PACKAGE_PATH).version;
+
+// tests if expected amber version is in the result of `amber version` command
+if (amberResult.indexOf(expectedAmberVersion) > -1) {
+	console.log("ok 1 - amber version".green);
+	exit(0);
+} else {
+	console.log(amberResult.red);
+	console.log(("not ok 1 - amber version\n\texpected : " + expectedAmberVersion).red);
+	exit(1);
+}

external/amber-cli/tests/amberVersionTest.sh

@@ -1,30 +0,0 @@
-#!/bin/bash
-
-# Tests if the `amber version` command returns the expected amber version number, according to the configuration file `package.json`
-# Displays 'ok' in green if test succeeds, else 'not ok' in red.
-
-JSON_PACKAGE_PATH='../package.json' # {amber directory}/external/amber-cli/package.json
-AMBER_VERSION_COMMAND='../support/amber-cli.js version'
-
-RED="1;31"
-GREEN="1;32"
-
-function makeItColorful {
-	echo -e "\e[$2m$1\e[0m"
-}
-
-amberResult=`node $AMBER_VERSION_COMMAND`
-
-expectedAmberVersion=`node --eval "console.log(require('./$JSON_PACKAGE_PATH').version)"`
-
-# tests if expected amber version is in the result of `amber version` command
-echo $amberResult | grep $expectedAmberVersion > /dev/null 2>&1
-if [ $? -eq 0 ]
-then
-	makeItColorful "ok 1 - amber version" $GREEN
-	exit 0
-else
-	makeItColorful "$amberResult" $RED
-	makeItColorful "not ok 1 - amber version\n\texpected : $expectedAmberVersion" $RED
-	exit 1
-fi