verifying cache deletion

Author: perryqh

src/cli.rs

@@ -100,8 +100,8 @@ pub fn cli() -> Result<(), Error> {
 
     let config = serde_yaml::from_reader(config_file).change_context(Error::Io)?;
 
-    let mut builder = ProjectBuilder::new(&config, project_root, codeowners_file_path.clone(), !args.no_cache);
-    let project = builder.build().change_context(Error::Io)?;
+    let mut project_builder = ProjectBuilder::new(&config, project_root, codeowners_file_path.clone(), !args.no_cache);
+    let project = project_builder.build().change_context(Error::Io)?;
     let ownership = Ownership::build(project);
 
     match args.command {
@@ -140,7 +140,7 @@ pub fn cli() -> Result<(), Error> {
             Err(err) => println!("{}", err),
         },
         Command::DeleteCache => {
-            //project_file_builder::delete_cache().change_context(Error::Io)?;
+            project_builder.delete_cache().change_context(Error::Io)?;
         }
     }
 

src/ownership/mapper/team_file_mapper.rs

@@ -78,7 +78,6 @@ mod tests {
     fn test_entries() -> Result<(), Box<dyn Error>> {
         let ownership = build_ownership_with_team_file_codeowners()?;
         let mapper = TeamFileMapper::build(ownership.project.clone());
-        dbg!(&mapper.entries());
         vecs_match(
             &mapper.entries(),
             &vec![

src/project_builder.rs

@@ -64,6 +64,10 @@ impl<'a> ProjectBuilder<'a> {
         project
     }
 
+    pub fn delete_cache(&mut self) -> Result<(), Error> {
+        self.project_file_builder.delete_cache()
+    }
+
     fn build_entry_type(&mut self, entry: ignore::DirEntry) -> Result<EntryType, Error> {
         let absolute_path = entry.path();
 

src/project_file_builder.rs

@@ -105,6 +105,7 @@ impl<'a> ProjectFileBuilder<'a> {
 
     pub fn delete_cache(&self) -> Result<(), Error> {
         let cache_path = self.get_cache_path();
+        dbg!("deleting", &cache_path);
         fs::remove_file(cache_path).change_context(Error::Io)
     }
 

tests/cache_test.rs

@@ -1,3 +1,4 @@
+use std::path::PathBuf;
 use std::process::Command;
 
 use std::error::Error;
@@ -8,18 +9,21 @@ use assert_cmd::cargo::CommandCargoExt;
 mod common;
 
 #[test]
-fn test_validate_with_cache() -> Result<(), Box<dyn Error>> {
-    common::teardown();
+fn test_delete_cache() -> Result<(), Box<dyn Error>> {
+    let cache_dir = PathBuf::from("tests/fixtures/valid_project/tmp/cache/codeowners");
+    std::fs::create_dir_all(&cache_dir)?;
+    let cache_path = cache_dir.join("project-file-cache.json");
+    std::fs::write(&cache_path, "dummy")?;
+    assert!(&cache_path.exists(), "Cache file was not created");
+
     Command::cargo_bin("codeowners")?
         .arg("--project-root")
         .arg("tests/fixtures/valid_project")
-        .arg("validate")
+        .arg("delete-cache")
         .assert()
         .success();
 
-    let cache_path = "tests/fixtures/valid_project/tmp/cache/codeowners/project-file-cache.json";
-    assert!(std::path::Path::new(cache_path).exists(), "Cache file was not created");
-
+    assert!(!&cache_path.exists(), "Cache file was not deleted");
     common::teardown();
     Ok(())
 }

tests/invalid_project_test.rs

@@ -65,6 +65,7 @@ fn test_for_file_multiple_owners() -> Result<(), Box<dyn Error>> {
     Command::cargo_bin("codeowners")?
         .arg("--project-root")
         .arg("tests/fixtures/invalid_project")
+        .arg("--no-cache")
         .arg("for-file")
         .arg("ruby/app/services/multi_owned.rb")
         .assert()