Fix test running after schema updates
Tests still need to be updated for Bluebird/promisification
This commit is contained in:
parent
fec43f1f62
commit
a91151756b
1 changed files with 4 additions and 3 deletions
|
@ -93,7 +93,7 @@ Zotero.Schema = new function(){
|
||||||
return Zotero.Schema.updateBundledFiles();
|
return Zotero.Schema.updateBundledFiles();
|
||||||
})
|
})
|
||||||
.then(function () {
|
.then(function () {
|
||||||
return _schemaUpdateDeferred.resolve(true);
|
_schemaUpdateDeferred.resolve(true);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -173,6 +173,9 @@ Zotero.Schema = new function(){
|
||||||
.then(1000)
|
.then(1000)
|
||||||
.then(function () {
|
.then(function () {
|
||||||
return Zotero.Schema.updateBundledFiles();
|
return Zotero.Schema.updateBundledFiles();
|
||||||
|
})
|
||||||
|
.then(function () {
|
||||||
|
_schemaUpdateDeferred.resolve(true);
|
||||||
});
|
});
|
||||||
|
|
||||||
return updated;
|
return updated;
|
||||||
|
@ -456,8 +459,6 @@ Zotero.Schema = new function(){
|
||||||
let up2 = yield _updateBundledFilesAtLocation(installLocation, 'styles');
|
let up2 = yield _updateBundledFilesAtLocation(installLocation, 'styles');
|
||||||
var updated = up1 || up2;
|
var updated = up1 || up2;
|
||||||
}
|
}
|
||||||
|
|
||||||
_schemaUpdateDeferred.resolve(true);
|
|
||||||
}
|
}
|
||||||
finally {
|
finally {
|
||||||
_localUpdateInProgress = false;
|
_localUpdateInProgress = false;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue