wasm: Update testing framework

Add back the "test-in-browser" feature. This makes it easier to manage
a single file containing all of the test code.

Signed-off-by: Joe Richey <joerichey@google.com>

.travis.yml

@@ -67,17 +67,14 @@ jobs:
       script:
         - cargo test --target wasm32-wasi
         # stdweb (wasm32-unknown-unknown) tests (Node, Chrome)
-        - cargo web test --package stdweb-getrandom
-        - cargo web test --package stdweb-getrandom --nodejs
+        - cargo web test --features js --nodejs
+        - cargo web test --features js
         # wasm-bindgen (wasm32-unknown-unknown) tests (Node, Firefox, Chrome)
-        - cargo test --package wasm-bindgen-getrandom
-          --target wasm32-unknown-unknown --test node
+        - cargo test --target wasm32-unknown-unknown --features js
         - GECKODRIVER=$HOME/geckodriver
-          cargo test --package wasm-bindgen-getrandom
-          --target wasm32-unknown-unknown --test web
+          cargo test --target wasm32-unknown-unknown --features js,test-in-browser
         - CHROMEDRIVER=$HOME/chromedriver
-          cargo test --package wasm-bindgen-getrandom
-          --target wasm32-unknown-unknown --test web
+          cargo test --target wasm32-unknown-unknown --features js,test-in-browser
 
     - name: "WASM via Emscripten"
       rust: stable

Cargo.toml

@@ -45,5 +45,8 @@ custom = []
 # Unstable feature to support being a libstd dependency
 rustc-dep-of-std = ["compiler_builtins", "core"]
 
+# Test/wasm-bindgen only feature to run tests in a browser
+test-in-browser = []
+
 [package.metadata.docs.rs]
 features = ["std", "custom"]

src/test_common.rs

@@ -1,7 +1,11 @@
-// Both getrandom and test can be renamed by the parent module.
+// Allow getrandom to be renamed by the parent module.
 use super::getrandom;
-#[cfg(all(target_arch = "wasm32", target_os = "unknown"))]
-use super::test;
+
+#[cfg(all(target_arch = "wasm32", target_os = "unknown", not(cargo_web)))]
+use wasm_bindgen_test::wasm_bindgen_test as test;
+
+#[cfg(feature = "test-in-browser")]
+wasm_bindgen_test::wasm_bindgen_test_configure!(run_in_browser);
 
 #[test]
 fn test_zero() {