Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/candy-chat/candy.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Langfeld <ben@langfeld.me>2014-08-06 20:06:52 +0400
committerBen Langfeld <ben@langfeld.me>2014-08-06 20:06:52 +0400
commit2d2af284eaf9f4aaf897007dd6896c51b8ffb0d3 (patch)
treed642413c97cb028a30eebaa544d606ed750b6b11
parentf19a0e28ca0c3a0b2e9f12f0cc2f41c42dc49804 (diff)
Run unit tests in NodeJS to avoid browser dependencyfeature/fast_unit_tests
Currently breaks on the following error: ``` TypeError: Cannot read property 'defaultView' of undefined at Sizzle.setDocument (/Users/ben/code/candy/bower_components/jquery/dist/jquery.js:1015:15) ```
-rw-r--r--Gruntfile.js2
-rw-r--r--bower.json2
-rw-r--r--tests/intern.js2
3 files changed, 3 insertions, 3 deletions
diff --git a/Gruntfile.js b/Gruntfile.js
index 90acac2..d0347dc 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -159,7 +159,7 @@ module.exports = function(grunt) {
},
unit: {
options: {
- runType: 'runner',
+ runType: 'client',
config: localInternConfig,
functionalSuites: []
}
diff --git a/bower.json b/bower.json
index b4f50d2..ce5e92e 100644
--- a/bower.json
+++ b/bower.json
@@ -31,7 +31,7 @@
"tests"
],
"dependencies": {
- "jquery": "~1.10.2",
+ "jquery": "2.1.1",
"strophe": "1.1.3",
"strophejs-plugins": "benlangfeld/strophejs-plugins#30fb089457addc37e01d69c3536dee868a90a9ad",
"mustache": "0.3.0",
diff --git a/tests/intern.js b/tests/intern.js
index ef4a27d..29e32f7 100644
--- a/tests/intern.js
+++ b/tests/intern.js
@@ -50,7 +50,7 @@ define({
// Packages that should be registered with the loader in each testing environment
packages: [
{ name: 'candy', location: '.' }
- , { name: 'jquery', location: 'bower_components/jquery', main: 'jquery'}
+ , { name: 'jquery', location: 'bower_components/jquery/dist', main: 'jquery'}
, { name: 'sinon', location: 'node_modules/sinon/lib', main: 'sinon'}
, { name: 'sinon-chai', location: 'node_modules/sinon-chai/lib', main: 'sinon-chai'}
]