diff --git a/test/tests/fileInterfaceTest.js b/test/tests/fileInterfaceTest.js
index a571930791..e18c2a716e 100644
--- a/test/tests/fileInterfaceTest.js
+++ b/test/tests/fileInterfaceTest.js
@@ -234,6 +234,15 @@ describe("Zotero_File_Interface", function () {
assert.include(str, 'A');
assert.include(str, 'B');
});
+
+ it("should write text and html flavors directly to the clipboard", function () {
+ win.Zotero_File_Interface.writeToClipboard({
+ text: 'plain text',
+ html: 'html text
'
+ });
+ assert.equal(getDataForFlavor('text/plain'), 'plain text');
+ assert.equal(getDataForFlavor('text/html'), 'html text
');
+ });
});
describe('Citavi annotations', () => {
@@ -306,184 +315,4 @@ describe("Zotero_File_Interface", function () {
});
});
- describe("Copy citations to clipboard", function () {
- var noteItem, itemOne, itemTwo;
- var styleID = 'http://www.zotero.org/styles/chicago-notes-bibliography';
-
- before(async function () {
- await Zotero.Styles.init();
- await Zotero.Translators.init();
-
- itemOne = createUnsavedDataObject('item', {
- itemType: 'book',
- title: 'Item One',
- creators: [
- { firstName: 'firstOne', lastName: 'lastOne', creatorType: 'author' },
- { firstName: 'firstTwo', lastName: 'lastTwo', creatorType: 'author' }
- ]
- });
- await itemOne.saveTx();
-
- itemTwo = createUnsavedDataObject('item', {
- itemType: 'book',
- title: 'Item Two',
- creators: [
- { firstName: 'firstTwo', lastName: 'lastTwo', creatorType: 'author' },
- { firstName: 'firstThree', lastName: 'lastThree', creatorType: 'author' }
- ]
- });
- await itemTwo.saveTx();
-
- var uriOne = Zotero.URI.getItemURI(itemOne);
- var uriTwo = Zotero.URI.getItemURI(itemTwo);
- var citationOne = {
- citationItems: [{ uris: [uriOne] }],
- properties: {}
- };
- var citationTwo = {
- citationItems: [{ uris: [uriTwo] }],
- properties: {}
- };
- var noteHTML = ''
- + '
Some text
'
- + '
(lastOne and lastTwo)
'
- + '
(lastTwo and lastThree)
'
- + '
Done
'
- + '
'
- + '
Before
'
- + '
(lastOne and lastTwo)
'
- + '
(lastDeleted)
'
- + '
After
'
- + '
'
+ + '
Some text
'
+ + '
(lastOne and lastTwo)
'
+ + '
(lastTwo and lastThree)
'
+ + '
Done
'
+ + '
'
+ + '
Before
'
+ + '
(lastOne and lastTwo)
'
+ + '
(lastDeleted)
'
+ + '
After
'
+ + '
Test note content
');
- await note.saveTx();
- });
-
- // The test runner has a root-level afterEach (test/content/runtests.js)
- // that clears any user-set pref after every test. Re-pin the bibliography
- // style here before each test.
- beforeEach(function () {
- Zotero.Prefs.set('export.quickCopy.bibliographySetting', JSON.stringify(SMART_COPY_BIB));
- });
-
- after(async function () {
- win.Zotero_Tabs.closeAll();
- win.close();
- });
-
- function getClipboardText() {
- let transferable = Components.classes["@mozilla.org/widget/transferable;1"]
- .createInstance(Components.interfaces.nsITransferable);
- transferable.init(null);
- transferable.addDataFlavor('text/plain');
-
- clipboardService.getData(transferable, Components.interfaces.nsIClipboard.kGlobalClipboard);
- let str = {};
- transferable.getTransferData('text/plain', str, {});
- return str.value.QueryInterface(Components.interfaces.nsISupportsString).data;
- }
-
- function clearClipboard() {
- clipboardService.emptyClipboard(Components.interfaces.nsIClipboard.kGlobalClipboard);
- }
-
- describe("Library tab", function () {
- beforeEach(async function () {
- await selectLibrary(win);
- doc.getElementById('item-tree-main').focus();
- });
-
- it("should copy citation for a regular item", async function () {
- await zp.itemsView.selectItem(regularItem.id);
- clearClipboard();
- doc.getElementById('key_smartCopy').doCommand();
- assert.equal(getClipboardText(), '(Smartcopy, 2020)');
- });
-
- it("should copy annotation content when an annotation is selected", async function () {
- await zp.itemsView.selectItem(annotation.id);
- clearClipboard();
- doc.getElementById('key_smartCopy').doCommand();
- assert.include(getClipboardText(), annotation.annotationText);
- });
-
- it("should copy note content when a note is selected", async function () {
- await zp.itemsView.selectItem(note.id);
- clearClipboard();
- doc.getElementById('key_smartCopy').doCommand();
- assert.include(getClipboardText(), 'Test note content');
- });
- });
-
- describe("Reader tab", function () {
- var reader;
- // Use a local sandbox: sinon's default sandbox tracks every stub
- // forever, so a later `sinon.restore()` elsewhere would
- // re-invoke our stub's restore against the already dead reader.
- var sandbox;
+ describe("Smart copy", function () {
+ var regularItem, attachment, annotation, note;
+ var clipboardService;
+ const SMART_COPY_BIB = {
+ mode: 'bibliography',
+ id: 'http://www.zotero.org/styles/apa',
+ contentType: '',
+ locale: ''
+ };
before(async function () {
- sandbox = sinon.createSandbox();
- reader = await Zotero.Reader.open(attachment.id);
- await reader._initPromise;
- await reader._internalReader._primaryView.initializedPromise;
- while (!reader._iframeWindow) {
- await Zotero.Promise.delay(50);
- }
- // Pretend that the reader is focused
- sandbox.stub(reader._iframeWindow.document, 'hasFocus').returns(true);
+ clipboardService = Components.classes["@mozilla.org/widget/clipboard;1"]
+ .getService(Components.interfaces.nsIClipboard);
+
+ regularItem = createUnsavedDataObject('item', {
+ itemType: 'journalArticle',
+ title: 'My Smart Copy Paper'
+ });
+ regularItem.setField('date', '2020');
+ regularItem.setCreators([
+ { firstName: 'Jane', lastName: 'Smartcopy', creatorType: 'author' }
+ ]);
+ await regularItem.saveTx();
+
+ attachment = await importFileAttachment('test.pdf', { parentItemID: regularItem.id });
+ annotation = await createAnnotation('highlight', attachment);
+
+ note = createUnsavedDataObject('item', { itemType: 'note' });
+ note.setNote('Test note content
');
+ await note.saveTx();
});
- beforeEach(async function () {
- await win.Zotero_Tabs.select(reader.tabID);
+ // The parent `beforeEach` re-pins prefs to the file's defaults, so
+ // override the bibliography setting here for Smart copy assertions.
+ beforeEach(function () {
+ Zotero.Prefs.set('export.quickCopy.bibliographySetting', JSON.stringify(SMART_COPY_BIB));
});
- after(function () {
- sandbox.restore();
+ function getClipboardText() {
+ let transferable = Components.classes["@mozilla.org/widget/transferable;1"]
+ .createInstance(Components.interfaces.nsITransferable);
+ transferable.init(null);
+ transferable.addDataFlavor('text/plain');
+
+ clipboardService.getData(transferable, Components.interfaces.nsIClipboard.kGlobalClipboard);
+ let str = {};
+ transferable.getTransferData('text/plain', str, {});
+ return str.value.QueryInterface(Components.interfaces.nsISupportsString).data;
+ }
+
+ function clearClipboard() {
+ clipboardService.emptyClipboard(Components.interfaces.nsIClipboard.kGlobalClipboard);
+ }
+
+ describe("Library tab", function () {
+ beforeEach(async function () {
+ await selectLibrary(win);
+ doc.getElementById('item-tree-main').focus();
+ });
+
+ it("should copy citation for a regular item", async function () {
+ await zp.itemsView.selectItem(regularItem.id);
+ clearClipboard();
+ doc.getElementById('key_smartCopy').doCommand();
+ assert.equal(getClipboardText(), '(Smartcopy, 2020)');
+ });
+
+ it("should copy annotation content when an annotation is selected", async function () {
+ await zp.itemsView.selectItem(annotation.id);
+ clearClipboard();
+ doc.getElementById('key_smartCopy').doCommand();
+ assert.include(getClipboardText(), annotation.annotationText);
+ });
+
+ it("should copy note content when a note is selected", async function () {
+ await zp.itemsView.selectItem(note.id);
+ clearClipboard();
+ doc.getElementById('key_smartCopy').doCommand();
+ assert.include(getClipboardText(), 'Test note content');
+ });
});
- it("should copy parent citation when nothing is selected in the reader", function () {
- clearClipboard();
- doc.getElementById('key_smartCopy').doCommand();
- assert.equal(getClipboardText(), '(Smartcopy, 2020)');
- });
+ describe("Reader tab", function () {
+ var reader;
+ // Use a local sandbox: sinon's default sandbox tracks every stub
+ // forever, so a later `sinon.restore()` elsewhere would
+ // re-invoke our stub's restore against the already dead reader.
+ var sandbox;
- it("should copy selected annotation", function () {
- sandbox.stub(reader, 'getSelectedAnnotationIDs').returns([annotation.key]);
- clearClipboard();
- doc.getElementById('key_smartCopy').doCommand();
- assert.include(getClipboardText(), annotation.annotationText);
+ before(async function () {
+ sandbox = sinon.createSandbox();
+ reader = await Zotero.Reader.open(attachment.id);
+ await reader._initPromise;
+ await reader._internalReader._primaryView.initializedPromise;
+ while (!reader._iframeWindow) {
+ await Zotero.Promise.delay(50);
+ }
+ // Pretend that the reader is focused
+ sandbox.stub(reader._iframeWindow.document, 'hasFocus').returns(true);
+ });
+
+ beforeEach(async function () {
+ await win.Zotero_Tabs.select(reader.tabID);
+ });
+
+ after(function () {
+ sandbox.restore();
+ });
+
+ it("should copy parent citation when nothing is selected in the reader", function () {
+ clearClipboard();
+ doc.getElementById('key_smartCopy').doCommand();
+ assert.equal(getClipboardText(), '(Smartcopy, 2020)');
+ });
+
+ it("should copy selected annotation", function () {
+ sandbox.stub(reader, 'getSelectedAnnotationIDs').returns([annotation.key]);
+ clearClipboard();
+ doc.getElementById('key_smartCopy').doCommand();
+ assert.include(getClipboardText(), annotation.annotationText);
+ });
});
});
});