Simplify test setup

* Remove require hooks and use plugin option instead
* Switched to centralized CLI test harness

Author: moonglum

package.json

@@ -23,7 +23,6 @@
 		"eslint": "^4.4.1",
 		"eslint-config-fnd": "^1.2.0",
 		"json-diff": "^0.5.2",
-		"node-hook": "^1.0.0",
 		"release-util-fnd": "^1.0.5"
 	}
 }

test/hooks.js

@@ -1,88 +1,36 @@
 #!/usr/bin/env bash
-
-set -e
+set -euo pipefail
 
 root=`dirname "$0"`
-root=`realpath "$root/.."`
-. "$root/test/local.sh"
-
-function begin {
-	test_dir="${1:?}"
-	echo; echo `basename "$test_dir"`
-	pushd "$test_dir" > /dev/null
-}
-
-function end {
-	bundles_dir=${1:-"./dist"}
-	rm -r "$bundles_dir"
-	popd > /dev/null
-}
-
-function assert_identical {
-	actual="${1:?}"
-	expected="${2:?}"
-	# NB: `git diff` provides colorization (dependent on configuration)
-	git diff --no-index "$expected" "$actual" || \
-			fail "files \`$actual\` and \`$expected\` are not identical"
-}
-
-function assert_identical_json {
-	actual="${1:?}"
-	expected="${2:?}"
-	json-diff "$expected" "$actual" || \
-			fail "files \`$actual\` and \`$expected\` are not identical"
-}
+root=`realpath "$root"`
 
-function assert_manifest {
-	asset_path="${1:?}"
-	uri="${2:?}"
-	manifest_path=${3:-"./dist/manifest.json"}
+. "$root/../node_modules/faucet-pipeline/test/cli_harness.sh"
 
-	json="\"$asset_path\":\"$uri\""
-	grep -q "$json" "$manifest_path" || \
-			fail "manifest \`$manifest_path\` does not contain \`$json\`"
-}
-
-function assert_missing {
-	filepath="${1:?}"
-	if [ -f "$filepath" ]; then
-		fail "file \`$filepath\` should not exist"
-	else
-		true
-	fi
-}
-
-function fail {
-	msg="${1:?}"
-	echo; echo "FAILURE: $msg"
-	false
-}
-
-cd "$root/test"
-
-begin "./test_basic"
+begin "$root/test_basic"
 	faucet
 	assert_identical "./dist/test.txt" "./src/test.txt"
 	assert_identical "./dist/inner/test2.txt" "./src/inner/test2.txt"
 end
 
-begin "./test_fingerprint"
+begin "$root/test_fingerprint"
 	faucet --fingerprint
 	assert_identical "./dist/test-e59ff97941044f85df5297e1c302d260.txt" "./src/test.txt"
-	assert_identical_json "./dist/manifest.json" "./expected.json"
+	assert_json "./dist/manifest.json" "./expected.json"
 end
 
-begin "./test_manifest_base_uri"
+begin "$root/test_manifest_base_uri"
 	faucet --fingerprint
-	assert_identical_json "./dist/manifest.json" "./expected.json"
+	assert_json "./dist/manifest.json" "./expected.json"
 end
 
-begin "./test_single"
+begin "$root/test_single"
 	faucet
 	assert_identical "./dist/dist.txt" "./src.txt"
 end
 
-begin "./test_key_config"
+begin "$root/test_key_config"
 	faucet --fingerprint
-	assert_identical_json "./dist/manifest.json" "./expected.json"
+	assert_json "./dist/manifest.json" "./expected.json"
 end
+
+echo; echo "SUCCESS: all tests passed"

test/local.sh

@@ -1,8 +1,12 @@
 "use strict";
+let path = require("path");
 
 module.exports = {
 	static: [{
 		source: "./src",
 		target: "./dist"
-	}]
+	}],
+	plugins: {
+		"static": path.resolve("../..")
+	}
 };

test/run

@@ -1,4 +1,5 @@
 "use strict";
+let path = require("path");
 
 module.exports = {
 	static: [{
@@ -7,5 +8,8 @@ module.exports = {
 	}],
 	manifest: {
 		file: "./dist/manifest.json"
+	},
+	plugins: {
+		"static": path.resolve("../..")
 	}
 };

test/test_basic/faucet.config.js

@@ -9,5 +9,8 @@ module.exports = {
 	manifest: {
 		file: "./dist/manifest.json",
 		key: (f, targetDir) => path.relative(targetDir, f)
+	},
+	plugins: {
+		"static": path.resolve("../..")
 	}
 };

test/test_fingerprint/faucet.config.js

@@ -9,5 +9,8 @@ module.exports = {
 	manifest: {
 		file: "./dist/manifest.json",
 		value: f => `/assets/${path.relative("./dist", f)}`
+	},
+	plugins: {
+		"static": path.resolve("../..")
 	}
 };

test/test_key_config/faucet.config.js

@@ -1,8 +1,12 @@
 "use strict";
+let path = require("path");
 
 module.exports = {
 	static: [{
 		source: "./src.txt",
 		target: "./dist/dist.txt"
-	}]
+	}],
+	plugins: {
+		"static": path.resolve("../..")
+	}
 };