[WIP] fix: execute client_wasm tests for nodejs

input-output-hk · Jan 8, 2025 · 93d9e4f · 93d9e4f
1 parent ed0e96f
commit 93d9e4f
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -158,7 +158,7 @@ jobs:
       - name: Test 'mithril-client-wasm' - NodeJS
         shell: bash
         run: |
-          wasm-pack test --node mithril-client-wasm --release
+          wasm-pack test --node mithril-client-wasm --release --features --test-node
 
       - name: Publish Mithril Distribution (WASM)
         uses: actions/upload-artifact@v4

diff --git a/mithril-client-wasm/Cargo.toml b/mithril-client-wasm/Cargo.toml
@@ -34,6 +34,7 @@ mithril-build-script = { path = "../internal/mithril-build-script" }
 [features]
 # Include nothing by default
 default = []
+test-node = []
 
 [package.metadata.docs.rs]
 all-features = true

diff --git a/mithril-client-wasm/Makefile b/mithril-client-wasm/Makefile
@@ -12,10 +12,22 @@ all: test build
 build:
 	npm run build
 
-test:
+test: test-web test-node
+
+test-web:
+	pkill -f "mithril-aggregator-fake" || true
+	${CARGO} run -p mithril-aggregator-fake -- -p 8000 &
+	if wasm-pack test --headless --firefox --chrome --release; then \
+		pkill -f "mithril-aggregator-fake" || true; \
+	else \
+		pkill -f "mithril-aggregator-fake" || true; \
+		exit 1; \
+	fi
+
+test-node:
 	pkill -f "mithril-aggregator-fake" || true
 	${CARGO} run -p mithril-aggregator-fake -- -p 8000 &
-	if wasm-pack test --headless --firefox --chrome --node --release; then \
+	if wasm-pack test --node --release --features test-node; then \
 		pkill -f "mithril-aggregator-fake" || true; \
 	else \
 		pkill -f "mithril-aggregator-fake" || true; \

diff --git a/mithril-client-wasm/src/certificate_verification_cache.rs b/mithril-client-wasm/src/certificate_verification_cache.rs
@@ -151,6 +151,7 @@ impl CertificateVerifierCache for LocalStorageCertificateVerifierCache {
     }
 }
 
+#[cfg(not(feature = "test-node"))]
 #[cfg(test)]
 pub(crate) mod test_tools {
     use std::collections::HashMap;
@@ -249,6 +250,7 @@ pub(crate) mod test_tools {
     }
 }
 
+#[cfg(not(feature = "test-node"))]
 #[cfg(test)]
 mod tests {
     use std::collections::HashMap;

diff --git a/mithril-client-wasm/src/client_wasm.rs b/mithril-client-wasm/src/client_wasm.rs
@@ -477,6 +477,7 @@ mod tests {
         get_mithril_client(options)
     }
 
+    #[cfg(not(feature = "test-node"))]
     wasm_bindgen_test_configure!(run_in_browser);
 
     #[wasm_bindgen_test]