diff --git a/Gruntfile.js b/Gruntfile.js
index 7945faff60..9ccba8beae 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,5 +1,11 @@
module.exports = function(grunt) {
grunt.initConfig({
+ mocha_phantomjs: {
+ all: ['www/scripts/tests/index.html']
+ },
+ qunit: {
+ all: ['www/include/js/tests/*.html']
+ },
clean: {
"assets": ["assets", "www/assets"],
},
@@ -120,13 +126,13 @@ module.exports = function(grunt) {
],
"dest": "www/assets/jquery.ui/"
},
- "js-fixture": {
+ "js-fixtures": {
"expand": true,
"src": [
"assets/js-fixtures/LICENSE",
"assets/js-fixtures/fixtures.js"
],
- "dest": "www/assets/js-fixture/",
+ "dest": "www/assets/js-fixtures/",
"flatten": true
},
"json3": {
@@ -166,11 +172,15 @@ module.exports = function(grunt) {
"qunit": {
"expand": true,
"src": [
- "assets/qunit/qunit/qunit.css",
- "assets/qunit/qunit/qunit.js"
+ "qunit/qunit.css",
+ "qunit/qunit.js",
+ "addons/phantomjs/*"
],
"dest": "www/assets/qunit/",
- "flatten": true
+ "cwd": "assets/qunit/",
+ "rename": function(dest, src) {
+ return dest + src.replace("qunit", "");
+ },
},
"requirejs": {
"expand": true,
@@ -223,6 +233,8 @@ module.exports = function(grunt) {
grunt.loadNpmTasks("grunt-contrib");
grunt.loadNpmTasks("grunt-bower-task");
grunt.loadNpmTasks("grunt-bower-postinst");
+ grunt.loadNpmTasks('grunt-mocha-phantomjs');
grunt.registerTask("build-assets", ["clean:assets", "bower", "bower_postinst", "copy", "less"]);
+ grunt.registerTask('test', ["qunit", "mocha_phantomjs"]);
};
diff --git a/bower.json b/bower.json
index 2e4aa507e3..c457f19210 100644
--- a/bower.json
+++ b/bower.json
@@ -16,7 +16,7 @@
"requirejs" : "~2.1",
"backbone-amd": "~1.0",
"underscore-amd": "~1.4",
- "mocha": "~1.9",
+ "mocha": "latest",
"chai" : "~1.6",
"i18next": "~1.6",
"js-fixtures": "https://github.com/badunk/js-fixtures/archive/master.zip",
diff --git a/package.json b/package.json
index b60722df6b..abb5ac5b87 100644
--- a/package.json
+++ b/package.json
@@ -6,10 +6,10 @@
"mocha-phantomjs": ">=2.0 <3.0",
"recess": ">=1.1.0 <1.1.7",
"uglify-js": "latest",
- "phantomjs": "latest",
"grunt": "~0.4.1",
"grunt-contrib": "latest",
"grunt-bower-task": "latest",
- "grunt-bower-postinst": "latest"
+ "grunt-bower-postinst": "latest",
+ "grunt-mocha-phantomjs": "~0.3.0"
}
}
diff --git a/tests/js/run.sh b/tests/js/run.sh
deleted file mode 100755
index 0a2b8dc535..0000000000
--- a/tests/js/run.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-BASEDIR=$(dirname $0)
-ROOTDIR="$BASEDIR/../.."
-
-PHANTOMJS_BIN=""
-MOCHA_PHANTOMJS_BIN=""
-
-if type "$ROOTDIR/node_modules/.bin/phantomjs" > /dev/null; then
- PHANTOMJS_BIN="$ROOTDIR/node_modules/.bin/phantomjs"
-fi
-
-if type "$ROOTDIR/node_modules/.bin/mocha-phantomjs" > /dev/null; then
- MOCHA_PHANTOMJS_BIN="$ROOTDIR/node_modules/.bin/mocha-phantomjs"
-fi
-
-if [ -z "$PHANTOMJS_BIN" ]; then
- echo "phantomjs is required to run JS tests, see https://npmjs.org/package/phantomjs"
- exit 1
-fi
-
-if [ -z "$MOCHA_PHANTOMJS_BIN" ]; then
- echo "mocha-phantomjs is required to run JS tests, see https://npmjs.org/package/mocha-phantomjs"
- exit 1
-fi
-
-# run qunit tests
-$PHANTOMJS_BIN "$ROOTDIR/www/assets/qunit/addons/phantomjs/runner.js" "$ROOTDIR/www/include/js/tests/jquery.Upload.js.html"
-$PHANTOMJS_BIN "$ROOTDIR/www/assets/qunit/addons/phantomjs/runner.js" "$ROOTDIR/www/include/js/tests/jquery.Edit.js.html"
-$PHANTOMJS_BIN "$ROOTDIR/www/assets/qunit/addons/phantomjs/runner.js" "$ROOTDIR/www/include/js/tests/jquery.Selection.js.html"
-
-# run backbone tests
-$MOCHA_PHANTOMJS_BIN "$ROOTDIR/www/scripts/tests/index.html"
-
-
diff --git a/www/include/js/tests/jquery.Edit.js.html b/www/include/js/tests/jquery.Edit.js.html
index 6c08ef2c36..4fe7d44eca 100644
--- a/www/include/js/tests/jquery.Edit.js.html
+++ b/www/include/js/tests/jquery.Edit.js.html
@@ -4,11 +4,14 @@
-
+
-
+
-
+
-
+
-
+
-
+