Commit e3b5e700 authored by Tristan Cavelier's avatar Tristan Cavelier

Merge remote-tracking branch 'xwiki/master'

parents 96cbccb1 a9a83c96
...@@ -7206,6 +7206,7 @@ test ("XWiki Live Server setup", function () { ...@@ -7206,6 +7206,7 @@ test ("XWiki Live Server setup", function () {
var o = setUp(this); var o = setUp(this);
o.jio.stop(); o.jio.stop();
this.sandbox.restore(); this.sandbox.restore();
o.server.restore();
o.jio.start(); o.jio.start();
QUnit.stop(); QUnit.stop();
...@@ -7265,11 +7266,7 @@ test ("XWiki Live Server setup", function () { ...@@ -7265,11 +7266,7 @@ test ("XWiki Live Server setup", function () {
// get Attachment // get Attachment
o.jio.getAttachment({"_id":"one.json", "_attachment":"att.txt"}, waitFor(function(err, ret) { o.jio.getAttachment({"_id":"one.json", "_attachment":"att.txt"}, waitFor(function(err, ret) {
ok(!err); 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) { }).nThen(function(waitFor) {
......
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