Skip to content

Commit 7ce3c73

Browse files
committed
Run Wasm tests in workers as well
1 parent 69b3536 commit 7ce3c73

File tree

3 files changed

+32
-14
lines changed

3 files changed

+32
-14
lines changed

.github/workflows/tests.yml

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -244,28 +244,48 @@ jobs:
244244
steps:
245245
- uses: actions/checkout@v4
246246
- uses: dtolnay/rust-toolchain@stable
247-
- run: choco install wget
248-
if: runner.os == 'Windows'
247+
with:
248+
targets: wasm32-unknown-unknown
249249
- name: Install precompiled wasm-pack
250250
shell: bash
251251
run: |
252-
VERSION=v0.12.1
253-
URL=https://github.com/rustwasm/wasm-pack/releases/download/${VERSION}/wasm-pack-${VERSION}-x86_64-unknown-linux-musl.tar.gz
252+
VERSION=0.2.96
253+
URL=https://github.com/rustwasm/wasm-bindgen/releases/download/${VERSION}/wasm-bindgen-${VERSION}-x86_64-unknown-linux-musl.tar.gz
254254
wget -O - $URL | tar -xz --strip-components=1 -C ~/.cargo/bin
255-
wasm-pack --version
255+
wasm-bindgen --version
256256
- uses: Swatinem/rust-cache@v2
257257
- name: Test (Node)
258258
env:
259259
RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js"
260-
run: wasm-pack test --node
260+
run: cargo test --target wasm32-unknown-unknown
261261
- name: Test (Firefox)
262262
env:
263-
RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js" --cfg getrandom_browser_test
264-
run: wasm-pack test --headless --firefox
263+
WASM_BINDGEN_USE_BROWSER: 1
264+
RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js"
265+
run: cargo test --target wasm32-unknown-unknown
265266
- name: Test (Chrome)
266267
env:
267-
RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js" --cfg getrandom_browser_test
268-
run: wasm-pack test --headless --chrome
268+
WASM_BINDGEN_USE_BROWSER: 1
269+
RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js"
270+
CHROMEDRIVER: chromedriver
271+
run: cargo test --target wasm32-unknown-unknown
272+
- name: Test (dedicated worker)
273+
env:
274+
WASM_BINDGEN_USE_DEDICATED_WORKER: 1
275+
RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js"
276+
run: cargo test --target wasm32-unknown-unknown
277+
- name: Test (shared worker)
278+
env:
279+
WASM_BINDGEN_USE_SHARED_WORKER: 1
280+
RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js"
281+
run: cargo test --target wasm32-unknown-unknown
282+
- name: Test (service worker)
283+
env:
284+
WASM_BINDGEN_USE_SERVICE_WORKER: 1
285+
RUSTFLAGS: -Dwarnings --cfg getrandom_backend="wasm_js"
286+
# Firefox doesn't support module service workers and therefor can't import scripts
287+
CHROMEDRIVER: chromedriver
288+
run: cargo test --target wasm32-unknown-unknown
269289

270290
wasi:
271291
name: WASI

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ windows-targets = "0.52"
6666
[target.'cfg(all(getrandom_backend = "wasm_js", target_arch = "wasm32", target_os = "unknown"))'.dependencies]
6767
wasm-bindgen = { version = "0.2.89", default-features = false }
6868
js-sys = "0.3"
69-
[target.'cfg(all(getrandom_backend = "wasm_js", getrandom_browser_test, target_arch = "wasm32", target_os = "unknown"))'.dev-dependencies]
69+
[target.'cfg(all(getrandom_backend = "wasm_js", target_arch = "wasm32", target_os = "unknown"))'.dev-dependencies]
7070
wasm-bindgen-test = "0.3.39"
7171

7272
[features]

tests/mod.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
use core::mem::MaybeUninit;
22
use getrandom::{fill, fill_uninit};
33

4-
#[cfg(getrandom_browser_test)]
4+
#[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
55
use wasm_bindgen_test::wasm_bindgen_test as test;
6-
#[cfg(getrandom_browser_test)]
7-
wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
86

97
#[test]
108
fn test_zero() {

0 commit comments

Comments
 (0)