From d2243b1125722e775b1f9719197260d1cda1220d Mon Sep 17 00:00:00 2001 From: Taisuke Fukuno Date: Sat, 6 Jun 2020 06:01:44 +0900 Subject: [PATCH] deno test should run mjs files (#6122) --- cli/flags.rs | 2 +- cli/test_runner.rs | 3 +++ docs/testing.md | 6 +++--- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cli/flags.rs b/cli/flags.rs index 1eebb8b87f..2c201fcb61 100644 --- a/cli/flags.rs +++ b/cli/flags.rs @@ -1022,7 +1022,7 @@ report results to standard output: deno test src/fetch_test.ts src/signal_test.ts Directory arguments are expanded to all contained files matching the glob -{*_,*.,}test.{js,ts,jsx,tsx}: +{*_,*.,}test.{js,mjs,ts,jsx,tsx}: deno test src/", ) } diff --git a/cli/test_runner.rs b/cli/test_runner.rs index 3e3ed1291b..b4623fc9f8 100644 --- a/cli/test_runner.rs +++ b/cli/test_runner.rs @@ -14,14 +14,17 @@ fn is_supported(p: &Path) -> bool { basename.ends_with("_test.ts") || basename.ends_with("_test.tsx") || basename.ends_with("_test.js") + || basename.ends_with("_test.mjs") || basename.ends_with("_test.jsx") || basename.ends_with(".test.ts") || basename.ends_with(".test.tsx") || basename.ends_with(".test.js") + || basename.ends_with(".test.mjs") || basename.ends_with(".test.jsx") || basename == "test.ts" || basename == "test.tsx" || basename == "test.js" + || basename == "test.mjs" || basename == "test.jsx" } else { false diff --git a/docs/testing.md b/docs/testing.md index ba484c9720..67c472b800 100644 --- a/docs/testing.md +++ b/docs/testing.md @@ -102,6 +102,6 @@ deno test my_test.ts ``` You can also omit the file name, in which case all tests in the current -directory (recursively) that match the glob `{*_,*.,}test.{js,ts,jsx,tsx}` will -be run. If you pass a directory, all files in the directory that match this glob -will be run. +directory (recursively) that match the glob `{*_,*.,}test.{js,mjs,ts,jsx,tsx}` +will be run. If you pass a directory, all files in the directory that match this +glob will be run.