Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Test ESR wasm support #125

Merged
merged 2 commits into from
Oct 26, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions crates/wasm/js-tests/browser/browser.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@ var suite = describe.skip;
if (global.browser) {
suite = describe;
}
// firefox could be first-booting itself. Give it time.
jest.setTimeout(60000);

suite("Integration tests for Firefox ESR 60.9", () => {
test("no-modules build works end to end", async () => {
// firefox could be first-booting itself. Give it time.
jest.setTimeout(60000);
await browser.get("file://" + __dirname + '/index.html');
let fail = browser.wait(until.elementLocated(By.id('failure')), 10000);
let succ = browser.wait(until.elementLocated(By.id('success')), 10000);
Expand Down
2 changes: 1 addition & 1 deletion crates/wasm/js-tests/browser/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript" src="./pkg-nomod/_no_modules/citeproc_rs_wasm_include.js"></script>
<script type="text/javascript" src="./pkg-nomod/_no_modules/citeproc_rs_wasm.js"></script>
<script type="text/javascript"> console.log('seen after entry'); </script>
<script type="text/javascript" src="script.js"></script>
<script type="module" src="script.js"></script>
<script type="text/javascript"> console.log('seen after script.js'); </script>
</body>
</html>
68 changes: 62 additions & 6 deletions crates/wasm/js-tests/browser/script.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
// https://github.com/GoogleChromeLabs/wasm-feature-detect
import * as features from "https://unpkg.com/[email protected]?module";
const { Driver } = wasm_bindgen;

const mkNoteStyle = (inner, bibliography) => {
Expand All @@ -13,7 +15,7 @@ const mkNoteStyle = (inner, bibliography) => {
${inner}
</layout>
</citation>
${ bibliography != null ? bibliography : "" }
${bibliography != null ? bibliography : ""}
</style>
`;
}
Expand All @@ -29,7 +31,7 @@ class Fetcher {
}
}

async function run() {
async function test_citeproc_rs() {
await wasm_bindgen('./pkg-nomod/_no_modules/citeproc_rs_wasm_bg.wasm');

const fetcher = new Fetcher();
Expand All @@ -40,14 +42,68 @@ async function run() {
}).unwrap();

console.log("--- Successfully loaded wasm driver. You can now use it. ---")
driver.insertReference({id: "citekey", title: "Hello", language: 'fr-FR'}).unwrap();
driver.initClusters([{id: "one", cites: [{id: "citekey"}]}]).unwrap();
driver.setClusterOrder([ {id: "one"} ]).unwrap();
driver.insertReference({ id: "citekey", title: "Hello", language: 'fr-FR' }).unwrap();
driver.initClusters([{ id: "one", cites: [{ id: "citekey" }] }]).unwrap();
driver.setClusterOrder([{ id: "one" }]).unwrap();
await driver.fetchLocales();
let result = driver.builtCluster("one").unwrap();
console.log("Built a cite cluster:", result);
}

run()
// this tests the current Firefox ESR's wasm support
async function test_wasm_support() {
let allChecks = await Promise.all(
Object.keys(features).map(async name => {
let feat = features[name];
let supported = await feat();
return { name, supported }
})
);

let resolved = {};
allChecks.forEach((check) => {
let { name, supported } = check;
resolved[name] = supported;
});

// ESR 60.9 supports none of the newer features, but
// you would expect to have to change a few of these
// when newer ESRs are used in Zotero.
let expected = {
mutableGlobals: false,
bigInt: false,
bulkMemory: false,
exceptions: false,
memory64: false,
multiValue: false,
referenceTypes: false,
saturatedFloatToInt: false,
signExtensions: false,
simd: false,
tailCall: false,
threads: false,
};
Comment on lines +69 to +85
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The key bit


let results = Object.keys(resolved).map(key => {
return {
key,
expected: expected[key],
resolved: resolved[key],
};
});

let failed = results.filter(x => x.expected !== x.resolved);
if (failed.length > 0) {
throw new Error("wasm support mismatch: " + JSON.stringify(failed))
}

}

async function suite() {
await test_citeproc_rs();
await test_wasm_support();
}

suite()
.then(() => document.write('<p id="success">success</p>'))
.catch((e) => document.write('<p id="failure">' + e.message + '</p>'));
10 changes: 5 additions & 5 deletions crates/wasm/js-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,16 +9,16 @@
"build": "./build.sh"
},
"dependencies": {
"@types/jest": "^26.0.14"
"@types/jest": "^27.0.2"
},
"devDependencies": {
"@babel/core": "^7.11.6",
"@babel/preset-env": "^7.11.5",
"@babel/preset-typescript": "^7.10.4",
"babel-jest": "^26.3.0",
"geckodriver": "^1.22.3",
"jest": "^26.4.2",
"jest-environment-node": "^26.6.2",
"babel-jest": "^27.3.1",
"geckodriver": "^2.0.4",
"jest": "^27.3.1",
"jest-environment-node": "^27.3.1",
"selenium-webdriver": "^4.0.0-beta.3"
}
}
Loading