Comment changes #3

software-mansion · Jul 26, 2024 · 64283a0 · 64283a0
1 parent 234caaf
commit 64283a0
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 16 deletions.
diff --git a/scarb/src/bin/scarb/commands/init.rs b/scarb/src/bin/scarb/commands/init.rs
@@ -7,7 +7,7 @@ use scarb::core::Config;
 use scarb::ops::{self, VersionControl};
 
 use crate::args::{InitArgs, TestRunner};
-use crate::interactive::ask_for_test_runner;
+use crate::interactive::get_or_ask_for_test_runner;
 
 #[tracing::instrument(skip_all, level = "info")]
 pub fn run(args: InitArgs, config: &Config) -> Result<()> {
@@ -26,9 +26,7 @@ pub fn run(args: InitArgs, config: &Config) -> Result<()> {
                 VersionControl::Git
             },
             snforge: matches!(
-                Ok(args.test_runner)
-                    .transpose()
-                    .unwrap_or_else(ask_for_test_runner)?,
+                get_or_ask_for_test_runner(args.test_runner)?,
                 TestRunner::StarknetFoundry
             ),
         },

diff --git a/scarb/src/bin/scarb/commands/new.rs b/scarb/src/bin/scarb/commands/new.rs
@@ -4,7 +4,7 @@ use scarb::core::Config;
 use scarb::ops::{self, VersionControl};
 
 use crate::args::{NewArgs, TestRunner};
-use crate::interactive::ask_for_test_runner;
+use crate::interactive::get_or_ask_for_test_runner;
 
 #[tracing::instrument(skip_all, level = "info")]
 pub fn run(args: NewArgs, config: &Config) -> Result<()> {
@@ -20,9 +20,7 @@ pub fn run(args: NewArgs, config: &Config) -> Result<()> {
                 VersionControl::Git
             },
             snforge: matches!(
-                Ok(args.init.test_runner)
-                    .transpose()
-                    .unwrap_or_else(ask_for_test_runner)?,
+                get_or_ask_for_test_runner(args.init.test_runner)?,
                 TestRunner::StarknetFoundry
             ),
         },

diff --git a/scarb/src/bin/scarb/interactive.rs b/scarb/src/bin/scarb/interactive.rs
@@ -4,12 +4,22 @@ use crate::args::TestRunner;
 use anyhow::{ensure, Result};
 use dialoguer::theme::ColorfulTheme;
 use dialoguer::Select;
+use indoc::indoc;
 use which::which;
 
-pub fn ask_for_test_runner() -> Result<TestRunner> {
+pub fn get_or_ask_for_test_runner(test_runner: Option<TestRunner>) -> Result<TestRunner> {
+    Ok(test_runner)
+        .transpose()
+        .unwrap_or_else(ask_for_test_runner)
+}
+
+fn ask_for_test_runner() -> Result<TestRunner> {
     ensure!(
         io::stdout().is_terminal(),
-        "You are not running in terminal. Please provide the --test-runner flag."
+        indoc! {r"
+            you are not running in terminal
+            help: please provide the --test-runner flag
+        "}
     );
 
     let options = if which("snforge").is_ok() {

diff --git a/scarb/tests/new_and_init.rs b/scarb/tests/new_and_init.rs
@@ -157,9 +157,10 @@ fn new_interactive_not_in_terminal() {
         .current_dir(&pt)
         .assert()
         .failure()
-        .stdout_eq(indoc! {r#"
-            error: You are not running in terminal. Please provide the --test-runner flag.
-        "#});
+        .stdout_eq(indoc! {r"
+            error: you are not running in terminal
+            help: please provide the --test-runner flag
+        "});
 }
 
 #[test]
@@ -174,9 +175,10 @@ fn init_interactive_not_in_terminal() {
         .current_dir(&t)
         .assert()
         .failure()
-        .stdout_eq(indoc! {r#"
-            error: You are not running in terminal. Please provide the --test-runner flag.
-        "#});
+        .stdout_eq(indoc! {r"
+            error: you are not running in terminal
+            help: please provide the --test-runner flag
+        "});
 }
 
 #[test]