revert test modifications from #9244 for TestArgs, simply pass + flatten ShellOpts in args

Author: zerosnacks

crates/cli/src/opts/shell.rs

@@ -4,7 +4,7 @@ use foundry_common::shell::{ColorChoice, OutputFormat, OutputMode, Shell, Verbos
 // note: `verbose` and `quiet` cannot have `short` because of conflicts with multiple commands.
 
 /// Global shell options.
-#[derive(Clone, Copy, Debug, Parser)]
+#[derive(Clone, Copy, Debug, Default, Parser)]
 pub struct ShellOpts {
     /// Verbosity level of the log messages.
     ///

crates/forge/bin/cmd/test/mod.rs

@@ -17,7 +17,7 @@ use forge::{
     MultiContractRunner, MultiContractRunnerBuilder, TestFilter, TestOptions, TestOptionsBuilder,
 };
 use foundry_cli::{
-    opts::CoreBuildArgs,
+    opts::{CoreBuildArgs, ShellOpts},
     utils::{self, LoadConfig},
 };
 use foundry_common::{compile::ProjectCompiler, evm::EvmArgs, fs, shell};
@@ -178,6 +178,9 @@ pub struct TestArgs {
     /// Print detailed test summary table.
     #[arg(long, help_heading = "Display options", requires = "summary")]
     pub detailed: bool,
+
+    #[command(flatten)]
+    shell: ShellOpts,
 }
 
 impl TestArgs {
@@ -991,56 +994,34 @@ fn junit_xml_report(results: &BTreeMap<String, SuiteResult>, verbosity: u8) -> R
 
 #[cfg(test)]
 mod tests {
-    use crate::opts::{Forge, ForgeSubcommand};
-
     use super::*;
     use foundry_config::{Chain, InvariantConfig};
     use foundry_test_utils::forgetest_async;
 
     #[test]
     fn watch_parse() {
-        let args = match Forge::parse_from(["foundry-cli", "test", "-vw"]).cmd {
-            ForgeSubcommand::Test(args) => args,
-            _ => unreachable!(),
-        };
+        let args: TestArgs = TestArgs::parse_from(["foundry-cli", "-vw"]);
         assert!(args.watch.watch.is_some());
     }
 
     #[test]
     fn fuzz_seed() {
-        let args = match Forge::parse_from(["foundry-cli", "test", "--fuzz-seed", "0x10"]).cmd {
-            ForgeSubcommand::Test(args) => args,
-            _ => unreachable!(),
-        };
+        let args: TestArgs = TestArgs::parse_from(["foundry-cli", "--fuzz-seed", "0x10"]);
         assert!(args.fuzz_seed.is_some());
     }
 
     // <https://github.com/foundry-rs/foundry/issues/5913>
     #[test]
     fn fuzz_seed_exists() {
-        let args = match Forge::parse_from([
-            "foundry-cli",
-            "test",
-            "-vvv",
-            "--gas-report",
-            "--fuzz-seed",
-            "0x10",
-        ])
-        .cmd
-        {
-            ForgeSubcommand::Test(args) => args,
-            _ => unreachable!(),
-        };
+        let args: TestArgs =
+            TestArgs::parse_from(["foundry-cli", "-vvv", "--gas-report", "--fuzz-seed", "0x10"]);
         assert!(args.fuzz_seed.is_some());
     }
 
     #[test]
     fn extract_chain() {
         let test = |arg: &str, expected: Chain| {
-            let args = match Forge::parse_from(["foundry-cli", "test", arg]).cmd {
-                ForgeSubcommand::Test(args) => args,
-                _ => unreachable!(),
-            };
+            let args = TestArgs::parse_from(["foundry-cli", arg]);
             assert_eq!(args.evm_opts.env.chain, Some(expected));
             let (config, evm_opts) = args.load_config_and_evm_opts().unwrap();
             assert_eq!(config.chain, Some(expected));
@@ -1094,19 +1075,12 @@ contract FooBarTest is DSTest {
         )
         .unwrap();
 
-        let args = match Forge::parse_from([
+        let args = TestArgs::parse_from([
             "foundry-cli",
-            "test",
             "--gas-report",
             "--root",
             &prj.root().to_string_lossy(),
-        ])
-        .cmd
-        {
-            ForgeSubcommand::Test(args) => args,
-            _ => unreachable!(),
-        };
-
+        ]);
         let outcome = args.run().await.unwrap();
         let gas_report = outcome.gas_report.unwrap();
 

crates/script/src/lib.rs

@@ -26,7 +26,10 @@ use dialoguer::Confirm;
 use eyre::{ContextCompat, Result};
 use forge_script_sequence::{AdditionalContract, NestedValue};
 use forge_verify::RetryArgs;
-use foundry_cli::{opts::CoreBuildArgs, utils::LoadConfig};
+use foundry_cli::{
+    opts::{CoreBuildArgs, ShellOpts},
+    utils::LoadConfig,
+};
 use foundry_common::{
     abi::{encode_function_args, get_func},
     evm::{Breakpoints, EvmArgs},
@@ -210,6 +213,9 @@ pub struct ScriptArgs {
 
     #[command(flatten)]
     pub retry: RetryArgs,
+
+    #[clap(flatten)]
+    pub shell: ShellOpts,
 }
 
 impl ScriptArgs {