diff --git a/chrome/content/zotero/xpcom/sync/syncLocal.js b/chrome/content/zotero/xpcom/sync/syncLocal.js index baeb6323f..02fa20c93 100644 --- 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 index 19da5cbe6..5ee876476 100644 --- 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();