Merge branches 'l10n' and 'fragment' of github.com:CendioOssman/noVNC
This commit is contained in:
@@ -1,61 +1,146 @@
|
||||
const expect = chai.expect;
|
||||
import { l10n } from '../app/localization.js';
|
||||
import _, { Localizer, l10n } from '../app/localization.js';
|
||||
|
||||
describe('Localization', function () {
|
||||
"use strict";
|
||||
|
||||
let origNavigator;
|
||||
let fetch;
|
||||
|
||||
beforeEach(function () {
|
||||
// window.navigator is a protected read-only property in many
|
||||
// environments, so we need to redefine it whilst running these
|
||||
// tests.
|
||||
origNavigator = Object.getOwnPropertyDescriptor(window, "navigator");
|
||||
|
||||
Object.defineProperty(window, "navigator", {value: {}});
|
||||
window.navigator.languages = [];
|
||||
|
||||
fetch = sinon.stub(window, "fetch");
|
||||
fetch.resolves(new Response("{}"));
|
||||
});
|
||||
afterEach(function () {
|
||||
fetch.restore();
|
||||
|
||||
Object.defineProperty(window, "navigator", origNavigator);
|
||||
});
|
||||
|
||||
describe('Singleton', function () {
|
||||
it('should export a singleton object', function () {
|
||||
expect(l10n).to.be.instanceOf(Localizer);
|
||||
});
|
||||
it('should export a singleton translation function', async function () {
|
||||
// FIXME: Can we use some spy instead?
|
||||
window.navigator.languages = ["de"];
|
||||
fetch.resolves(new Response(JSON.stringify({ "Foobar": "gazonk" })));
|
||||
await l10n.setup(["de"]);
|
||||
expect(_("Foobar")).to.equal("gazonk");
|
||||
});
|
||||
});
|
||||
|
||||
describe('language selection', function () {
|
||||
let origNavigator;
|
||||
beforeEach(function () {
|
||||
// window.navigator is a protected read-only property in many
|
||||
// environments, so we need to redefine it whilst running these
|
||||
// tests.
|
||||
origNavigator = Object.getOwnPropertyDescriptor(window, "navigator");
|
||||
|
||||
Object.defineProperty(window, "navigator", {value: {}});
|
||||
window.navigator.languages = [];
|
||||
});
|
||||
afterEach(function () {
|
||||
Object.defineProperty(window, "navigator", origNavigator);
|
||||
});
|
||||
|
||||
it('should use English by default', function () {
|
||||
expect(l10n.language).to.equal('en');
|
||||
let lclz = new Localizer();
|
||||
expect(lclz.language).to.equal('en');
|
||||
});
|
||||
it('should use English if no user language matches', function () {
|
||||
it('should use English if no user language matches', async function () {
|
||||
window.navigator.languages = ["nl", "de"];
|
||||
l10n.setup(["es", "fr"]);
|
||||
expect(l10n.language).to.equal('en');
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["es", "fr"]);
|
||||
expect(lclz.language).to.equal('en');
|
||||
});
|
||||
it('should use the most preferred user language', function () {
|
||||
it('should fall back to generic English for other English', async function () {
|
||||
window.navigator.languages = ["en-AU", "de"];
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["de", "fr", "en-GB"]);
|
||||
expect(lclz.language).to.equal('en');
|
||||
});
|
||||
it('should prefer specific English over generic', async function () {
|
||||
window.navigator.languages = ["en-GB", "de"];
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["de", "en-AU", "en-GB"]);
|
||||
expect(lclz.language).to.equal('en-GB');
|
||||
});
|
||||
it('should use the most preferred user language', async function () {
|
||||
window.navigator.languages = ["nl", "de", "fr"];
|
||||
l10n.setup(["es", "fr", "de"]);
|
||||
expect(l10n.language).to.equal('de');
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["es", "fr", "de"]);
|
||||
expect(lclz.language).to.equal('de');
|
||||
});
|
||||
it('should prefer sub-languages languages', function () {
|
||||
it('should prefer sub-languages languages', async function () {
|
||||
window.navigator.languages = ["pt-BR"];
|
||||
l10n.setup(["pt", "pt-BR"]);
|
||||
expect(l10n.language).to.equal('pt-BR');
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["pt", "pt-BR"]);
|
||||
expect(lclz.language).to.equal('pt-BR');
|
||||
});
|
||||
it('should fall back to language "parents"', function () {
|
||||
it('should fall back to language "parents"', async function () {
|
||||
window.navigator.languages = ["pt-BR"];
|
||||
l10n.setup(["fr", "pt", "de"]);
|
||||
expect(l10n.language).to.equal('pt');
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["fr", "pt", "de"]);
|
||||
expect(lclz.language).to.equal('pt');
|
||||
});
|
||||
it('should not use specific language when user asks for a generic language', function () {
|
||||
it('should not use specific language when user asks for a generic language', async function () {
|
||||
window.navigator.languages = ["pt", "de"];
|
||||
l10n.setup(["fr", "pt-BR", "de"]);
|
||||
expect(l10n.language).to.equal('de');
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["fr", "pt-BR", "de"]);
|
||||
expect(lclz.language).to.equal('de');
|
||||
});
|
||||
it('should handle underscore as a separator', function () {
|
||||
it('should handle underscore as a separator', async function () {
|
||||
window.navigator.languages = ["pt-BR"];
|
||||
l10n.setup(["pt_BR"]);
|
||||
expect(l10n.language).to.equal('pt_BR');
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["pt_BR"]);
|
||||
expect(lclz.language).to.equal('pt_BR');
|
||||
});
|
||||
it('should handle difference in case', function () {
|
||||
it('should handle difference in case', async function () {
|
||||
window.navigator.languages = ["pt-br"];
|
||||
l10n.setup(["pt-BR"]);
|
||||
expect(l10n.language).to.equal('pt-BR');
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["pt-BR"]);
|
||||
expect(lclz.language).to.equal('pt-BR');
|
||||
});
|
||||
});
|
||||
|
||||
describe('Translation loading', function () {
|
||||
it('should not fetch a translation for English', async function () {
|
||||
window.navigator.languages = [];
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup([]);
|
||||
expect(fetch).to.not.have.been.called;
|
||||
});
|
||||
it('should fetch dictionary relative base URL', async function () {
|
||||
window.navigator.languages = ["de", "fr"];
|
||||
fetch.resolves(new Response('{ "Foobar": "gazonk" }'));
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["ru", "fr"], "/some/path/");
|
||||
expect(fetch).to.have.been.calledOnceWith("/some/path/fr.json");
|
||||
expect(lclz.get("Foobar")).to.equal("gazonk");
|
||||
});
|
||||
it('should handle base URL without trailing slash', async function () {
|
||||
window.navigator.languages = ["de", "fr"];
|
||||
fetch.resolves(new Response('{ "Foobar": "gazonk" }'));
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["ru", "fr"], "/some/path");
|
||||
expect(fetch).to.have.been.calledOnceWith("/some/path/fr.json");
|
||||
expect(lclz.get("Foobar")).to.equal("gazonk");
|
||||
});
|
||||
it('should handle current base URL', async function () {
|
||||
window.navigator.languages = ["de", "fr"];
|
||||
fetch.resolves(new Response('{ "Foobar": "gazonk" }'));
|
||||
let lclz = new Localizer();
|
||||
await lclz.setup(["ru", "fr"]);
|
||||
expect(fetch).to.have.been.calledOnceWith("fr.json");
|
||||
expect(lclz.get("Foobar")).to.equal("gazonk");
|
||||
});
|
||||
it('should fail if dictionary cannot be found', async function () {
|
||||
window.navigator.languages = ["de", "fr"];
|
||||
fetch.resolves(new Response('{}', { status: 404 }));
|
||||
let lclz = new Localizer();
|
||||
let ok = false;
|
||||
try {
|
||||
await lclz.setup(["ru", "fr"], "/some/path/");
|
||||
} catch (e) {
|
||||
ok = true;
|
||||
}
|
||||
expect(ok).to.be.true;
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
@@ -8,39 +8,48 @@ describe('WebUtil', function () {
|
||||
"use strict";
|
||||
|
||||
describe('config variables', function () {
|
||||
let origState, origHref;
|
||||
beforeEach(function () {
|
||||
origState = history.state;
|
||||
origHref = location.href;
|
||||
});
|
||||
afterEach(function () {
|
||||
history.replaceState(origState, '', origHref);
|
||||
});
|
||||
|
||||
it('should parse query string variables', function () {
|
||||
// history.pushState() will not cause the browser to attempt loading
|
||||
// the URL, this is exactly what we want here for the tests.
|
||||
history.pushState({}, '', "test?myvar=myval");
|
||||
history.replaceState({}, '', "test?myvar=myval");
|
||||
expect(WebUtil.getConfigVar("myvar")).to.be.equal("myval");
|
||||
});
|
||||
it('should return default value when no query match', function () {
|
||||
history.pushState({}, '', "test?myvar=myval");
|
||||
history.replaceState({}, '', "test?myvar=myval");
|
||||
expect(WebUtil.getConfigVar("other", "def")).to.be.equal("def");
|
||||
});
|
||||
it('should handle no query match and no default value', function () {
|
||||
history.pushState({}, '', "test?myvar=myval");
|
||||
history.replaceState({}, '', "test?myvar=myval");
|
||||
expect(WebUtil.getConfigVar("other")).to.be.equal(null);
|
||||
});
|
||||
it('should parse fragment variables', function () {
|
||||
history.pushState({}, '', "test#myvar=myval");
|
||||
history.replaceState({}, '', "test#myvar=myval");
|
||||
expect(WebUtil.getConfigVar("myvar")).to.be.equal("myval");
|
||||
});
|
||||
it('should return default value when no fragment match', function () {
|
||||
history.pushState({}, '', "test#myvar=myval");
|
||||
history.replaceState({}, '', "test#myvar=myval");
|
||||
expect(WebUtil.getConfigVar("other", "def")).to.be.equal("def");
|
||||
});
|
||||
it('should handle no fragment match and no default value', function () {
|
||||
history.pushState({}, '', "test#myvar=myval");
|
||||
history.replaceState({}, '', "test#myvar=myval");
|
||||
expect(WebUtil.getConfigVar("other")).to.be.equal(null);
|
||||
});
|
||||
it('should handle both query and fragment', function () {
|
||||
history.pushState({}, '', "test?myquery=1#myhash=2");
|
||||
history.replaceState({}, '', "test?myquery=1#myhash=2");
|
||||
expect(WebUtil.getConfigVar("myquery")).to.be.equal("1");
|
||||
expect(WebUtil.getConfigVar("myhash")).to.be.equal("2");
|
||||
});
|
||||
it('should prioritize fragment if both provide same var', function () {
|
||||
history.pushState({}, '', "test?myvar=1#myvar=2");
|
||||
history.replaceState({}, '', "test?myvar=1#myvar=2");
|
||||
expect(WebUtil.getConfigVar("myvar")).to.be.equal("2");
|
||||
});
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user