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

Never auto-select new groups, since they always come from syncs

Browse Source 
Fixes test failure from 2e74cd7831
This commit is contained in:
Dan Stillman 2017-06-16 05:56:06 -04:00
parent 2e74cd7831
commit 859c506913
4 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
chrome/content/zotero/xpcom/collectionTreeView.js
View File

@ -490,7 +490,12 @@ Zotero.CollectionTreeView.prototype.notify = Zotero.Promise.coroutine(function*
+ "together in collectionTreeView::notify()") + "together in collectionTreeView::notify()")
} }
yield this.reload(); yield this.reload();
yield this.selectByID(selectRow ? "L" + id : currentTreeRow.id); yield this.selectByID(
// Groups only come from sync, so they should never be auto-selected
(type != 'group' && selectRow)
? "L" + id
: currentTreeRow.id
);
break; break;
} }
} }

4
chrome/content/zotero/xpcom/sync/syncRunner.js
View File

@ -527,9 +527,7 @@ Zotero.Sync.Runner_Module = function (options = {}) {
group.version = info.version; group.version = info.version;
group.archived = false; group.archived = false;
group.fromJSON(info.data, Zotero.Users.getCurrentUserID()); group.fromJSON(info.data, Zotero.Users.getCurrentUserID());
yield group.saveTx({ yield group.saveTx();
skipSelect: true
});
// Add group to library list // Add group to library list
libraries.push(group.libraryID); libraries.push(group.libraryID);

2
test/content/support.js
View File

@ -354,7 +354,7 @@ var createFeed = Zotero.Promise.coroutine(function* (props = {}) {
feed.refreshInterval = props.refreshInterval || 12; feed.refreshInterval = props.refreshInterval || 12;
feed.cleanupReadAfter = props.cleanupReadAfter || 2; feed.cleanupReadAfter = props.cleanupReadAfter || 2;
feed.cleanupUnreadAfter = props.cleanupUnreadAfter || 30; feed.cleanupUnreadAfter = props.cleanupUnreadAfter || 30;
yield feed.saveTx(); yield feed.saveTx(props.saveOptions);
return feed; return feed;
}); });

14
test/tests/collectionTreeViewTest.js
View File

@ -451,9 +451,19 @@ describe("Zotero.CollectionTreeView", function() {
it("should select a new feed", function* () { it("should select a new feed", function* () {
var feed = yield createFeed(); var feed = yield createFeed();
// Library should still be selected // Feed should be selected
assert.equal(cv.getSelectedLibraryID(), feed.id); assert.equal(cv.getSelectedLibraryID(), feed.id);
}) });
it("shouldn't select a new feed with skipSelect: true", function* () {
var feed = yield createFeed({
saveOptions: {
skipSelect: true
}
});
// Library should still be selected
assert.equal(cv.getSelectedLibraryID(), userLibraryID);
});
it("should remove deleted feed", function* () { it("should remove deleted feed", function* () {
var feed = yield createFeed(); var feed = yield createFeed();