www

commit b9bbf007f086ec8d505fee1fcb01b9db4bab7e1c
parent 2c18968c3ac79d7b99ac5d9970c3424597d90a96
Author: Dan Stillman <dstillman@zotero.org>
Date:   Wed, 18 May 2016 02:28:30 -0400

Don't bother opening browser window for syncLocal::checkUser() tests

The window is passed to nsIPromptService, which handles finding a parent window
(hidden or otherwise) automatically if necessary.

Diffstat:
M
chrome/content/zotero/xpcom/sync/syncLocal.js
 | 
2
+-
M
test/tests/syncLocalTest.js
 | 
16
+++-------------

2 files changed, 4 insertions(+), 14 deletions(-)
diff --git a/chrome/content/zotero/xpcom/sync/syncLocal.js b/chrome/content/zotero/xpcom/sync/syncLocal.js
@@ -91,7 +91,7 @@ Zotero.Sync.Data.Local = {
 	 * If user accepts, change the current user, delete existing groups, and update relation
 	 * URIs to point to the new user's library.
 	 *
-	 * @param {Window}
+	 * @param {Window|null}
 	 * @param {Integer} userID - New userID
 	 * @param {Integer} libraryID - New libraryID
 	 * @return {Boolean} - True to continue, false to cancel
diff --git a/test/tests/syncLocalTest.js b/test/tests/syncLocalTest.js
@@ -22,16 +22,6 @@ describe("Zotero.Sync.Data.Local", function() {
 	
 	
 	describe("#checkUser()", function () {
-		var win;
-		
-		beforeEach(function* () {
-			win = yield loadBrowserWindow();
-		});
-		
-		afterEach(function () {
-			win.close();
-		});
-		
 		it("should prompt for user update and perform on accept", function* () {
 			yield Zotero.Users.setCurrentUserID(1);
 			yield Zotero.Users.setCurrentUsername("A");
@@ -47,7 +37,7 @@ describe("Zotero.Sync.Data.Local", function() {
 				assert.equal(matches[3], "‘A’");
 				handled = true;
 			});
-			var cont = yield Zotero.Sync.Data.Local.checkUser(win, 2, "B");
+			var cont = yield Zotero.Sync.Data.Local.checkUser(null, 2, "B");
 			assert.isTrue(handled);
 			assert.isTrue(cont);
 			
@@ -60,7 +50,7 @@ describe("Zotero.Sync.Data.Local", function() {
 			yield Zotero.Users.setCurrentUsername("A");
 			
 			waitForDialog(false, 'cancel');
-			var cont = yield Zotero.Sync.Data.Local.checkUser(win, 2, "B");
+			var cont = yield Zotero.Sync.Data.Local.checkUser(null, 2, "B");
 			assert.isFalse(cont);
 			
 			assert.equal(Zotero.Users.getCurrentUserID(), 1);
@@ -80,7 +70,7 @@ describe("Zotero.Sync.Data.Local", function() {
 			
 			yield item1.addLinkedItem(item2);
 			
-			var cont = yield Zotero.Sync.Data.Local.checkUser(win, 1, "A");
+			var cont = yield Zotero.Sync.Data.Local.checkUser(null, 1, "A");
 			assert.isTrue(cont);
 			
 			var json = item1.toJSON();