summaryrefslogtreecommitdiff
path: root/cli/tools/test_runner.rs
diff options
context:
space:
mode:
authorCasper Beyer <caspervonb@pm.me>2021-07-27 01:48:35 +0800
committerGitHub <noreply@github.com>2021-07-26 19:48:35 +0200
commit2e69d2135a945682bc67b058a29b221e55915ffb (patch)
treeed952944acd36502d6c94ba0e87d698bab523de7 /cli/tools/test_runner.rs
parentdfba7a2b0197b05b3cb61724096111cc618aa747 (diff)
feat(cli/tools/test): imply media type from doc attribute (#11438)
Diffstat (limited to 'cli/tools/test_runner.rs')
-rw-r--r--cli/tools/test_runner.rs23
1 files changed, 21 insertions, 2 deletions
diff --git a/cli/tools/test_runner.rs b/cli/tools/test_runner.rs
index 6089d10a9..e74fad1f8 100644
--- a/cli/tools/test_runner.rs
+++ b/cli/tools/test_runner.rs
@@ -406,6 +406,24 @@ pub async fn run_tests(
}
for block in blocks_regex.captures_iter(&comment.text) {
+ let maybe_attributes = block.get(1).map(|m| m.as_str().split(' '));
+ let media_type = if let Some(mut attributes) = maybe_attributes {
+ match attributes.next() {
+ Some("js") => MediaType::JavaScript,
+ Some("jsx") => MediaType::Jsx,
+ Some("ts") => MediaType::TypeScript,
+ Some("tsx") => MediaType::Tsx,
+ Some("") => file.media_type,
+ _ => MediaType::Unknown,
+ }
+ } else {
+ file.media_type
+ };
+
+ if media_type == MediaType::Unknown {
+ continue;
+ }
+
let body = block.get(2).unwrap();
let text = body.as_str();
@@ -425,16 +443,17 @@ pub async fn run_tests(
let location = parsed_module.get_location(&span);
let specifier = deno_core::resolve_url_or_path(&format!(
- "{}${}-{}",
+ "{}${}-{}{}",
location.filename,
location.line,
location.line + element.as_str().split('\n').count(),
+ media_type.as_ts_extension(),
))?;
let file = File {
local: specifier.to_file_path().unwrap(),
maybe_types: None,
- media_type: MediaType::TypeScript, // media_type.clone(),
+ media_type,
source: source.clone(),
specifier: specifier.clone(),
};