Permalink
Browse files

travis-841337: Add more jsdom exclusions

jsdom 0.5.0 fixes some stuff (i guess) but breaks some things. This
adds some exclusions.
Also while we're doing updates, this updates express and socket.io to
the latest versions too.

Signed-off-by: Joe Walker <jwalker@mozilla.com>
  • Loading branch information...
1 parent 11677df commit 8084da5fe2340e33eec8c819f1285714793d3953 @joewalker joewalker committed Feb 16, 2013
Showing with 15 additions and 8 deletions.
  1. +12 −5 lib/gclitest/testResource.js
  2. +3 −3 package.json
@@ -39,8 +39,7 @@ exports.shutdown = function(options) {
};
exports.testAllPredictions1 = function(options) {
- // firefox doesn't support digging into scripts/stylesheets
- if (options.isFirefox) {
+ if (options.isFirefox || options.isJsdom) {
assert.log('Skipping checks due to jsdom/firefox document.stylsheets support.');
return;
}
@@ -56,8 +55,7 @@ exports.testAllPredictions1 = function(options) {
};
exports.testScriptPredictions = function(options) {
- // firefox doesn't support digging into scripts
- if (options.isFirefox) {
+ if (options.isFirefox || options.isJsdom) {
assert.log('Skipping checks due to jsdom/firefox document.stylsheets support.');
return;
}
@@ -73,7 +71,6 @@ exports.testScriptPredictions = function(options) {
};
exports.testStylePredictions = function(options) {
- // jsdom/firefox don't support digging into stylesheets
if (options.isFirefox || options.isJsdom) {
assert.log('Skipping checks due to jsdom/firefox document.stylsheets support.');
return;
@@ -90,6 +87,11 @@ exports.testStylePredictions = function(options) {
};
exports.testAllPredictions2 = function(options) {
+ if (options.isJsdom) {
+ assert.log('Skipping checks due to jsdom document.stylsheets support.');
+ return;
+ }
+
var scriptRes = types.getType({ name: 'resource', include: 'text/javascript' });
return scriptRes.getLookup().then(function(scriptOptions) {
var styleRes = types.getType({ name: 'resource', include: 'text/css' });
@@ -105,6 +107,11 @@ exports.testAllPredictions2 = function(options) {
};
exports.testAllPredictions3 = function(options) {
+ if (options.isJsdom) {
+ assert.log('Skipping checks due to jsdom document.stylsheets support.');
+ return;
+ }
+
var res1 = types.getType({ name: 'resource' });
return res1.getLookup().then(function(options1) {
var res2 = types.getType('resource');
View
@@ -8,9 +8,9 @@
},
"dependencies": {
"dryice": ">= 0.4.10",
- "jsdom": ">= 0.2.15",
- "express": ">= 3.0.0rc4",
- "socket.io": ">= 0.9.10"
+ "jsdom": ">= 0.5.0",
+ "express": ">= 3.1.0",
+ "socket.io": ">= 0.9.13"
},
"author": "Joe Walker <jwalker@mozilla.com>",
"main": "lib/gcli",

0 comments on commit 8084da5

Please sign in to comment.