Move cli tests to cli directory

Author: MichaReiser

.claude/settings.local.json

@@ -0,0 +1,12 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(cargo test:*)",
+      "Bash(cargo clippy:*)",
+      "Bash(cargo fmt:*)",
+      "Bash(cargo check:*)",
+      "Bash(rustfmt:*)"
+    ],
+    "deny": []
+  }
+}

crates/ty/tests/config_option.rs renamed to crates/ty/tests/cli/config_option.rs

@@ -1,7 +1,6 @@
 use insta_cmd::assert_cmd_snapshot;
 
-mod common;
-use common::CliTest;
+use crate::CliTest;
 
 #[test]
 fn cli_config_args_toml_string_basic() -> anyhow::Result<()> {

crates/ty/tests/exit_code.rs renamed to crates/ty/tests/cli/exit_code.rs

@@ -1,7 +1,6 @@
 use insta_cmd::assert_cmd_snapshot;
 
-mod common;
-use common::CliTest;
+use crate::CliTest;
 
 #[test]
 fn only_warnings() -> anyhow::Result<()> {

crates/ty/tests/cli.rs renamed to crates/ty/tests/cli/main.rs

@@ -1,8 +1,17 @@
-use insta_cmd::assert_cmd_snapshot;
-use std::fmt::Write;
-
-mod common;
-use common::CliTest;
+mod config_option;
+mod exit_code;
+mod python_environment;
+mod rule_selection;
+
+use anyhow::Context as _;
+use insta::internals::SettingsBindDropGuard;
+use insta_cmd::{assert_cmd_snapshot, get_cargo_bin};
+use std::{
+    fmt::Write,
+    path::{Path, PathBuf},
+    process::Command,
+};
+use tempfile::TempDir;
 
 #[test]
 fn test_run_in_sub_directory() -> anyhow::Result<()> {
@@ -586,3 +595,96 @@ fn can_handle_large_binop_expressions() -> anyhow::Result<()> {
 
     Ok(())
 }
+
+pub(crate) struct CliTest {
+    _temp_dir: TempDir,
+    _settings_scope: SettingsBindDropGuard,
+    project_dir: PathBuf,
+}
+
+impl CliTest {
+    pub(crate) fn new() -> anyhow::Result<Self> {
+        let temp_dir = TempDir::new()?;
+
+        // Canonicalize the tempdir path because macos uses symlinks for tempdirs
+        // and that doesn't play well with our snapshot filtering.
+        // Simplify with dunce because otherwise we get UNC paths on Windows.
+        let project_dir = dunce::simplified(
+            &temp_dir
+                .path()
+                .canonicalize()
+                .context("Failed to canonicalize project path")?,
+        )
+        .to_path_buf();
+
+        let mut settings = insta::Settings::clone_current();
+        settings.add_filter(&tempdir_filter(&project_dir), "<temp_dir>/");
+        settings.add_filter(r#"\\(\w\w|\s|\.|")"#, "/$1");
+
+        let settings_scope = settings.bind_to_scope();
+
+        Ok(Self {
+            project_dir,
+            _temp_dir: temp_dir,
+            _settings_scope: settings_scope,
+        })
+    }
+
+    pub(crate) fn with_files<'a>(
+        files: impl IntoIterator<Item = (&'a str, &'a str)>,
+    ) -> anyhow::Result<Self> {
+        let case = Self::new()?;
+        case.write_files(files)?;
+        Ok(case)
+    }
+
+    pub(crate) fn with_file(path: impl AsRef<Path>, content: &str) -> anyhow::Result<Self> {
+        let case = Self::new()?;
+        case.write_file(path, content)?;
+        Ok(case)
+    }
+
+    pub(crate) fn write_files<'a>(
+        &self,
+        files: impl IntoIterator<Item = (&'a str, &'a str)>,
+    ) -> anyhow::Result<()> {
+        for (path, content) in files {
+            self.write_file(path, content)?;
+        }
+
+        Ok(())
+    }
+
+    pub(crate) fn write_file(&self, path: impl AsRef<Path>, content: &str) -> anyhow::Result<()> {
+        let path = path.as_ref();
+        let path = self.project_dir.join(path);
+
+        if let Some(parent) = path.parent() {
+            std::fs::create_dir_all(parent)
+                .with_context(|| format!("Failed to create directory `{}`", parent.display()))?;
+        }
+        std::fs::write(&path, &*ruff_python_trivia::textwrap::dedent(content))
+            .with_context(|| format!("Failed to write file `{path}`", path = path.display()))?;
+
+        Ok(())
+    }
+
+    pub(crate) fn root(&self) -> &Path {
+        &self.project_dir
+    }
+
+    pub(crate) fn command(&self) -> Command {
+        let mut command = Command::new(get_cargo_bin("ty"));
+        command.current_dir(&self.project_dir).arg("check");
+
+        // Unset environment variables that can affect test behavior
+        command.env_remove("VIRTUAL_ENV");
+        command.env_remove("CONDA_PREFIX");
+
+        command
+    }
+}
+
+fn tempdir_filter(path: &Path) -> String {
+    format!(r"{}\\?/?", regex::escape(path.to_str().unwrap()))
+}

crates/ty/tests/python_environment.rs renamed to crates/ty/tests/cli/python_environment.rs

@@ -1,8 +1,7 @@
 use insta_cmd::assert_cmd_snapshot;
 use ruff_python_ast::PythonVersion;
 
-mod common;
-use common::CliTest;
+use crate::CliTest;
 
 /// Specifying an option on the CLI should take precedence over the same setting in the
 /// project's configuration. Here, this is tested for the Python version.

crates/ty/tests/rule_selection.rs renamed to crates/ty/tests/cli/rule_selection.rs

@@ -1,7 +1,6 @@
 use insta_cmd::assert_cmd_snapshot;
 
-mod common;
-use common::CliTest;
+use crate::CliTest;
 
 /// The rule severity can be changed in the configuration file
 #[test]