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

Fix error showing some WebDAV verification errors

Browse Source
This commit is contained in:
Dan Stillman 2017-03-13 16:02:12 -07:00
parent 640aaa1557
commit a3473896a5
2 changed files with 62 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
chrome/content/zotero/xpcom/storage/webdav.js
View File

@ -755,7 +755,7 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
if (err instanceof Zotero.HTTP.UnexpectedStatusException) { if (err instanceof Zotero.HTTP.UnexpectedStatusException) {
switch (err.status) { switch (err.status) {
case 0: case 0:
errorMsg = Zotero.getString('sync.storage.error.serverCouldNotBeReached', uri.host); errorMsg = Zotero.getString('sync.storage.error.serverCouldNotBeReached', err.channel.URI.host);
break; break;
case 401: case 401:
@ -766,7 +766,7 @@ Zotero.Sync.Storage.Mode.WebDAV.prototype = {
case 403: case 403:
errorTitle = Zotero.getString('general.permissionDenied'); errorTitle = Zotero.getString('general.permissionDenied');
errorMsg = Zotero.getString('sync.storage.error.webdav.permissionDenied', uri.path) errorMsg = Zotero.getString('sync.storage.error.webdav.permissionDenied', err.channel.URI.path)
+ "\n\n" + Zotero.getString('sync.storage.error.checkFileSyncSettings'); + "\n\n" + Zotero.getString('sync.storage.error.checkFileSyncSettings');
break; break;

69
test/tests/webdavTest.js
View File

@ -6,10 +6,6 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
// //
Components.utils.import("resource://zotero-unit/httpd.js"); Components.utils.import("resource://zotero-unit/httpd.js");
var apiKey = Zotero.Utilities.randomString(24);
var apiPort = 16213;
var apiURL = `http://localhost:${apiPort}/`;
var davScheme = "http"; var davScheme = "http";
var davPort = 16214; var davPort = 16214;
var davBasePath = "/webdav/"; var davBasePath = "/webdav/";
@ -50,10 +46,6 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
return params; return params;
} }
function assertAPIKey(request) {
assert.equal(request.requestHeaders["Zotero-API-Key"], apiKey);
}
beforeEach(function* () { beforeEach(function* () {
yield resetDB({ yield resetDB({
thisArg: this, thisArg: this,
@ -136,6 +128,7 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
}) })
after(function* () { after(function* () {
Zotero.HTTP.mock = null;
if (win) { if (win) {
win.close(); win.close();
} }
@ -593,7 +586,65 @@ describe("Zotero.Sync.Storage.Mode.WebDAV", function () {
assert.equal(item.attachmentSyncedModificationTime, newModTime); assert.equal(item.attachmentSyncedModificationTime, newModTime);
assert.isTrue(item.synced); assert.isTrue(item.synced);
}) })
}) });
describe("Verify Server", function () {
it("should show an error for a connection error", function* () {
Zotero.HTTP.mock = null;
Zotero.Prefs.set("sync.storage.url", "127.0.0.1:9999");
// Begin install procedure
var win = yield loadPrefPane('sync');
var button = win.document.getElementById('storage-verify');
var spy = sinon.spy(win.Zotero_Preferences.Sync, "verifyStorageServer");
var promise1 = waitForDialog(function (dialog) {
assert.include(
dialog.document.documentElement.textContent,
Zotero.getString('sync.storage.error.serverCouldNotBeReached', '127.0.0.1')
);
});
button.click();
yield promise1;
var promise2 = spy.returnValues[0];
spy.restore();
yield promise2;
});
it("should show an error for a 403", function* () {
Zotero.HTTP.mock = null;
this.httpd.registerPathHandler(
`${davBasePath}zotero/`,
{
handle: function (request, response) {
response.setStatusLine(null, 403, null);
}
}
);
// Use httpd.js instead of sinon so we get a real nsIURL with a channel
Zotero.Prefs.set("sync.storage.url", davHostPath);
// Begin install procedure
var win = yield loadPrefPane('sync');
var button = win.document.getElementById('storage-verify');
var spy = sinon.spy(win.Zotero_Preferences.Sync, "verifyStorageServer");
var promise1 = waitForDialog(function (dialog) {
assert.include(
dialog.document.documentElement.textContent,
Zotero.getString('sync.storage.error.webdav.permissionDenied', davBasePath + 'zotero/')
);
});
button.click();
yield promise1;
var promise2 = spy.returnValues[0];
spy.restore();
yield promise2;
});
});
describe("#purgeDeletedStorageFiles()", function () { describe("#purgeDeletedStorageFiles()", function () {
beforeEach(function () { beforeEach(function () {