From ccab1168cee83509e57fb1d6e843c989cab634ba Mon Sep 17 00:00:00 2001 From: Roeland Jago Douma Date: Fri, 6 Jan 2017 13:33:18 +0100 Subject: [PATCH] Fix js tests Signed-off-by: Roeland Jago Douma --- autotest-js.sh | 4 ++++ build/package.json | 3 ++- tests/karma.config.js | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/autotest-js.sh b/autotest-js.sh index 475a61df59..bd7310c4e4 100755 --- a/autotest-js.sh +++ b/autotest-js.sh @@ -22,6 +22,10 @@ fi # update/install test packages mkdir -p "$PREFIX" && $NPM install --link --prefix "$PREFIX" || exit 3 +# create scss test +mkdir -p tests/css +./build/bin/node-sass --output tests/css core/css + KARMA="$PREFIX/node_modules/karma/bin/karma" NODE_PATH='build/node_modules' KARMA_TESTSUITE="$1" $KARMA start tests/karma.config.js --single-run diff --git a/build/package.json b/build/package.json index 6058d6785e..67e999aaf3 100644 --- a/build/package.json +++ b/build/package.json @@ -17,7 +17,8 @@ "karma-coverage": "*", "karma-phantomjs-launcher": "*", "phantomjs-prebuilt": "*", - "jasmine-core": "~2.5.2" + "jasmine-core": "~2.5.2", + "node-sass": "~4.1.1" }, "engine": "node >= 0.8" } diff --git a/tests/karma.config.js b/tests/karma.config.js index f20672f4a5..933d6c5741 100644 --- a/tests/karma.config.js +++ b/tests/karma.config.js @@ -223,6 +223,7 @@ module.exports = function(config) { // include core CSS files.push({pattern: 'core/css/*.css', watched: true, included: true, served: true}); + files.push({pattern: 'tests/css/*.css', watched: true, included: true, served: true}); config.set({