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

Update cross-library item drag test after 2dd16b44d

Browse source
This commit is contained in:
Dan Stillman 2021-07-21 00:12:15 -04:00
parent 24d45f6953
commit 1bd0e7ccda
1 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
test/tests/collectionTreeViewTest.js
View file

@ -888,35 +888,24 @@ describe("Zotero.CollectionTreeView", function() {
await group2.eraseTx(); await group2.eraseTx();
}); });
it("should remove a linked, trashed item in a group from the trash and collections", function* () { it("should ignore a linked, trashed item when re-dragging an item to a group", async function () {
var group = yield getGroup(); var group = await getGroup();
var collection = yield createDataObject('collection', { libraryID: group.libraryID }); var collection = await createDataObject('collection', { libraryID: group.libraryID });
var item = yield createDataObject('item', false, { skipSelect: true }); var item = await createDataObject('item', false, { skipSelect: true });
yield drop('item', 'L' + group.libraryID, [item.id]); await drop('item', 'L' + group.libraryID, [item.id]);
var droppedItem = yield item.getLinkedItem(group.libraryID); var droppedItem = await item.getLinkedItem(group.libraryID);
droppedItem.setCollections([collection.id]); droppedItem.setCollections([collection.id]);
droppedItem.deleted = true; droppedItem.deleted = true;
yield droppedItem.saveTx(); await droppedItem.saveTx();
// Add observer to wait for collection add await drop('item', 'L' + group.libraryID, [item.id]);
var deferred = Zotero.Promise.defer();
var observerID = Zotero.Notifier.registerObserver({
notify: function (event, type, ids) {
if (event == 'refresh' && type == 'trash' && ids[0] == group.libraryID) {
setTimeout(function () {
deferred.resolve();
});
}
}
}, 'trash', 'test');
yield drop('item', 'L' + group.libraryID, [item.id], deferred.promise);
Zotero.Notifier.unregisterObserver(observerID);
assert.isFalse(droppedItem.deleted); var linkedItem = await item.getLinkedItem(group.libraryID);
// Should be removed from collections when removed from trash assert.notEqual(linkedItem, droppedItem);
assert.lengthOf(droppedItem.getCollections(), 0);
assert.isTrue(droppedItem.deleted);
}) })
}) })