Fix the tests!!!!!

Author: Caleb-T-Owens

crates/gitbutler-core/src/virtual_branches/virtual.rs

@@ -3722,8 +3722,6 @@ pub fn apply<S: AsRef<[u8]>>(base_image: S, patch: &Patch<'_, [u8]>) -> Result<B
         }
     }
 
-    dbg!(&patch);
-
     diffy_apply(base_image.as_ref(), patch)
         .with_context(|| DebugContext {
             base_image_hash: md5_hash_hex(base_image),

crates/gitbutler-core/tests/suite/virtual_branches/apply_virtual_branch.rs

@@ -1,56 +1,5 @@
 use super::*;
 
-#[tokio::test]
-async fn deltect_conflict() {
-    let Test {
-        repository,
-        project_id,
-        controller,
-        ..
-    } = &Test::default();
-
-    controller
-        .set_base_branch(*project_id, &"refs/remotes/origin/master".parse().unwrap())
-        .await
-        .unwrap();
-
-    let branch1_id = {
-        let branch1_id = controller
-            .create_virtual_branch(*project_id, &branch::BranchCreateRequest::default())
-            .await
-            .unwrap();
-        fs::write(repository.path().join("file.txt"), "branch one").unwrap();
-
-        branch1_id
-    };
-
-    // unapply first vbranch
-    controller
-        .convert_to_real_branch(*project_id, branch1_id, Default::default())
-        .await
-        .unwrap();
-
-    {
-        // create another vbranch that conflicts with the first one
-        controller
-            .create_virtual_branch(*project_id, &branch::BranchCreateRequest::default())
-            .await
-            .unwrap();
-        fs::write(repository.path().join("file.txt"), "branch two").unwrap();
-    }
-
-    {
-        assert!(matches!(
-            controller
-                .apply_virtual_branch(*project_id, branch1_id)
-                .await
-                .unwrap_err()
-                .downcast_ref(),
-            Some(Marker::ProjectConflict)
-        ));
-    }
-}
-
 #[tokio::test]
 async fn rebase_commit() {
     let Test {
@@ -76,7 +25,7 @@ async fn rebase_commit() {
         .await
         .unwrap();
 
-    let branch1_id = {
+    let mut branch1_id = {
         // create a branch with some commited work
         let branch1_id = controller
             .create_virtual_branch(*project_id, &branch::BranchCreateRequest::default())
@@ -99,9 +48,9 @@ async fn rebase_commit() {
         branch1_id
     };
 
-    {
+    let unapplied_branch = {
         // unapply first vbranch
-        controller
+        let unapplied_branch = controller
             .convert_to_real_branch(*project_id, branch1_id, Default::default())
             .await
             .unwrap();
@@ -116,25 +65,18 @@ async fn rebase_commit() {
         );
 
         let (branches, _) = controller.list_virtual_branches(*project_id).await.unwrap();
-        assert_eq!(branches.len(), 1);
-        assert_eq!(branches[0].id, branch1_id);
-        assert_eq!(branches[0].files.len(), 0);
-        assert_eq!(branches[0].commits.len(), 1);
-        assert!(!branches[0].active);
-    }
+        assert_eq!(branches.len(), 0);
+
+        git::Refname::from_str(&unapplied_branch).unwrap()
+    };
 
     {
         // fetch remote
         controller.update_base_branch(*project_id).await.unwrap();
 
         // branch is stil unapplied
         let (branches, _) = controller.list_virtual_branches(*project_id).await.unwrap();
-        assert_eq!(branches.len(), 1);
-        assert_eq!(branches[0].id, branch1_id);
-        assert_eq!(branches[0].files.len(), 0);
-        assert_eq!(branches[0].commits.len(), 1);
-        assert!(!branches[0].active);
-        assert!(!branches[0].conflicted);
+        assert_eq!(branches.len(), 0);
 
         assert_eq!(
             fs::read_to_string(repository.path().join("another_file.txt")).unwrap(),
@@ -148,8 +90,8 @@ async fn rebase_commit() {
 
     {
         // apply first vbranch again
-        controller
-            .apply_virtual_branch(*project_id, branch1_id)
+        branch1_id = controller
+            .create_virtual_branch_from_branch(*project_id, &unapplied_branch)
             .await
             .unwrap();
 
@@ -158,7 +100,7 @@ async fn rebase_commit() {
         assert_eq!(branches.len(), 1);
         assert_eq!(branches[0].id, branch1_id);
         assert_eq!(branches[0].files.len(), 0);
-        assert_eq!(branches[0].commits.len(), 1);
+        assert_eq!(branches[0].commits.len(), 2);
         assert!(branches[0].active);
         assert!(!branches[0].conflicted);
 
@@ -197,7 +139,7 @@ async fn rebase_work() {
         .await
         .unwrap();
 
-    let branch1_id = {
+    let mut branch1_id = {
         // make a branch with some work
         let branch1_id = controller
             .create_virtual_branch(*project_id, &branch::BranchCreateRequest::default())
@@ -215,54 +157,47 @@ async fn rebase_work() {
         branch1_id
     };
 
-    {
+    let unapplied_branch = {
         // unapply first vbranch
-        controller
+        let unapplied_branch = controller
             .convert_to_real_branch(*project_id, branch1_id, Default::default())
             .await
             .unwrap();
 
         let (branches, _) = controller.list_virtual_branches(*project_id).await.unwrap();
-        assert_eq!(branches.len(), 1);
-        assert_eq!(branches[0].id, branch1_id);
-        assert_eq!(branches[0].files.len(), 1);
-        assert_eq!(branches[0].commits.len(), 0);
-        assert!(!branches[0].active);
+        assert_eq!(branches.len(), 0);
 
         assert!(!repository.path().join("another_file.txt").exists());
         assert!(!repository.path().join("file.txt").exists());
-    }
+
+        git::Refname::from_str(&unapplied_branch).unwrap()
+    };
 
     {
         // fetch remote
         controller.update_base_branch(*project_id).await.unwrap();
 
         // first branch is stil unapplied
         let (branches, _) = controller.list_virtual_branches(*project_id).await.unwrap();
-        assert_eq!(branches.len(), 1);
-        assert_eq!(branches[0].id, branch1_id);
-        assert_eq!(branches[0].files.len(), 1);
-        assert_eq!(branches[0].commits.len(), 0);
-        assert!(!branches[0].active);
-        assert!(!branches[0].conflicted);
+        assert_eq!(branches.len(), 0);
 
         assert!(!repository.path().join("another_file.txt").exists());
         assert!(repository.path().join("file.txt").exists());
     }
 
     {
         // apply first vbranch again
-        controller
-            .apply_virtual_branch(*project_id, branch1_id)
+        branch1_id = controller
+            .create_virtual_branch_from_branch(*project_id, &unapplied_branch)
             .await
             .unwrap();
 
         // workdir should be rebased, and work should be restored
         let (branches, _) = controller.list_virtual_branches(*project_id).await.unwrap();
         assert_eq!(branches.len(), 1);
         assert_eq!(branches[0].id, branch1_id);
-        assert_eq!(branches[0].files.len(), 1);
-        assert_eq!(branches[0].commits.len(), 0);
+        assert_eq!(branches[0].files.len(), 0);
+        assert_eq!(branches[0].commits.len(), 1);
         assert!(branches[0].active);
         assert!(!branches[0].conflicted);
 

crates/gitbutler-core/tests/suite/virtual_branches/mod.rs

@@ -113,7 +113,7 @@ async fn resolve_conflict_flow() {
         .await
         .unwrap();
 
-    let mut branch1_id = {
+    {
         // make a branch that conflicts with the remote branch, but doesn't know about it yet
         let branch1_id = controller
             .create_virtual_branch(*project_id, &branch::BranchCreateRequest::default())
@@ -125,8 +125,6 @@ async fn resolve_conflict_flow() {
         assert_eq!(branches.len(), 1);
         assert_eq!(branches[0].id, branch1_id);
         assert!(branches[0].active);
-
-        branch1_id
     };
 
     let unapplied_branch = {
@@ -141,9 +139,9 @@ async fn resolve_conflict_flow() {
         git::Refname::from_str(&unapplied_branches[0]).unwrap()
     };
 
-    {
+    let branch1_id = {
         // when we apply conflicted branch, it has conflict
-        branch1_id = controller
+        let branch1_id = controller
             .create_virtual_branch_from_branch(*project_id, &unapplied_branch)
             .await
             .unwrap();
@@ -159,7 +157,9 @@ async fn resolve_conflict_flow() {
             fs::read_to_string(repository.path().join("file.txt")).unwrap(),
             "<<<<<<< ours\nconflict\n=======\nsecond\n>>>>>>> theirs\n"
         );
-    }
+
+        branch1_id
+    };
 
     {
         // can't commit conflicts