Merge pull request #630 from alexcrichton/filter-tests

Only run specific tests during `wasm-pack test`

docs/src/commands/test.md

@@ -67,14 +67,15 @@ $ tree crates/foo
 │   ├── lib.rs
 └── tests
     ├── diff_patch.rs
+    └── node.rs
 ```
 
 ```
-# Run all tests in tests/diff_patch.rs
-wasm-pack test crates/foo --firefox --headless -- --tests diff_patch
+# Run all tests in tests/diff_patch.rs in Firefox
+wasm-pack test crates/foo --firefox --headless -- --test diff_patch
 
 # Run all tests in tests/diff_patch.rs that contain the word "replace"
-wasm-pack test crates/foo --firefox --headless -- --tests diff_patch replace
+wasm-pack test crates/foo --firefox --headless -- --test diff_patch replace
 
 # Run all tests inside of a `tests` module inside of src/lib/diff.rs
 wasm-pack test crates/foo --firefox --headless -- --lib diff::tests
@@ -82,3 +83,14 @@ wasm-pack test crates/foo --firefox --headless -- --lib diff::tests
 # Same as the above, but only if they contain the word replace
 wasm-pack test crates/foo --firefox --headless -- --lib diff::tests::replace
 ```
+
+Note that you can also filter tests by location in which they're supposed to
+run. For example:
+
+```
+# Run all tests which are intended to execute in Node.js
+wasm-pack test --node
+
+# Run all tests which are intended to be executed in a browser
+wasm-pack test --firefox --headless
+```

src/command/test.rs

@@ -298,10 +298,13 @@ impl Test {
         test::cargo_test_wasm(
             &self.crate_path,
             self.release,
-            Some((
-                "CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER",
-                &self.test_runner_path.as_ref().unwrap(),
-            )),
+            vec![
+                (
+                    "CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER",
+                    &**self.test_runner_path.as_ref().unwrap(),
+                ),
+                ("WASM_BINDGEN_TEST_ONLY_NODE", "1".as_ref()),
+            ],
             &self.extra_options,
         )?;
         info!("Finished running tests in node.");
@@ -326,22 +329,8 @@ impl Test {
             chromedriver
         );
 
-        let test_runner = self
-            .test_runner_path
-            .as_ref()
-            .unwrap()
-            .display()
-            .to_string();
-        let test_runner = test_runner.as_str();
-        info!("Using wasm-bindgen test runner at {}", test_runner);
-
-        let mut envs = vec![
-            ("CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER", test_runner),
-            ("CHROMEDRIVER", chromedriver),
-        ];
-        if !self.headless {
-            envs.push(("NO_HEADLESS", "1"));
-        }
+        let mut envs = self.webdriver_env();
+        envs.push(("CHROMEDRIVER", chromedriver));
 
         test::cargo_test_wasm(&self.crate_path, self.release, envs, &self.extra_options)?;
         Ok(())
@@ -365,22 +354,8 @@ impl Test {
             geckodriver
         );
 
-        let test_runner = self
-            .test_runner_path
-            .as_ref()
-            .unwrap()
-            .display()
-            .to_string();
-        let test_runner = test_runner.as_str();
-        info!("Using wasm-bindgen test runner at {}", test_runner);
-
-        let mut envs = vec![
-            ("CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER", test_runner),
-            ("GECKODRIVER", geckodriver),
-        ];
-        if !self.headless {
-            envs.push(("NO_HEADLESS", "1"));
-        }
+        let mut envs = self.webdriver_env();
+        envs.push(("GECKODRIVER", geckodriver));
 
         test::cargo_test_wasm(&self.crate_path, self.release, envs, &self.extra_options)?;
         Ok(())
@@ -401,24 +376,23 @@ impl Test {
             safaridriver
         );
 
-        let test_runner = self
-            .test_runner_path
-            .as_ref()
-            .unwrap()
-            .display()
-            .to_string();
-        let test_runner = test_runner.as_str();
-        info!("Using wasm-bindgen test runner at {}", test_runner);
+        let mut envs = self.webdriver_env();
+        envs.push(("SAFARIDRIVER", safaridriver));
 
+        test::cargo_test_wasm(&self.crate_path, self.release, envs, &self.extra_options)?;
+        Ok(())
+    }
+
+    fn webdriver_env(&self) -> Vec<(&'static str, &str)> {
+        let test_runner = self.test_runner_path.as_ref().unwrap().to_str().unwrap();
+        info!("Using wasm-bindgen test runner at {}", test_runner);
         let mut envs = vec![
             ("CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER", test_runner),
-            ("SAFARIDRIVER", safaridriver),
+            ("WASM_BINDGEN_TEST_ONLY_WEB", "1"),
         ];
         if !self.headless {
             envs.push(("NO_HEADLESS", "1"));
         }
-
-        test::cargo_test_wasm(&self.crate_path, self.release, envs, &self.extra_options)?;
-        Ok(())
+        return envs;
     }
 }