gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-11-29 06:18:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix tests

Browse Source
This commit is contained in:
Nikita Galaiko 2023-09-14 15:31:50 +02:00 committed by GitButler
parent a832a877ea
commit 0526d11b56
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/tauri/src/virtual_branches/tests.rs
View File

@ -2021,8 +2021,6 @@ fn test_detect_mergeable_branch() -> Result<()> {
.find(|b| b.name == "refs/remotes/origin/remote_branch")
.unwrap();
assert!(!remote1.mergeable);
assert_eq!(remote1.ahead, 1);
assert_eq!(remote1.merge_conflicts.len(), 1);
assert_eq!(remote1.merge_conflicts.first().unwrap(), "test.txt");
assert_eq!(remote1.commits.len(), 1);
@ -2031,7 +2029,6 @@ fn test_detect_mergeable_branch() -> Result<()> {
.find(|b| b.name == "refs/remotes/origin/remote_branch2")
.unwrap();
assert!(remote2.mergeable);
assert_eq!(remote2.ahead, 2);
assert_eq!(remote2.merge_conflicts.len(), 0);
assert_eq!(remote2.commits.len(), 2);