mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-26 02:51:57 +03:00
9e9f3255a8
Seems i can get away without adding it
130 lines
3.8 KiB
Rust
130 lines
3.8 KiB
Rust
use gitbutler_branch::BranchCreateRequest;
|
|
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn insert_blank_commit_down() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
..
|
|
} = &Test::default();
|
|
|
|
gitbutler_branch_actions::set_base_branch(
|
|
project,
|
|
&"refs/remotes/origin/master".parse().unwrap(),
|
|
)
|
|
.unwrap();
|
|
|
|
let branch_id =
|
|
gitbutler_branch_actions::create_virtual_branch(project, &BranchCreateRequest::default())
|
|
.unwrap();
|
|
|
|
// create commit
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
let _commit1_id =
|
|
gitbutler_branch_actions::create_commit(project, branch_id, "commit one", None, false)
|
|
.unwrap();
|
|
|
|
// create commit
|
|
fs::write(repository.path().join("file2.txt"), "content2").unwrap();
|
|
fs::write(repository.path().join("file3.txt"), "content3").unwrap();
|
|
let commit2_id =
|
|
gitbutler_branch_actions::create_commit(project, branch_id, "commit two", None, false)
|
|
.unwrap();
|
|
|
|
// create commit
|
|
fs::write(repository.path().join("file4.txt"), "content4").unwrap();
|
|
let _commit3_id =
|
|
gitbutler_branch_actions::create_commit(project, branch_id, "commit three", None, false)
|
|
.unwrap();
|
|
|
|
gitbutler_branch_actions::insert_blank_commit(project, branch_id, commit2_id, 1).unwrap();
|
|
|
|
let branch = gitbutler_branch_actions::list_virtual_branches(project)
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == branch_id)
|
|
.unwrap();
|
|
|
|
assert_eq!(branch.commits.len(), 4);
|
|
assert_eq!(branch.commits[0].files.len(), 1);
|
|
assert_eq!(branch.commits[1].files.len(), 2);
|
|
assert_eq!(branch.commits[2].files.len(), 0); // blank commit
|
|
|
|
let descriptions = branch
|
|
.commits
|
|
.iter()
|
|
.map(|c| c.description.clone())
|
|
.collect::<Vec<_>>();
|
|
|
|
assert_eq!(
|
|
descriptions,
|
|
vec!["commit three", "commit two", "", "commit one"]
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn insert_blank_commit_up() {
|
|
let Test {
|
|
repository,
|
|
project,
|
|
..
|
|
} = &Test::default();
|
|
|
|
gitbutler_branch_actions::set_base_branch(
|
|
project,
|
|
&"refs/remotes/origin/master".parse().unwrap(),
|
|
)
|
|
.unwrap();
|
|
|
|
let branch_id =
|
|
gitbutler_branch_actions::create_virtual_branch(project, &BranchCreateRequest::default())
|
|
.unwrap();
|
|
|
|
// create commit
|
|
fs::write(repository.path().join("file.txt"), "content").unwrap();
|
|
let _commit1_id =
|
|
gitbutler_branch_actions::create_commit(project, branch_id, "commit one", None, false)
|
|
.unwrap();
|
|
|
|
// create commit
|
|
fs::write(repository.path().join("file2.txt"), "content2").unwrap();
|
|
fs::write(repository.path().join("file3.txt"), "content3").unwrap();
|
|
let commit2_id =
|
|
gitbutler_branch_actions::create_commit(project, branch_id, "commit two", None, false)
|
|
.unwrap();
|
|
|
|
// create commit
|
|
fs::write(repository.path().join("file4.txt"), "content4").unwrap();
|
|
let _commit3_id =
|
|
gitbutler_branch_actions::create_commit(project, branch_id, "commit three", None, false)
|
|
.unwrap();
|
|
|
|
gitbutler_branch_actions::insert_blank_commit(project, branch_id, commit2_id, -1).unwrap();
|
|
|
|
let branch = gitbutler_branch_actions::list_virtual_branches(project)
|
|
.unwrap()
|
|
.0
|
|
.into_iter()
|
|
.find(|b| b.id == branch_id)
|
|
.unwrap();
|
|
|
|
assert_eq!(branch.commits.len(), 4);
|
|
assert_eq!(branch.commits[0].files.len(), 1);
|
|
assert_eq!(branch.commits[1].files.len(), 0); // blank commit
|
|
assert_eq!(branch.commits[2].files.len(), 2);
|
|
|
|
let descriptions = branch
|
|
.commits
|
|
.iter()
|
|
.map(|c| c.description.clone())
|
|
.collect::<Vec<_>>();
|
|
|
|
assert_eq!(
|
|
descriptions,
|
|
vec!["commit three", "", "commit two", "commit one"]
|
|
);
|
|
}
|