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

fx-compat: Fix dictionaries tests

Browse source
This commit is contained in:
Dan Stillman 2022-06-19 04:16:40 -04:00
parent eb67adb257
commit 408453c9e9
1 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

38
test/tests/dictionariesTest.js
View file

@ -4,7 +4,7 @@ var sandbox = sinon.createSandbox();
describe("Dictionaries", function () { describe("Dictionaries", function () {
var win; var win;
var enUKXPIOld, frFRv1XPI, unKNXPI, enUKXPINew, frFRv2XPI; var enGBXPIOld, frFRv1XPI, unKNXPI, enGBXPINew, frFRv2XPI;
async function makeFakeDictionary({ id, locale, version }) { async function makeFakeDictionary({ id, locale, version }) {
var dir = await getTempDirectory(); var dir = await getTempDirectory();
@ -39,9 +39,9 @@ describe("Dictionaries", function () {
before(async function () { before(async function () {
// Make fake installed dictionaries // Make fake installed dictionaries
enUKXPIOld = await makeFakeDictionary({ enGBXPIOld = await makeFakeDictionary({
id: '@fake-en-UK-dictionary', id: '@fake-en-GB-dictionary',
locale: 'en-UK', locale: 'en-GB',
version: 5, version: 5,
name: "Fake English UK Dictionary" name: "Fake English UK Dictionary"
}); });
@ -58,9 +58,9 @@ describe("Dictionaries", function () {
name: "Fake Unknown Dictionary" name: "Fake Unknown Dictionary"
}); });
// Make fake updated dictionaries // Make fake updated dictionaries
enUKXPINew = await makeFakeDictionary({ enGBXPINew = await makeFakeDictionary({
id: '@another-fake-en-UK-dictionary', id: '@another-fake-en-GB-dictionary',
locale: 'en-UK', locale: 'en-GB',
version: 1, version: 1,
name: "Another Fake English UK Dictionary" name: "Another Fake English UK Dictionary"
}); });
@ -79,8 +79,8 @@ describe("Dictionaries", function () {
sandbox.stub(Zotero.File, 'download').callsFake(async (url, downloadPath) => { sandbox.stub(Zotero.File, 'download').callsFake(async (url, downloadPath) => {
Zotero.debug("Fake downloading " + url); Zotero.debug("Fake downloading " + url);
if (url.includes('en-UK')) { if (url.includes('en-GB')) {
return OS.File.copy(enUKXPIOld, downloadPath); return OS.File.copy(enGBXPIOld, downloadPath);
} }
if (url.includes('fr-FR')) { if (url.includes('fr-FR')) {
return OS.File.copy(frFRv1XPI, downloadPath); return OS.File.copy(frFRv1XPI, downloadPath);
@ -90,7 +90,7 @@ describe("Dictionaries", function () {
} }
throw new Error("Unexpected URL " + url); throw new Error("Unexpected URL " + url);
}); });
await Zotero.Dictionaries.install('@fake-en-UK-dictionary', "5"); await Zotero.Dictionaries.install('@fake-en-GB-dictionary', "5");
await Zotero.Dictionaries.install('@fake-fr-FR-dictionary', "1"); await Zotero.Dictionaries.install('@fake-fr-FR-dictionary', "1");
await Zotero.Dictionaries.install('@fake-xx-UN-dictionary', "5"); await Zotero.Dictionaries.install('@fake-xx-UN-dictionary', "5");
sandbox.restore(); sandbox.restore();
@ -99,8 +99,8 @@ describe("Dictionaries", function () {
sandbox.stub(Zotero.Dictionaries, 'fetchDictionariesList') sandbox.stub(Zotero.Dictionaries, 'fetchDictionariesList')
.resolves([ .resolves([
{ {
id: '@another-fake-en-UK-dictionary', id: '@another-fake-en-GB-dictionary',
locale: 'en-UK', locale: 'en-GB',
name: "English (UK)", name: "English (UK)",
version: 1 version: 1
}, },
@ -114,8 +114,8 @@ describe("Dictionaries", function () {
sandbox.stub(Zotero.File, 'download').callsFake(async (url, downloadPath) => { sandbox.stub(Zotero.File, 'download').callsFake(async (url, downloadPath) => {
Zotero.debug("Fake downloading " + url); Zotero.debug("Fake downloading " + url);
if (url.includes('en-UK') && url.includes("-1.xpi")) { if (url.includes('en-GB') && url.includes("-1.xpi")) {
return OS.File.copy(enUKXPINew, downloadPath); return OS.File.copy(enGBXPINew, downloadPath);
} }
if (url.includes('fr-FR') && url.includes("-2.xpi")) { if (url.includes('fr-FR') && url.includes("-2.xpi")) {
return OS.File.copy(frFRv2XPI, downloadPath); return OS.File.copy(frFRv2XPI, downloadPath);
@ -134,8 +134,8 @@ describe("Dictionaries", function () {
var numDictionaries = Zotero.Dictionaries.dictionaries.length; var numDictionaries = Zotero.Dictionaries.dictionaries.length;
function updated() { function updated() {
return !!( return !!(
!Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-en-UK-dictionary') !Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-en-GB-dictionary')
&& Zotero.Dictionaries.dictionaries.find(x => x.id == '@another-fake-en-UK-dictionary') && Zotero.Dictionaries.dictionaries.find(x => x.id == '@another-fake-en-GB-dictionary')
// Version update happens too // Version update happens too
&& !Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-fr-FR-dictionary' && x.version == 1) && !Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-fr-FR-dictionary' && x.version == 1)
&& Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-fr-FR-dictionary' && x.version == 2) && Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-fr-FR-dictionary' && x.version == 2)
@ -153,7 +153,7 @@ describe("Dictionaries", function () {
beforeEach(async function () { beforeEach(async function () {
win = Services.ww.openWindow( win = Services.ww.openWindow(
null, null,
'chrome://zotero/content/dictionaryManager.xul', 'chrome://zotero/content/dictionaryManager.xhtml',
'dictionary-manager', 'dictionary-manager',
'chrome,centerscreen', 'chrome,centerscreen',
{} {}
@ -177,8 +177,8 @@ describe("Dictionaries", function () {
var numDictionaries = Zotero.Dictionaries.dictionaries.length; var numDictionaries = Zotero.Dictionaries.dictionaries.length;
function updated() { function updated() {
return !!( return !!(
!Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-en-UK-dictionary') !Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-en-GB-dictionary')
&& Zotero.Dictionaries.dictionaries.find(x => x.id == '@another-fake-en-UK-dictionary') && Zotero.Dictionaries.dictionaries.find(x => x.id == '@another-fake-en-GB-dictionary')
// Version update happens too // Version update happens too
&& !Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-fr-FR-dictionary' && x.version == 1) && !Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-fr-FR-dictionary' && x.version == 1)
&& Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-fr-FR-dictionary' && x.version == 2) && Zotero.Dictionaries.dictionaries.find(x => x.id == '@fake-fr-FR-dictionary' && x.version == 2)