mirrors/zotero
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages1 Wiki Activity Actions

Adjust error and feed tests for access error on read-only libraries

Browse source
This commit is contained in:
Dan Stillman 2015-09-22 00:55:41 -04:00
parent 8daef1fad0
commit add9481c63
3 changed files with 6 additions and 5 deletions
chrome/content/zotero/xpcom/data
dataObject.js
test/tests
feedItemTest.jsfeedTest.js

5
chrome/content/zotero/xpcom/data/dataObject.js
View file

@ -824,8 +824,9 @@ Zotero.DataObject.prototype.editCheck = function () {
throw new Error(this._ObjectTypePlural + " cannot be added to My Publications");
}
if (!Zotero.Sync.Server.updatesInProgress && !Zotero.Sync.Storage.updatesInProgress && !this.isEditable()) {
throw ("Cannot edit " + this._objectType + " in read-only Zotero library");
if (!this.isEditable()) {
throw new Error("Cannot edit " + this._objectType + " in read-only library "
+ Zotero.Libraries.getName(this.libraryID));
}
}

4
test/tests/feedItemTest.js
View file

@ -94,7 +94,7 @@ describe("Zotero.FeedItem", function () {
it("should require edit check override", function* () {
let feedItem = new Zotero.FeedItem('book', { guid: Zotero.randomString() });
feedItem.libraryID = feed.libraryID;
yield assert.isRejected(feedItem.saveTx(), /^Error: Cannot edit feedItem in read-only Zotero library$/);
yield assert.isRejected(feedItem.saveTx(), /^Error: Cannot edit feedItem in read-only library/);
});
it("should require feed being set", function* () {
let feedItem = new Zotero.FeedItem('book', { guid: Zotero.randomString() });
@ -172,7 +172,7 @@ describe("Zotero.FeedItem", function () {
it("should require edit check override to erase", function* () {
let feedItem = yield createDataObject('feedItem', { libraryID });
yield assert.isRejected(feedItem.eraseTx(), /^Error: Cannot edit feedItem in read-only Zotero library$/);
yield assert.isRejected(feedItem.eraseTx(), /^Error: Cannot edit feedItem in read-only library/);
});
});
});

2
test/tests/feedTest.js
View file

@ -63,7 +63,7 @@ describe("Zotero.Feed", function() {
let feed = yield createFeed();
let feedItem = new Zotero.FeedItem('book', { guid: Zotero.randomString() });
feedItem.libraryID = feed.libraryID;
yield assert.isRejected(feedItem.saveTx(), /^Error: Cannot edit feedItem in read-only Zotero library$/);
yield assert.isRejected(feedItem.saveTx(), /^Error: Cannot edit feedItem in read-only library/);
yield assert.isFulfilled(feedItem.saveTx({ skipEditCheck: true }));
});
});