diff --git a/src/jio.storage/localstorage.js b/src/jio.storage/localstorage.js index 75979292bd440d9ce7c5285d60423b28a10abaa1..700aad523730619496fa8a63acbd3f3f9b95a507 100644 --- a/src/jio.storage/localstorage.js +++ b/src/jio.storage/localstorage.js @@ -380,7 +380,7 @@ */ that.removeAttachment = function (command) { setTimeout(function () { - var doc, error, i, attachment_list; + var doc, error; error = function (word) { that.error({ "status": 404, diff --git a/test/jio.storage/localstorage.tests.js b/test/jio.storage/localstorage.tests.js index 4be3612943ab0e9ad4a6a23d6060ae4769e76d3a..c59adabb57173a7fe0896396f5431f9f8dc9768d 100644 --- a/test/jio.storage/localstorage.tests.js +++ b/test/jio.storage/localstorage.tests.js @@ -1,5 +1,6 @@ /*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); (function (dependencies, module) { diff --git a/test/queries/tests.js b/test/queries/tests.js index 4d4ac853062f9f22b2d98e29f8bd73a807930acd..3540c16fdbe0dbe8a87d27785799df3d48c13a51 100644 --- a/test/queries/tests.js +++ b/test/queries/tests.js @@ -1,5 +1,6 @@ /*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); (function (dependencies, module) { @@ -36,7 +37,7 @@ ]; complex_queries.QueryFactory.create('identifier: "a"').exec(doc_list); deepEqual(doc_list, [ - {"identifier": "a"}, + {"identifier": "a"} ], 'Document with several identifier should be removed'); doc_list = [ diff --git a/test/run-qunit.js b/test/run-qunit.js index 8f7d3b145ca85428878e8a798c3a489e3ed23098..4c3c5c908089fcfdc2537345fff1951b9e346834 100644 --- a/test/run-qunit.js +++ b/test/run-qunit.js @@ -1,83 +1,85 @@ /*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 - * on a server response or for a ui change (fadeIn, etc.) to occur. - * - * @method waitFor - * @param {Function} testFx Condition that evaluates to a boolean - * @param {Function} onReady What to do when testFx condition is fulfilled - * @param {Number} time_out_millis The max amount of time to wait. - * If not specified, 10 sec is used. - */ -function waitFor(testFx, onReady, time_out_millis) { - var maxtime_out_millis, start, condition, interval; - maxtime_out_millis = time_out_millis || 10001; - start = new Date().getTime(); - condition = false; - interval = setInterval(function () { - if ((new Date().getTime() - start < maxtime_out_millis) && !condition) { - // If not time-out yet and condition not yet fulfilled - condition = testFx(); - } else { - if (!condition) { - // If condition still not fulfilled (timeout but condition is 'false') - console.log("'waitFor()' timeout"); - phantom.exit(1); + /** + * Wait until the test condition is true or a timeout occurs. Useful for + * waiting on a server response or for a ui change (fadeIn, etc.) to occur. + * + * @method waitFor + * @param {Function} testFx Condition that evaluates to a boolean + * @param {Function} onReady What to do when testFx condition is fulfilled + * @param {Number} time_out_millis The max amount of time to wait. + * If not specified, 10 sec is used. + */ + function waitFor(testFx, onReady, time_out_millis) { + var maxtime_out_millis, start, condition, interval; + maxtime_out_millis = time_out_millis || 10001; + start = new Date().getTime(); + condition = false; + interval = setInterval(function () { + if ((new Date().getTime() - start < maxtime_out_millis) && !condition) { + // If not time-out yet and condition not yet fulfilled + condition = testFx(); } 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 + if (!condition) { + // If condition still not fulfilled (timeout but condition is 'false') + console.log("'waitFor()' timeout"); + phantom.exit(1); + } 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) { - console.log('Usage: run-qunit.js URL'); - phantom.exit(1); -} + if (system.args.length !== 2) { + console.log('Usage: run-qunit.js URL'); + 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 -// context (i.e. current "this") -page.onConsoleMessage = function (msg) { - console.log(msg); -}; + // Route "console.log()" calls from within the Page context to the main + // Phantom context (i.e. current "this") + page.onConsoleMessage = function (msg) { + console.log(msg); + }; -page.open(system.args[1], function (status) { - if (status !== "success") { - console.log("Unable to access network"); - phantom.exit(1); - } - waitFor(function () { - return page.evaluate(function () { - var el = document.getElementById('qunit-testresult'); - if (el && el.innerText.match('completed')) { - return true; - } - return false; - }); - }, function () { - var failedNum = page.evaluate(function () { - console.log("========================================================"); - console.log(document.documentElement.innerHTML); - console.log("========================================================"); - var el = document.getElementById('qunit-testresult'); - console.log(el.innerText); - try { - return el.getElementsByClassName('failed')[0].innerHTML; - } catch (e) { } - return 10000; + page.open(system.args[1], function (status) { + if (status !== "success") { + console.log("Unable to access network"); + phantom.exit(1); + } + waitFor(function () { + return page.evaluate(function () { + var el = document.getElementById('qunit-testresult'); + if (el && el.innerText.match('completed')) { + return true; + } + return false; + }); + }, function () { + var failedNum = page.evaluate(function () { + console.log("========================================================"); + console.log(document.documentElement.innerHTML); + console.log("========================================================"); + var el = document.getElementById('qunit-testresult'); + console.log(el.innerText); + try { + return el.getElementsByClassName('failed')[0].innerHTML; + } catch (ignore) { } + return 10000; + }); + phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0); }); - phantom.exit((parseInt(failedNum, 10) > 0) ? 1 : 0); }); -}); +}()); diff --git a/test/tests.require.js b/test/tests.require.js index 41f0e6a4effe0094275efa84c57d7da91ede6cfd..8b7e26b5e3cc5b779c9db934309bd3778f54062a 100644 --- a/test/tests.require.js +++ b/test/tests.require.js @@ -58,6 +58,6 @@ "gidstorage_tests", "davstorage_tests", "xwikistorage_tests", - "s3storage_tests", + "s3storage_tests" ]); }());