From add9481c631c54f67d1f529f1f411e018076ba34 Mon Sep 17 00:00:00 2001
From: Dan Stillman <dstillman@zotero.org>
Date: Tue, 22 Sep 2015 00:55:41 -0400
Subject: [PATCH] Adjust error and feed tests for access error on read-only
 libraries

---
 chrome/content/zotero/xpcom/data/dataObject.js | 5 +++--
 test/tests/feedItemTest.js                     | 4 ++--
 test/tests/feedTest.js                         | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/chrome/content/zotero/xpcom/data/dataObject.js b/chrome/content/zotero/xpcom/data/dataObject.js
index 0156df3d7..49396d105 100644
--- a/chrome/content/zotero/xpcom/data/dataObject.js
+++ b/chrome/content/zotero/xpcom/data/dataObject.js
@@ -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));
 	}
 }
 
diff --git a/test/tests/feedItemTest.js b/test/tests/feedItemTest.js
index dd7e96443..dbf069771 100644
--- a/test/tests/feedItemTest.js
+++ b/test/tests/feedItemTest.js
@@ -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/);
 		});
 	});
 });
diff --git a/test/tests/feedTest.js b/test/tests/feedTest.js
index ed7dbc550..52d1d13a5 100644
--- a/test/tests/feedTest.js
+++ b/test/tests/feedTest.js
@@ -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 }));
 		});
 	});