Merge remote-tracking branch 'xwiki/master'

e3b5e700 · Tristan Cavelier · 96cbccb1 · a9a83c96 · e3b5e700
Commit e3b5e700 authored May 31, 2013 by Tristan Cavelier
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

test/jiotests.js test/jiotests.js +2 -5

No files found.
--- a/test/jiotests.js
+++ b/test/jiotests.js
@@ -7206,6 +7206,7 @@ test ("XWiki Live Server setup", function () {
    var o = setUp(this);
    o.jio.stop();
    this.sandbox.restore();
+    o.server.restore();
    o.jio.start();
    QUnit.stop();
@@ -7265,11 +7266,7 @@ test ("XWiki Live Server setup", function () {
        // get Attachment
        o.jio.getAttachment({"_id":"one.json", "_attachment":"att.txt"}, waitFor(function(err, ret) {
            ok(!err);
-            var fr = new FileReader();
+            ok(ret == "there2");
-            fr.onload = waitFor(function(dat) {
-                ok(dat.target.result == "there2");
-            });
-            fr.readAsText(ret);
        }));
    }).nThen(function(waitFor) {