summaryrefslogtreecommitdiff
path: root/cli/args/flags.rs
diff options
context:
space:
mode:
Diffstat (limited to 'cli/args/flags.rs')
-rw-r--r--cli/args/flags.rs185
1 files changed, 85 insertions, 100 deletions
diff --git a/cli/args/flags.rs b/cli/args/flags.rs
index 6070ac831..9674c68a6 100644
--- a/cli/args/flags.rs
+++ b/cli/args/flags.rs
@@ -223,8 +223,7 @@ pub enum TestReporterConfig {
#[default]
Pretty,
Dot,
- // Contains path to write to or "-" to print to stdout.
- Junit(String),
+ Junit,
}
#[derive(Clone, Debug, Default, Eq, PartialEq)]
@@ -241,6 +240,7 @@ pub struct TestFlags {
pub trace_ops: bool,
pub watch: Option<WatchFlags>,
pub reporter: TestReporterConfig,
+ pub junit_path: Option<String>,
}
#[derive(Clone, Debug, Eq, PartialEq)]
@@ -1877,21 +1877,17 @@ Directory arguments are expanded to all contained files matching the glob
.arg(no_clear_screen_arg())
.arg(script_arg().last(true))
.arg(
- Arg::new("junit")
- .long("junit")
+ Arg::new("junit-path")
+ .long("junit-path")
.value_name("PATH")
.value_hint(ValueHint::FilePath)
.help("Write a JUnit XML test report to PATH. Use '-' to write to stdout which is the default when PATH is not provided.")
- .num_args(0..=1)
- .require_equals(true)
- .default_missing_value("-")
)
.arg(
- Arg::new("dot-reporter")
- .long("dot")
- .conflicts_with("junit")
- .help("Use 'dot' test reporter with a concise output format")
- .action(ArgAction::SetTrue),
+ Arg::new("reporter")
+ .long("reporter")
+ .help("Select reporter to use. Default to 'pretty'.")
+ .value_parser(["pretty", "dot", "junit"])
)
)
}
@@ -3093,20 +3089,24 @@ fn test_parse(flags: &mut Flags, matches: &mut ArgMatches) {
Vec::new()
};
- let junit_path = matches.remove_one::<String>("junit");
- let dot_reporter = matches.get_flag("dot-reporter");
- if dot_reporter {
+ let junit_path = matches.remove_one::<String>("junit-path");
+
+ let reporter =
+ if let Some(reporter) = matches.remove_one::<String>("reporter") {
+ match reporter.as_str() {
+ "pretty" => TestReporterConfig::Pretty,
+ "junit" => TestReporterConfig::Junit,
+ "dot" => TestReporterConfig::Dot,
+ _ => unreachable!(),
+ }
+ } else {
+ TestReporterConfig::Pretty
+ };
+
+ if matches!(reporter, TestReporterConfig::Dot) {
flags.log_level = Some(Level::Error);
}
- let reporter = if dot_reporter {
- TestReporterConfig::Dot
- } else if let Some(path) = junit_path {
- TestReporterConfig::Junit(path)
- } else {
- TestReporterConfig::Pretty
- };
-
flags.subcommand = DenoSubcommand::Test(TestFlags {
no_run,
doc,
@@ -3120,6 +3120,7 @@ fn test_parse(flags: &mut Flags, matches: &mut ArgMatches) {
trace_ops,
watch: watch_arg_parse(matches),
reporter,
+ junit_path,
});
}
@@ -6024,6 +6025,7 @@ mod tests {
coverage_dir: Some("cov".to_string()),
watch: Default::default(),
reporter: Default::default(),
+ junit_path: None,
}),
unstable: true,
no_prompt: true,
@@ -6103,6 +6105,7 @@ mod tests {
trace_ops: false,
coverage_dir: None,
watch: Default::default(),
+ junit_path: None,
}),
type_check_mode: TypeCheckMode::Local,
no_prompt: true,
@@ -6136,6 +6139,7 @@ mod tests {
coverage_dir: None,
watch: Default::default(),
reporter: Default::default(),
+ junit_path: None,
}),
type_check_mode: TypeCheckMode::Local,
no_prompt: true,
@@ -6173,6 +6177,7 @@ mod tests {
coverage_dir: None,
watch: Default::default(),
reporter: Default::default(),
+ junit_path: None,
}),
no_prompt: true,
type_check_mode: TypeCheckMode::Local,
@@ -6183,27 +6188,63 @@ mod tests {
}
#[test]
- fn test_dot() {
- let r = flags_from_vec(svec!["deno", "test", "--dot"]);
+ fn test_reporter() {
+ let r = flags_from_vec(svec!["deno", "test", "--reporter=pretty"]);
+ assert_eq!(
+ r.unwrap(),
+ Flags {
+ subcommand: DenoSubcommand::Test(TestFlags {
+ reporter: TestReporterConfig::Pretty,
+ ..Default::default()
+ }),
+ no_prompt: true,
+ type_check_mode: TypeCheckMode::Local,
+ ..Flags::default()
+ }
+ );
+
+ let r = flags_from_vec(svec!["deno", "test", "--reporter=dot"]);
assert_eq!(
r.unwrap(),
Flags {
subcommand: DenoSubcommand::Test(TestFlags {
- no_run: false,
- doc: false,
- fail_fast: None,
- filter: None,
reporter: TestReporterConfig::Dot,
- allow_none: false,
- shuffle: None,
- files: FileFlags {
- include: vec![],
- ignore: vec![],
- },
- concurrent_jobs: None,
- trace_ops: false,
- coverage_dir: None,
- watch: Default::default(),
+ ..Default::default()
+ }),
+ no_prompt: true,
+ type_check_mode: TypeCheckMode::Local,
+ log_level: Some(Level::Error),
+ ..Flags::default()
+ }
+ );
+
+ let r = flags_from_vec(svec!["deno", "test", "--reporter=junit"]);
+ assert_eq!(
+ r.unwrap(),
+ Flags {
+ subcommand: DenoSubcommand::Test(TestFlags {
+ reporter: TestReporterConfig::Junit,
+ ..Default::default()
+ }),
+ no_prompt: true,
+ type_check_mode: TypeCheckMode::Local,
+ ..Flags::default()
+ }
+ );
+
+ let r = flags_from_vec(svec![
+ "deno",
+ "test",
+ "--reporter=dot",
+ "--junit-path=report.xml"
+ ]);
+ assert_eq!(
+ r.unwrap(),
+ Flags {
+ subcommand: DenoSubcommand::Test(TestFlags {
+ reporter: TestReporterConfig::Dot,
+ junit_path: Some("report.xml".to_string()),
+ ..Default::default()
}),
no_prompt: true,
type_check_mode: TypeCheckMode::Local,
@@ -6212,7 +6253,7 @@ mod tests {
}
);
- let r = flags_from_vec(svec!["deno", "test", "--dot", "--junit"]);
+ let r = flags_from_vec(svec!["deno", "test", "--junit-path"]);
assert!(r.is_err());
}
@@ -6238,6 +6279,7 @@ mod tests {
coverage_dir: None,
watch: Default::default(),
reporter: Default::default(),
+ junit_path: None,
}),
no_prompt: true,
type_check_mode: TypeCheckMode::Local,
@@ -6270,6 +6312,7 @@ mod tests {
no_clear_screen: false,
}),
reporter: Default::default(),
+ junit_path: None,
}),
no_prompt: true,
type_check_mode: TypeCheckMode::Local,
@@ -6301,6 +6344,7 @@ mod tests {
no_clear_screen: false,
}),
reporter: Default::default(),
+ junit_path: None,
}),
no_prompt: true,
type_check_mode: TypeCheckMode::Local,
@@ -6334,66 +6378,7 @@ mod tests {
no_clear_screen: true,
}),
reporter: Default::default(),
- }),
- type_check_mode: TypeCheckMode::Local,
- no_prompt: true,
- ..Flags::default()
- }
- );
- }
-
- #[test]
- fn test_junit_default() {
- let r = flags_from_vec(svec!["deno", "test", "--junit"]);
- assert_eq!(
- r.unwrap(),
- Flags {
- subcommand: DenoSubcommand::Test(TestFlags {
- no_run: false,
- doc: false,
- fail_fast: None,
- filter: None,
- allow_none: false,
- shuffle: None,
- files: FileFlags {
- include: vec![],
- ignore: vec![],
- },
- concurrent_jobs: None,
- trace_ops: false,
- coverage_dir: None,
- watch: Default::default(),
- reporter: TestReporterConfig::Junit("-".to_string()),
- }),
- type_check_mode: TypeCheckMode::Local,
- no_prompt: true,
- ..Flags::default()
- }
- );
- }
-
- #[test]
- fn test_junit_with_path() {
- let r = flags_from_vec(svec!["deno", "test", "--junit=junit.xml"]);
- assert_eq!(
- r.unwrap(),
- Flags {
- subcommand: DenoSubcommand::Test(TestFlags {
- no_run: false,
- doc: false,
- fail_fast: None,
- filter: None,
- allow_none: false,
- shuffle: None,
- files: FileFlags {
- include: vec![],
- ignore: vec![],
- },
- concurrent_jobs: None,
- trace_ops: false,
- coverage_dir: None,
- watch: Default::default(),
- reporter: TestReporterConfig::Junit("junit.xml".to_string()),
+ junit_path: None,
}),
type_check_mode: TypeCheckMode::Local,
no_prompt: true,
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 04:46:34 +0000