suzanne.soy/zotero
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix failures on Travis due to broken isDir

Browse Source
This commit is contained in:
Dan Stillman 2016-12-12 06:57:42 -05:00
parent 3f32523709
commit c2ebcc9dbc
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
chrome/content/zotero/xpcom/attachments.js
View File

@ -796,7 +796,16 @@ Zotero.Attachments = new function(){
throw new Error("'item' must be a Zotero.Item");
}
var dir = this.getStorageDirectory(item).path;
yield OS.File.removeDir(dir, { ignoreAbsent: true });
// Testing for directories in OS.File, used by removeDir(), is broken on Travis, so use nsIFile
if (Zotero.automatedTest) {
let nsIFile = Zotero.File.pathToFile(dir);
if (nsIFile.exists()) {
nsIFile.remove(true);
}
}
else {
yield OS.File.removeDir(dir, { ignoreAbsent: true });
}
yield Zotero.File.createDirectoryIfMissingAsync(dir);
return dir;
});