cargo fmt

Author: ecraig12345

rust/src/changefile/changed_packages.rs

@@ -2,9 +2,9 @@ use anyhow::Result;
 use std::collections::HashSet;
 use std::path::Path;
 
-use crate::log_info;
 use crate::git::commands;
 use crate::git::ensure_shared_history::ensure_shared_history;
+use crate::log_info;
 use crate::monorepo::filter_ignored::filter_ignored_files;
 use crate::types::change_info::{ChangeFileInfo, ChangeInfoMultiple};
 use crate::types::options::BeachballOptions;

rust/src/changefile/write_change_files.rs

@@ -1,8 +1,8 @@
 use anyhow::Result;
 use std::path::Path;
 
-use crate::log_info;
 use crate::git::commands;
+use crate::log_info;
 use crate::types::change_info::ChangeFileInfo;
 use crate::types::options::BeachballOptions;
 

rust/src/commands/change.rs

@@ -1,9 +1,9 @@
 use anyhow::{Result, bail};
 
-use crate::log_info;
 use crate::changefile::changed_packages::get_changed_packages;
 use crate::changefile::write_change_files::write_change_files;
 use crate::git::commands::get_user_email;
+use crate::log_info;
 use crate::types::change_info::{ChangeFileInfo, ChangeType};
 use crate::types::options::ParsedOptions;
 use crate::validation::validate::{ValidateOptions, ValidationResult, validate};

rust/src/monorepo/filter_ignored.rs

@@ -1,5 +1,5 @@
-use crate::log_info;
 use super::path_included::match_with_base;
+use crate::log_info;
 
 /// Filter out file paths that match any of the ignore patterns.
 /// Uses matchBase: true behavior (patterns without '/' match against basename).

rust/src/validation/validate.rs

@@ -1,6 +1,5 @@
 use anyhow::Result;
 
-use crate::{log_error, log_info, log_warn};
 use crate::changefile::change_types::get_disallowed_change_types;
 use crate::changefile::changed_packages::get_changed_packages;
 use crate::changefile::read_change_files::read_change_files;
@@ -14,6 +13,7 @@ use crate::types::options::ParsedOptions;
 use crate::types::package_info::{PackageGroups, PackageInfos, ScopedPackages};
 use crate::validation::are_change_files_deleted::are_change_files_deleted;
 use crate::validation::validators::*;
+use crate::{log_error, log_info, log_warn};
 
 #[derive(Default)]
 pub struct ValidateOptions {

rust/tests/change_test.rs

@@ -6,7 +6,9 @@ use beachball::types::change_info::{ChangeFileInfo, ChangeInfoMultiple, ChangeTy
 use beachball::types::options::{BeachballOptions, CliOptions};
 use common::change_files::get_change_files;
 use common::repository_factory::RepositoryFactory;
-use common::{DEFAULT_BRANCH, DEFAULT_REMOTE_BRANCH};
+use common::{
+    DEFAULT_BRANCH, DEFAULT_REMOTE_BRANCH, capture_logging, get_log_output, reset_logging,
+};
 
 fn make_cli(message: &str, change_type: ChangeType) -> CliOptions {
     CliOptions {
@@ -31,10 +33,15 @@ fn does_not_create_change_files_when_no_changes() {
     let repo = factory.clone_repository();
     repo.checkout(&["-b", "no-changes-test", DEFAULT_BRANCH]);
 
+    capture_logging();
     let cli = make_cli("test change", ChangeType::Patch);
     let parsed = get_parsed_options_for_test(repo.root_path(), cli, make_repo_opts());
     assert!(change(&parsed).is_ok());
+    let output = get_log_output();
+    reset_logging();
+
     assert!(get_change_files(&parsed.options).is_empty());
+    assert!(output.contains("No change files are needed"));
 }
 
 #[test]
@@ -83,8 +90,11 @@ fn creates_and_stages_a_change_file() {
         ..make_cli("stage me please", ChangeType::Patch)
     };
 
+    capture_logging();
     let parsed = get_parsed_options_for_test(repo.root_path(), cli, repo_opts);
     assert!(change(&parsed).is_ok());
+    let output = get_log_output();
+    reset_logging();
 
     // Verify file is staged (git status shows "A ")
     let status = repo.status();
@@ -100,6 +110,7 @@ fn creates_and_stages_a_change_file() {
     let change: ChangeFileInfo = serde_json::from_str(&contents).unwrap();
     assert_eq!(change.comment, "stage me please");
     assert_eq!(change.package_name, "foo");
+    assert!(output.contains("git staged these change files:"));
 }
 
 #[test]
@@ -109,9 +120,12 @@ fn creates_and_commits_a_change_file() {
     repo.checkout(&["-b", "commits-change-test", DEFAULT_BRANCH]);
     repo.commit_change("file.js");
 
+    capture_logging();
     let cli = make_cli("commit me please", ChangeType::Patch);
     let parsed = get_parsed_options_for_test(repo.root_path(), cli, make_repo_opts());
     assert!(change(&parsed).is_ok());
+    let output = get_log_output();
+    reset_logging();
 
     // Verify clean git status (committed)
     let status = repo.status();
@@ -123,6 +137,7 @@ fn creates_and_commits_a_change_file() {
     let contents = std::fs::read_to_string(&files[0]).unwrap();
     let change: ChangeFileInfo = serde_json::from_str(&contents).unwrap();
     assert_eq!(change.comment, "commit me please");
+    assert!(output.contains("git committed these change files:"));
 }
 
 #[test]

rust/tests/changed_packages_test.rs

@@ -7,7 +7,9 @@ use beachball::options::get_options::get_parsed_options_for_test;
 use beachball::types::options::{BeachballOptions, CliOptions};
 use common::change_files::generate_change_files;
 use common::repository_factory::RepositoryFactory;
-use common::{DEFAULT_BRANCH, DEFAULT_REMOTE_BRANCH};
+use common::{
+    DEFAULT_BRANCH, DEFAULT_REMOTE_BRANCH, capture_logging, get_log_output, reset_logging,
+};
 use serde_json::json;
 use std::collections::HashMap;
 
@@ -55,9 +57,18 @@ fn returns_package_name_when_changes_in_branch() {
     check_out_test_branch(&repo, "changes_in_branch");
     repo.commit_change("packages/foo/myFilename");
 
-    let (options, infos, scoped) = get_options_and_packages(&repo, None, None);
+    let opts = BeachballOptions {
+        verbose: true,
+        ..Default::default()
+    };
+    capture_logging();
+    let (options, infos, scoped) = get_options_and_packages(&repo, Some(opts), None);
     let result = get_changed_packages(&options, &infos, &scoped).unwrap();
+    let output = get_log_output();
+    reset_logging();
+
     assert_eq!(result, vec!["foo"]);
+    assert!(output.contains("Checking for changes against"));
 }
 
 #[test]
@@ -154,8 +165,13 @@ fn respects_ignore_patterns() {
     repo.write_file_content("yarn.lock", "changed");
     repo.git(&["add", "-A"]);
 
+    capture_logging();
     let result = get_changed_packages(&options, &infos, &scoped).unwrap();
+    let output = get_log_output();
+    reset_logging();
+
     assert!(result.is_empty());
+    assert!(output.contains("ignored by pattern"));
 }
 
 // ===== Monorepo tests =====
@@ -191,8 +207,13 @@ fn excludes_packages_with_existing_change_files() {
     let (options, infos, scoped) = get_options_and_packages(&repo, Some(opts), None);
     generate_change_files(&["foo"], &options, &repo);
 
+    capture_logging();
     let result = get_changed_packages(&options, &infos, &scoped).unwrap();
+    let output = get_log_output();
+    reset_logging();
+
     assert!(result.is_empty(), "Expected empty but got: {result:?}");
+    assert!(output.contains("already has change files for these packages"));
 
     // Change bar => bar is the only changed package returned
     repo.stage_change("packages/bar/test.js");
@@ -249,9 +270,15 @@ fn ignores_package_changes_as_appropriate() {
         ..Default::default()
     };
 
+    capture_logging();
     let (options, infos, scoped) = get_options_and_packages(&repo, Some(opts), None);
     let result = get_changed_packages(&options, &infos, &scoped).unwrap();
+    let output = get_log_output();
+    reset_logging();
+
     assert_eq!(result, vec!["publish-me"]);
+    assert!(output.contains("is private"));
+    assert!(output.contains("is out of scope"));
 }
 
 #[test]

rust/tests/validate_test.rs

@@ -6,6 +6,7 @@ use beachball::validation::validate::{ValidateOptions, ValidationError, validate
 use common::DEFAULT_REMOTE_BRANCH;
 use common::repository::Repository;
 use common::repository_factory::RepositoryFactory;
+use common::{capture_logging, get_log_output, reset_logging};
 
 fn validate_wrapper(
     repo: &Repository,
@@ -26,16 +27,20 @@ fn succeeds_with_no_changes() {
     let repo = factory.clone_repository();
     repo.checkout(&["-b", "test"]);
 
+    capture_logging();
     let result = validate_wrapper(
         &repo,
         ValidateOptions {
             check_change_needed: true,
             ..Default::default()
         },
     );
+    let output = get_log_output();
+    reset_logging();
 
     assert!(result.is_ok());
     assert!(!result.unwrap().is_change_needed);
+    assert!(output.contains("Validating options and change files..."));
 }
 
 #[test]
@@ -45,16 +50,21 @@ fn exits_with_error_if_change_files_needed() {
     repo.checkout(&["-b", "test"]);
     repo.stage_change("packages/foo/test.js");
 
+    capture_logging();
     let result = validate_wrapper(
         &repo,
         ValidateOptions {
             check_change_needed: true,
             ..Default::default()
         },
     );
+    let output = get_log_output();
+    reset_logging();
 
     let err = result.expect_err("expected validation to fail");
     assert!(err.downcast_ref::<ValidationError>().is_some());
+    assert!(output.contains("ERROR: Change files are needed!"));
+    assert!(output.contains("Found changes in the following packages"));
 }
 
 #[test]
@@ -64,6 +74,7 @@ fn returns_without_error_if_allow_missing_change_files() {
     repo.checkout(&["-b", "test"]);
     repo.stage_change("packages/foo/test.js");
 
+    capture_logging();
     let result = validate_wrapper(
         &repo,
         ValidateOptions {
@@ -72,7 +83,10 @@ fn returns_without_error_if_allow_missing_change_files() {
             ..Default::default()
         },
     );
+    let output = get_log_output();
+    reset_logging();
 
     assert!(result.is_ok());
     assert!(result.unwrap().is_change_needed);
+    assert!(!output.contains("ERROR:"));
 }