mirror of
https://github.com/gitbutlerapp/gitbutler.git
synced 2024-12-20 08:01:46 +03:00
110 lines
3.3 KiB
Rust
110 lines
3.3 KiB
Rust
use gitbutler_branch::BranchCreateRequest;
|
|
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn reorder_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();
|
|
|
|
gitbutler_branch_actions::reorder_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(), 2);
|
|
assert_eq!(branch.commits[0].files.len(), 1); // this now has the 2 file changes
|
|
assert_eq!(branch.commits[1].files.len(), 2); // and this has the single file change
|
|
|
|
let descriptions = branch
|
|
.commits
|
|
.iter()
|
|
.map(|c| c.description.clone())
|
|
.collect::<Vec<_>>();
|
|
|
|
assert_eq!(descriptions, vec!["commit one", "commit two"]);
|
|
}
|
|
|
|
#[test]
|
|
fn reorder_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();
|
|
|
|
gitbutler_branch_actions::reorder_commit(project, branch_id, commit1_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(), 2);
|
|
assert_eq!(branch.commits[0].files.len(), 1); // this now has the 2 file changes
|
|
assert_eq!(branch.commits[1].files.len(), 2); // and this has the single file change
|
|
|
|
let descriptions = branch
|
|
.commits
|
|
.iter()
|
|
.map(|c| c.description.clone())
|
|
.collect::<Vec<_>>();
|
|
|
|
assert_eq!(descriptions, vec!["commit one", "commit two"]);
|
|
}
|