handling unowned description

Author: perryqh

src/ownership.rs

@@ -51,13 +51,17 @@ impl TeamOwnership {
 
 impl Display for FileOwner {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        let sources = self
-            .sources
-            .iter()
-            .sorted_by_key(|source| source.to_string())
-            .map(|source| source.to_string())
-            .collect::<Vec<String>>()
-            .join("\n- ");
+        let sources = if self.sources.is_empty() {
+            "Unowned".to_string()
+        } else {
+            self.sources
+                .iter()
+                .sorted_by_key(|source| source.to_string())
+                .map(|source| source.to_string())
+                .collect::<Vec<_>>()
+                .join("\n- ")
+        };
+
         write!(
             f,
             "Team: {}\nTeam YML: {}\nDescription:\n- {}",

tests/invalid_project_test.rs

@@ -52,7 +52,9 @@ fn test_for_file() -> Result<(), Box<dyn Error>> {
         .stdout(predicate::eq(indoc! {"
             Team: Unowned
             Team YML: Unowned
-            Description:\n- \n"})); // trailing whitespace
+            Description:
+            - Unowned
+            "}));
     Ok(())
 }
 

tests/valid_project_test.rs

@@ -54,22 +54,20 @@ fn test_for_file() -> Result<(), Box<dyn Error>> {
 
 #[test]
 fn test_for_file_same_team_multiple_ownerships() -> Result<(), Box<dyn Error>> {
-    let expected_output = r#"
-Team: Payroll
-Team YML: config/teams/payroll.yml
-Description:
-- Owner annotation at the top of the file
-- Owner defined in `javascript/packages/PayrollFlow/package.json` with implicity owned glob: `javascript/packages/PayrollFlow/**/**`
-    "#
-    .trim();
     Command::cargo_bin("codeowners")?
         .arg("--project-root")
         .arg("tests/fixtures/valid_project")
         .arg("for-file")
         .arg("javascript/packages/PayrollFlow/index.tsx")
         .assert()
         .success()
-        .stdout(predicate::str::contains(expected_output));
+        .stdout(predicate::eq(indoc! {"
+            Team: Payroll
+            Team YML: config/teams/payroll.yml
+            Description:
+            - Owner annotation at the top of the file
+            - Owner defined in `javascript/packages/PayrollFlow/package.json` with implicity owned glob: `javascript/packages/PayrollFlow/**/**`
+        "}));
     Ok(())
 }
 
@@ -82,8 +80,13 @@ fn test_for_file_with_2_ownerships() -> Result<(), Box<dyn Error>> {
         .arg("javascript/packages/PayrollFlow/index.tsx")
         .assert()
         .success()
-        .stdout(predicate::str::contains("Team: Payroll"))
-        .stdout(predicate::str::contains("Team YML: config/teams/payroll.yml"));
+        .stdout(predicate::eq(indoc! {"
+            Team: Payroll
+            Team YML: config/teams/payroll.yml
+            Description:
+            - Owner annotation at the top of the file
+            - Owner defined in `javascript/packages/PayrollFlow/package.json` with implicity owned glob: `javascript/packages/PayrollFlow/**/**`
+        "}));
 
     Ok(())
 }