fix unittest

Author: extrawurst

src/stash.rs

@@ -216,10 +216,10 @@ extern "C" fn stash_apply_progress_cb(
 mod tests {
     use crate::stash::{StashApplyOptions, StashSaveOptions};
     use crate::test::repo_init;
-    use crate::{Repository, StashFlags, Status};
+    use crate::{IndexAddOption, Repository, StashFlags, Status};
     use std::fs;
     use std::io::Write;
-    use std::path::Path;
+    use std::path::{Path, PathBuf};
 
     fn make_stash<C>(next: C)
     where
@@ -322,30 +322,39 @@ mod tests {
         assert!(stash_name.starts_with("WIP on main:"));
     }
 
+    fn create_file(r: &Repository, name: &str, data: &str) -> PathBuf {
+        let p = Path::new(r.workdir().unwrap()).join(name);
+        fs::File::create(&p)
+            .unwrap()
+            .write(data.as_bytes())
+            .unwrap();
+        p
+    }
+
     #[test]
     fn test_stash_save_ext() {
         let (_td, mut repo) = repo_init();
         let signature = repo.signature().unwrap();
 
-        let path_a = Path::new(repo.workdir().unwrap()).join("file_a");
-        fs::File::create(&path_a)
-            .unwrap()
-            .write("data".as_bytes())
-            .unwrap();
+        create_file(&repo, "file_a", "foo");
+        create_file(&repo, "file_b", "foo");
 
-        let path_b = Path::new(repo.workdir().unwrap()).join("file_b");
-        fs::File::create(&path_b)
-            .unwrap()
-            .write("data".as_bytes())
+        let mut index = repo.index().unwrap();
+        index
+            .add_all(["*"].iter(), IndexAddOption::DEFAULT, None)
             .unwrap();
+        index.write().unwrap();
 
         assert_eq!(repo.statuses(None).unwrap().len(), 2);
 
         let mut opt = StashSaveOptions::new(signature);
         opt.pathspec("file_a");
-        opt.flags(Some(StashFlags::INCLUDE_UNTRACKED));
         repo.stash_save_ext(Some(&mut opt)).unwrap();
 
+        assert_eq!(repo.statuses(None).unwrap().len(), 0);
+
+        repo.stash_pop(0, None).unwrap();
+
         assert_eq!(repo.statuses(None).unwrap().len(), 1);
     }
 }