phundrak/jj-cz
1
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects 2 Releases Wiki Activity

refactor(workflow): remove unnecessary async declarations

Browse Source
This commit is contained in:
Lucien Cartier-Tilet
2026-03-31 13:57:32 +02:00
parent 1c983f3a8d
commit 7149337353
1 changed files with 63 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
src/prompts/workflow.rs
View File

@@ -58,16 +58,13 @@ impl<J: JjExecutor, P: Prompter> CommitWorkflow<J, P> {
if !self.executor.is_repository().await? { if !self.executor.is_repository().await? {
return Err(Error::NotARepository); return Err(Error::NotARepository);
} }
let commit_type = self.type_selection().await?; let commit_type = self.type_selection()?;
loop { loop {
let scope = self.scope_input().await?; let scope = self.scope_input()?;
let description = self.description_input().await?; let description = self.description_input()?;
let breaking_change = self.breaking_change_input().await?; let breaking_change = self.breaking_change_input()?;
let body = self.body_input().await?; let body = self.body_input()?;
match self match self.preview_and_confirm(commit_type, scope, description, breaking_change, body) {
.preview_and_confirm(commit_type, scope, description, breaking_change, body)
.await
{
Ok(conventional_commit) => { Ok(conventional_commit) => {
self.executor self.executor
.describe(&conventional_commit.to_string()) .describe(&conventional_commit.to_string())
@@ -86,7 +83,7 @@ impl<J: JjExecutor, P: Prompter> CommitWorkflow<J, P> {
} }
/// Prompt user to select a commit type from the 11 available options /// Prompt user to select a commit type from the 11 available options
async fn type_selection(&self) -> Result<CommitType, Error> { fn type_selection(&self) -> Result<CommitType, Error> {
self.prompts.select_commit_type() self.prompts.select_commit_type()
} }
@@ -94,7 +91,7 @@ impl<J: JjExecutor, P: Prompter> CommitWorkflow<J, P> {
/// ///
/// Returns Ok(Scope) with the validated scope, or /// Returns Ok(Scope) with the validated scope, or
/// Error::Cancelled if user cancels /// Error::Cancelled if user cancels
async fn scope_input(&self) -> Result<Scope, Error> { fn scope_input(&self) -> Result<Scope, Error> {
self.prompts.input_scope() self.prompts.input_scope()
} }
@@ -102,7 +99,7 @@ impl<J: JjExecutor, P: Prompter> CommitWorkflow<J, P> {
/// ///
/// Returns Ok(Description) with the validated description, or /// Returns Ok(Description) with the validated description, or
/// Error::Cancelled if user cancels /// Error::Cancelled if user cancels
async fn description_input(&self) -> Result<Description, Error> { fn description_input(&self) -> Result<Description, Error> {
self.prompts.input_description() self.prompts.input_description()
} }
@@ -110,12 +107,12 @@ impl<J: JjExecutor, P: Prompter> CommitWorkflow<J, P> {
/// ///
/// Returns Ok(BreakingChange) with the validated breaking change, /// Returns Ok(BreakingChange) with the validated breaking change,
/// or Error::Cancel if user cancels /// or Error::Cancel if user cancels
async fn breaking_change_input(&self) -> Result<BreakingChange, Error> { fn breaking_change_input(&self) -> Result<BreakingChange, Error> {
self.prompts.input_breaking_change() self.prompts.input_breaking_change()
} }
/// Prompt user to optionally add a free-form body via an external editor /// Prompt user to optionally add a free-form body via an external editor
async fn body_input(&self) -> Result<Body, Error> { fn body_input(&self) -> Result<Body, Error> {
self.prompts.input_body() self.prompts.input_body()
} }
@@ -123,7 +120,7 @@ impl<J: JjExecutor, P: Prompter> CommitWorkflow<J, P> {
/// ///
/// This method also validates that the complete first line /// This method also validates that the complete first line
/// doesn't exceed 72 characters /// doesn't exceed 72 characters
async fn preview_and_confirm( fn preview_and_confirm(
&self, &self,
commit_type: CommitType, commit_type: CommitType,
scope: Scope, scope: Scope,
@@ -224,46 +221,46 @@ mod tests {
} }
/// Test that type_selection returns a valid CommitType /// Test that type_selection returns a valid CommitType
#[tokio::test] #[test]
async fn type_selection_returns_valid_type() { fn type_selection_returns_valid_type() {
// Updated to use mock prompts to avoid TUI hanging // Updated to use mock prompts to avoid TUI hanging
let mock_executor = MockJjExecutor::new(); let mock_executor = MockJjExecutor::new();
let mock_prompts = MockPrompts::new().with_commit_type(CommitType::Feat); let mock_prompts = MockPrompts::new().with_commit_type(CommitType::Feat);
let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts); let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts);
// Now we can actually test the method with mock prompts // Now we can actually test the method with mock prompts
let result = workflow.type_selection().await; let result = workflow.type_selection();
assert!(result.is_ok()); assert!(result.is_ok());
assert_eq!(result.unwrap(), CommitType::Feat); assert_eq!(result.unwrap(), CommitType::Feat);
} }
/// Test that scope_input returns a valid Scope /// Test that scope_input returns a valid Scope
#[tokio::test] #[test]
async fn scope_input_returns_valid_scope() { fn scope_input_returns_valid_scope() {
let mock_executor = MockJjExecutor::new(); let mock_executor = MockJjExecutor::new();
let mock_prompts = MockPrompts::new().with_scope(Scope::parse("test").unwrap()); let mock_prompts = MockPrompts::new().with_scope(Scope::parse("test").unwrap());
let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts); let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts);
let result = workflow.scope_input().await; let result = workflow.scope_input();
assert!(result.is_ok()); assert!(result.is_ok());
assert_eq!(result.unwrap(), Scope::parse("test").unwrap()); assert_eq!(result.unwrap(), Scope::parse("test").unwrap());
} }
/// Test that description_input returns a valid Description /// Test that description_input returns a valid Description
#[tokio::test] #[test]
async fn description_input_returns_valid_description() { fn description_input_returns_valid_description() {
let mock_executor = MockJjExecutor::new(); let mock_executor = MockJjExecutor::new();
let mock_prompts = MockPrompts::new().with_description(Description::parse("test").unwrap()); let mock_prompts = MockPrompts::new().with_description(Description::parse("test").unwrap());
let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts); let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts);
let result = workflow.description_input().await; let result = workflow.description_input();
assert!(result.is_ok()); assert!(result.is_ok());
assert_eq!(result.unwrap(), Description::parse("test").unwrap()); assert_eq!(result.unwrap(), Description::parse("test").unwrap());
} }
/// Test that preview_and_confirm returns a ConventionalCommit /// Test that preview_and_confirm returns a ConventionalCommit
#[tokio::test] #[test]
async fn preview_and_confirm_returns_conventional_commit() { fn preview_and_confirm_returns_conventional_commit() {
let mock_executor = MockJjExecutor::new(); let mock_executor = MockJjExecutor::new();
let mock_prompts = MockPrompts::new().with_confirm(true); let mock_prompts = MockPrompts::new().with_confirm(true);
let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts); let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts);
@@ -273,9 +270,8 @@ mod tests {
let description = Description::parse("test description").unwrap(); let description = Description::parse("test description").unwrap();
let breaking_change = BreakingChange::No; let breaking_change = BreakingChange::No;
let body = Body::default(); let body = Body::default();
let result = workflow let result =
.preview_and_confirm(commit_type, scope, description, breaking_change, body) workflow.preview_and_confirm(commit_type, scope, description, breaking_change, body);
.await;
assert!(result.is_ok()); assert!(result.is_ok());
} }
@@ -451,8 +447,8 @@ mod tests {
} }
/// Test that mock prompts track method calls correctly /// Test that mock prompts track method calls correctly
#[tokio::test] #[test]
async fn test_mock_prompts_track_calls() { fn test_mock_prompts_track_calls() {
let mock_executor = MockJjExecutor::new().with_is_repo_response(Ok(true)); let mock_executor = MockJjExecutor::new().with_is_repo_response(Ok(true));
let mock_prompts = MockPrompts::new() let mock_prompts = MockPrompts::new()
.with_commit_type(CommitType::Feat) .with_commit_type(CommitType::Feat)
@@ -552,21 +548,19 @@ mod tests {
/// BreakingChange::No was hard-coded, so a confirmed /// BreakingChange::No was hard-coded, so a confirmed
/// breaking-change commit was silently applied without the '!' /// breaking-change commit was silently applied without the '!'
/// marker. /// marker.
#[tokio::test] #[test]
async fn preview_and_confirm_forwards_breaking_change_yes() { fn preview_and_confirm_forwards_breaking_change_yes() {
let mock_executor = MockJjExecutor::new(); let mock_executor = MockJjExecutor::new();
let mock_prompts = MockPrompts::new().with_confirm(true); let mock_prompts = MockPrompts::new().with_confirm(true);
let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts); let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts);
let result = workflow let result = workflow.preview_and_confirm(
.preview_and_confirm( CommitType::Feat,
CommitType::Feat, Scope::empty(),
Scope::empty(), Description::parse("remove old API").unwrap(),
Description::parse("remove old API").unwrap(), BreakingChange::Yes,
BreakingChange::Yes, Body::default(),
Body::default(), );
)
.await;
assert!(result.is_ok(), "expected Ok, got: {:?}", result); assert!(result.is_ok(), "expected Ok, got: {:?}", result);
let message = result.unwrap().to_string(); let message = result.unwrap().to_string();
@@ -580,22 +574,20 @@ mod tests {
/// Preview_and_confirm must forward BreakingChange::WithNote, /// Preview_and_confirm must forward BreakingChange::WithNote,
/// producing a commit with both the '!' header marker and the /// producing a commit with both the '!' header marker and the
/// BREAKING CHANGE footer. /// BREAKING CHANGE footer.
#[tokio::test] #[test]
async fn preview_and_confirm_forwards_breaking_change_with_note() { fn preview_and_confirm_forwards_breaking_change_with_note() {
let mock_executor = MockJjExecutor::new(); let mock_executor = MockJjExecutor::new();
let mock_prompts = MockPrompts::new().with_confirm(true); let mock_prompts = MockPrompts::new().with_confirm(true);
let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts); let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts);
let breaking_change: BreakingChange = "removes legacy endpoint".into(); let breaking_change: BreakingChange = "removes legacy endpoint".into();
let result = workflow let result = workflow.preview_and_confirm(
.preview_and_confirm( CommitType::Feat,
CommitType::Feat, Scope::empty(),
Scope::empty(), Description::parse("drop legacy API").unwrap(),
Description::parse("drop legacy API").unwrap(), breaking_change,
breaking_change, Body::default(),
Body::default(), );
)
.await;
assert!(result.is_ok(), "expected Ok, got: {:?}", result); assert!(result.is_ok(), "expected Ok, got: {:?}", result);
let message = result.unwrap().to_string(); let message = result.unwrap().to_string();
@@ -655,21 +647,19 @@ mod tests {
/// ///
/// Currently the implementation passes Body::default() instead of the /// Currently the implementation passes Body::default() instead of the
/// received body, so this test will fail until that is fixed. /// received body, so this test will fail until that is fixed.
#[tokio::test] #[test]
async fn preview_and_confirm_forwards_body() { fn preview_and_confirm_forwards_body() {
let mock_executor = MockJjExecutor::new(); let mock_executor = MockJjExecutor::new();
let mock_prompts = MockPrompts::new().with_confirm(true); let mock_prompts = MockPrompts::new().with_confirm(true);
let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts); let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts);
let result = workflow let result = workflow.preview_and_confirm(
.preview_and_confirm( CommitType::Feat,
CommitType::Feat, Scope::empty(),
Scope::empty(), Description::parse("add feature").unwrap(),
Description::parse("add feature").unwrap(), BreakingChange::No,
BreakingChange::No, Body::from("This explains the change."),
Body::from("This explains the change."), );
)
.await;
assert!(result.is_ok(), "expected Ok, got: {:?}", result); assert!(result.is_ok(), "expected Ok, got: {:?}", result);
assert!( assert!(
@@ -684,21 +674,19 @@ mod tests {
/// preview_and_confirm must forward the body even when a breaking change is present /// preview_and_confirm must forward the body even when a breaking change is present
/// ///
/// Expected format: "type!: desc\n\nbody\n\nBREAKING CHANGE: note" /// Expected format: "type!: desc\n\nbody\n\nBREAKING CHANGE: note"
#[tokio::test] #[test]
async fn preview_and_confirm_forwards_body_with_breaking_change() { fn preview_and_confirm_forwards_body_with_breaking_change() {
let mock_executor = MockJjExecutor::new(); let mock_executor = MockJjExecutor::new();
let mock_prompts = MockPrompts::new().with_confirm(true); let mock_prompts = MockPrompts::new().with_confirm(true);
let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts); let workflow = CommitWorkflow::with_prompts(mock_executor, mock_prompts);
let result = workflow let result = workflow.preview_and_confirm(
.preview_and_confirm( CommitType::Feat,
CommitType::Feat, Scope::empty(),
Scope::empty(), Description::parse("drop legacy API").unwrap(),
Description::parse("drop legacy API").unwrap(), "removes legacy endpoint".into(),
"removes legacy endpoint".into(), Body::from("The endpoint was deprecated in v2."),
Body::from("The endpoint was deprecated in v2."), );
)
.await;
assert!(result.is_ok(), "expected Ok, got: {:?}", result); assert!(result.is_ok(), "expected Ok, got: {:?}", result);
let message = result.unwrap().to_string(); let message = result.unwrap().to_string();