Fix warnings to account for --error

unflxw · unflxw · commit 89a34cff89ab · 2024-11-18T14:48:23.000+01:00
Using `--no-log` without either `--cron` or `--heartbeat` is now a
reasonable usage if `--error` is in the mix.
diff --git a/src/cli.rs b/src/cli.rs
@@ -176,10 +176,11 @@ impl Cli {
         }
     }
 
-    fn no_log_and_no_checkins_warning(&self) -> Option<String> {
+    fn no_log_and_no_data_warning(&self) -> Option<String> {
         let no_checkins: bool = self.cron.is_none() && self.heartbeat.is_none();
+        let no_errors: bool = self.error.is_none();
 
-        if no_checkins {
+        if no_checkins && no_errors {
             let using: Option<&str> = if self.no_log {
                 Some("--no-log")
             } else if self.no_stdout && self.no_stderr {
@@ -190,7 +191,7 @@ impl Cli {
 
             if let Some(using) = using {
                 return Some(format!(
-                    "using {using} without either --cron or --heartbeat; \
+                    "using {using} without either --cron, --heartbeat or --error; \
                     no data will be sent to AppSignal"
                 ));
             }
@@ -206,7 +207,7 @@ impl Cli {
             warnings.push(warning);
         }
 
-        if let Some(warning) = self.no_log_and_no_checkins_warning() {
+        if let Some(warning) = self.no_log_and_no_data_warning() {
             warnings.push(warning);
         }
 
@@ -378,24 +379,46 @@ mod tests {
     }
 
     #[test]
-    fn cli_warnings_no_log_and_no_checkins() {
-        for (args, warning) in [(
+    fn cli_warnings_no_log_and_no_data() {
+        for (args, warning) in [
+            (
                 vec!["--no-log"],
-                "using --no-log without either --cron or --heartbeat; no data will be sent to AppSignal"
+                Some("using --no-log without either --cron, --heartbeat or --error; no data will be sent to AppSignal")
             ),
             (
                 vec!["--no-stdout", "--no-stderr"],
-                "using --no-stdout and --no-stderr without either --cron or --heartbeat; no data will be sent to AppSignal"
-            )] {
+                Some("using --no-stdout and --no-stderr without either --cron, --heartbeat or --error; no data will be sent to AppSignal")
+            ),
+            (
+                vec!["--no-log", "--no-stdout", "--no-stderr"],
+                Some("using --no-log without either --cron, --heartbeat or --error; no data will be sent to AppSignal")
+            ),
+            (
+                vec!["--no-log", "--cron", "some-cron"],
+                None
+            ),
+            (
+                vec!["--no-log", "--heartbeat", "some-hearttbeat"],
+                None
+            ),
+            (
+                vec!["--no-log", "--error", "some-error"],
+                None
+            )
+            ] {
             let cli = Cli::try_parse_from(
                 with_required_args(args)
 
             ).expect("failed to parse CLI arguments");
 
             let warnings = cli.warnings();
 
-            assert_eq!(warnings.len(), 1);
-            assert_eq!(warnings[0], warning);
+            if let Some(warning) = warning {
+                assert_eq!(warnings.len(), 1);
+                assert_eq!(warnings[0], warning);
+            } else {
+                assert!(warnings.is_empty());
+            }
         }
     }
 
