Fix js tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>

diff --git a/autotest-js.sh b/autotest-js.sh
index 475a61df59e21c49f05dcc03ce7c3a290c603bd2..bd7310c4e438fa1da531cc5061cdcdfb1247aa6c 100755 (executable)
--- 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 6058d6785e00d609451948cf8118cc1d8e6ec7e3..67e999aaf310e4c5570e8f0a6149486f58981378 100644 (file)
--- 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 f20672f4a55d3d912880d37a7199226b572a2e7e..933d6c57410ea4e93a54a0aa494045536e28d218 100644 (file)
--- 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({