Merge remote-tracking branch 'xwiki/master'

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();
-            fr.onload = waitFor(function(dat) {
-                ok(dat.target.result == "there2");
-            });
-            fr.readAsText(ret);
+            ok(ret == "there2");
         }));
 
     }).nThen(function(waitFor) {