Fix broken test

- make use of integration commit title constant

Author: mtsgrd

crates/gitbutler-branch-actions/src/integration.rs

@@ -19,7 +19,7 @@ use crate::{branch_manager::BranchManagerExt, conflicts, VirtualBranchesExt};
 
 const WORKSPACE_HEAD: &str = "Workspace Head";
 const GITBUTLER_INTEGRATION_COMMIT_TITLE: &str = "GitButler Integration Commit";
-const GITBUTLER_WORKSPACE_COMMIT_TITLE: &str = "GitButler Workspace Commit";
+pub const GITBUTLER_WORKSPACE_COMMIT_TITLE: &str = "GitButler Workspace Commit";
 
 /// Creates and returns a merge commit of all active branch heads.
 ///

crates/gitbutler-branch-actions/src/lib.rs

@@ -44,3 +44,5 @@ pub use branch::{
     get_branch_listing_details, list_branches, Author, BranchListing, BranchListingDetails,
     BranchListingFilter,
 };
+
+pub use integration::GITBUTLER_WORKSPACE_COMMIT_TITLE;

crates/gitbutler-branch-actions/tests/virtual_branches/mod.rs

@@ -1,6 +1,7 @@
 use std::{fs, path, path::PathBuf, str::FromStr};
 
 use gitbutler_branch::{BranchCreateRequest, VirtualBranchesHandle};
+use gitbutler_branch_actions::GITBUTLER_WORKSPACE_COMMIT_TITLE;
 use gitbutler_branch_actions::{update_gitbutler_integration, VirtualBranchActions};
 use gitbutler_command_context::CommandContext;
 use gitbutler_error::error::Marker;

crates/gitbutler-branch-actions/tests/virtual_branches/oplog.rs

@@ -265,7 +265,7 @@ fn restores_gitbutler_integration() -> anyhow::Result<()> {
     let commit = &head.peel_to_commit()?;
     let commit1_id = commit.id();
     let message = commit.summary().unwrap();
-    assert_eq!(message, "GitButler Integration Commit");
+    assert_eq!(message, GITBUTLER_WORKSPACE_COMMIT_TITLE);
 
     // create second commit
     fs::write(repository.path().join("file.txt"), "changed content")?;
@@ -276,7 +276,7 @@ fn restores_gitbutler_integration() -> anyhow::Result<()> {
     let commit = &head.peel_to_commit()?;
     let commit2_id = commit.id();
     let message = commit.summary().unwrap();
-    assert_eq!(message, "GitButler Integration Commit");
+    assert_eq!(message, GITBUTLER_WORKSPACE_COMMIT_TITLE);
     assert_ne!(commit1_id, commit2_id);
 
     // restore the first

crates/gitbutler-operating-modes/src/lib.rs

@@ -11,7 +11,7 @@ pub mod commands;
 pub const WORKSPACE_BRANCH_REF: &str = "refs/heads/gitbutler/workspace";
 
 /// Previous workspace reference, delete after transition.
-pub const INTEGRATION_BRANCH_REF: &str = "refs/heads/gitbutler/integration";
+const INTEGRATION_BRANCH_REF: &str = "refs/heads/gitbutler/integration";
 
 /// To prevent clients hitting the "looks like you've moved away from..."
 /// after upgrading to a version using the new gitbutler/workspace branch

crates/gitbutler-reference/tests/reference.rs

@@ -48,10 +48,10 @@ mod normalize_branch_name {
         assert_eq!(normalize_branch_name("#[test]")?, "#-test]");
         assert_eq!(normalize_branch_name("foo#branch")?, "foo#branch");
         assert_eq!(normalize_branch_name("foo!branch")?, "foo!branch");
-        let input = r#"Revert "GitButler Integration Commit"
+        let input = r#"Revert "GitButler Workspace Commit"
 
 This reverts commit d6efa5fd96d36da445d5d1345b84163f05f5f229."#;
-        assert_eq!(normalize_branch_name(input)?, "Revert-\"GitButler-Integration-Commit\"-This-reverts-commit-d6efa5fd96d36da445d5d1345b84163f05f5f229");
+        assert_eq!(normalize_branch_name(input)?, "Revert-\"GitButler-Workspace-Commit\"-This-reverts-commit-d6efa5fd96d36da445d5d1345b84163f05f5f229");
         Ok(())
     }
 }