Refactor format tests to use CliTest helper (#20953)

Co-authored-by: Micha Reiser <micha@reiser.io>
This commit is contained in:
Renkai Ge 2025-10-19 18:25:21 +08:00 committed by GitHub
parent 36d4b02fa9
commit 0b8de723c6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
14 changed files with 606 additions and 681 deletions

File diff suppressed because it is too large Load Diff

View File

@ -15,6 +15,7 @@ use std::{
}; };
use tempfile::TempDir; use tempfile::TempDir;
mod format;
mod lint; mod lint;
const BIN_NAME: &str = "ruff"; const BIN_NAME: &str = "ruff";
@ -57,6 +58,16 @@ impl CliTest {
Self::with_settings(|_, settings| settings) Self::with_settings(|_, settings| settings)
} }
pub(crate) fn with_files<'a>(
files: impl IntoIterator<Item = (&'a str, &'a str)>,
) -> anyhow::Result<Self> {
let case = Self::new()?;
for file in files {
case.write_file(file.0, file.1)?;
}
Ok(case)
}
pub(crate) fn with_settings( pub(crate) fn with_settings(
setup_settings: impl FnOnce(&Path, insta::Settings) -> insta::Settings, setup_settings: impl FnOnce(&Path, insta::Settings) -> insta::Settings,
) -> Result<Self> { ) -> Result<Self> {
@ -174,4 +185,10 @@ impl CliTest {
command command
} }
pub(crate) fn format_command(&self) -> Command {
let mut command = self.command();
command.args(["format", "--no-cache"]);
command
}
} }

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:
@ -7,6 +7,7 @@ info:
- "--no-cache" - "--no-cache"
- "--output-format" - "--output-format"
- grouped - grouped
- "--preview"
- "--check" - "--check"
- input.py - input.py
--- ---

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:
@ -7,6 +7,7 @@ info:
- "--no-cache" - "--no-cache"
- "--output-format" - "--output-format"
- pylint - pylint
- "--preview"
- "--check" - "--check"
- input.py - input.py
--- ---

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args:

View File

@ -1,5 +1,5 @@
--- ---
source: crates/ruff/tests/format.rs source: crates/ruff/tests/cli/format.rs
info: info:
program: ruff program: ruff
args: args: