Commit f561b32e authored by Tristan Cavelier's avatar Tristan Cavelier

jslint pass

parent dd360f2f
...@@ -380,7 +380,7 @@ ...@@ -380,7 +380,7 @@
*/ */
that.removeAttachment = function (command) { that.removeAttachment = function (command) {
setTimeout(function () { setTimeout(function () {
var doc, error, i, attachment_list; var doc, error;
error = function (word) { error = function (word) {
that.error({ that.error({
"status": 404, "status": 404,
......
/*jslint indent: 2, maxlen: 80, nomen: true */ /*jslint indent: 2, maxlen: 80, nomen: true */
/*global define, jIO, jio_tests, window, test, ok, deepEqual, sinon, expect */ /*global define, module, jIO, jio_tests, window, test, ok, deepEqual, sinon,
expect */
// define([module_name], [dependencies], module); // define([module_name], [dependencies], module);
(function (dependencies, module) { (function (dependencies, module) {
......
/*jslint indent: 2, maxlen: 80, nomen: true */ /*jslint indent: 2, maxlen: 80, nomen: true */
/*global define, complex_queries, window, test, ok, deepEqual, sinon */ /*global define, exports, require, module, complex_queries, window, test, ok,
deepEqual, sinon */
// define([module_name], [dependencies], module); // define([module_name], [dependencies], module);
(function (dependencies, module) { (function (dependencies, module) {
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
]; ];
complex_queries.QueryFactory.create('identifier: "a"').exec(doc_list); complex_queries.QueryFactory.create('identifier: "a"').exec(doc_list);
deepEqual(doc_list, [ deepEqual(doc_list, [
{"identifier": "a"}, {"identifier": "a"}
], 'Document with several identifier should be removed'); ], 'Document with several identifier should be removed');
doc_list = [ doc_list = [
......
/*jslint indent: 2, maxlen: 80 */ /*jslint indent: 2, maxlen: 80 */
/*global require: true, phantom: true, document: true */ /*global require, phantom, document, setInterval, clearInterval, console */
"use strict"; (function () {
"use strict";
var system = require('system'); var system = require('system'), page;
/** /**
* Wait until the test condition is true or a timeout occurs. Useful for waiting * Wait until the test condition is true or a timeout occurs. Useful for
* on a server response or for a ui change (fadeIn, etc.) to occur. * waiting on a server response or for a ui change (fadeIn, etc.) to occur.
* *
* @method waitFor * @method waitFor
* @param {Function} testFx Condition that evaluates to a boolean * @param {Function} testFx Condition that evaluates to a boolean
* @param {Function} onReady What to do when testFx condition is fulfilled * @param {Function} onReady What to do when testFx condition is fulfilled
* @param {Number} time_out_millis The max amount of time to wait. * @param {Number} time_out_millis The max amount of time to wait.
* If not specified, 10 sec is used. * If not specified, 10 sec is used.
*/ */
function waitFor(testFx, onReady, time_out_millis) { function waitFor(testFx, onReady, time_out_millis) {
var maxtime_out_millis, start, condition, interval; var maxtime_out_millis, start, condition, interval;
maxtime_out_millis = time_out_millis || 10001; maxtime_out_millis = time_out_millis || 10001;
start = new Date().getTime(); start = new Date().getTime();
condition = false; condition = false;
interval = setInterval(function () { interval = setInterval(function () {
if ((new Date().getTime() - start < maxtime_out_millis) && !condition) { if ((new Date().getTime() - start < maxtime_out_millis) && !condition) {
// If not time-out yet and condition not yet fulfilled // If not time-out yet and condition not yet fulfilled
condition = testFx(); condition = testFx();
} else {
if (!condition) {
// If condition still not fulfilled (timeout but condition is 'false')
console.log("'waitFor()' timeout");
phantom.exit(1);
} else { } else {
// Condition fulfilled (timeout and/or condition is 'true') if (!condition) {
console.log("'waitFor()' finished in " + // If condition still not fulfilled (timeout but condition is 'false')
(new Date().getTime() - start) + "ms."); console.log("'waitFor()' timeout");
onReady(); phantom.exit(1);
clearInterval(interval); //< Stop this interval } else {
// Condition fulfilled (timeout and/or condition is 'true')
console.log("'waitFor()' finished in " +
(new Date().getTime() - start) + "ms.");
onReady();
clearInterval(interval); //< Stop this interval
}
} }
} }, 100); //< repeat check every 100ms
}, 100); //< repeat check every 100ms }
}
if (system.args.length !== 2) { if (system.args.length !== 2) {
console.log('Usage: run-qunit.js URL'); console.log('Usage: run-qunit.js URL');
phantom.exit(1); phantom.exit(1);
} }
var page = require('webpage').create(); page = require('webpage').create();
// Route "console.log()" calls from within the Page context to the main Phantom // Route "console.log()" calls from within the Page context to the main
// context (i.e. current "this") // Phantom context (i.e. current "this")
page.onConsoleMessage = function (msg) { page.onConsoleMessage = function (msg) {
console.log(msg); console.log(msg);
}; };
page.open(system.args[1], function (status) { page.open(system.args[1], function (status) {
if (status !== "success") { if (status !== "success") {
console.log("Unable to access network"); console.log("Unable to access network");
phantom.exit(1); phantom.exit(1);
} }
waitFor(function () { waitFor(function () {
return page.evaluate(function () { return page.evaluate(function () {
var el = document.getElementById('qunit-testresult'); var el = document.getElementById('qunit-testresult');
if (el && el.innerText.match('completed')) { if (el && el.innerText.match('completed')) {
return true; return true;
} }
return false; return false;
}); });
}, function () { }, function () {
var failedNum = page.evaluate(function () { var failedNum = page.evaluate(function () {
console.log("========================================================"); console.log("========================================================");
console.log(document.documentElement.innerHTML); console.log(document.documentElement.innerHTML);
console.log("========================================================"); console.log("========================================================");
var el = document.getElementById('qunit-testresult'); var el = document.getElementById('qunit-testresult');
console.log(el.innerText); console.log(el.innerText);
try { try {
return el.getElementsByClassName('failed')[0].innerHTML; return el.getElementsByClassName('failed')[0].innerHTML;
} catch (e) { } } catch (ignore) { }
return 10000; return 10000;
});
phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0);
}); });
phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0);
}); });
}); }());
...@@ -58,6 +58,6 @@ ...@@ -58,6 +58,6 @@
"gidstorage_tests", "gidstorage_tests",
"davstorage_tests", "davstorage_tests",
"xwikistorage_tests", "xwikistorage_tests",
"s3storage_tests", "s3storage_tests"
]); ]);
}()); }());
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment