From cb78c58de1d4b0985a5cf686225a6bd78f538d22 Mon Sep 17 00:00:00 2001
From: Thomas Eppers <thomas@ThinkPad-T460-fd3f4cef.localdomain>
Date: Sun, 17 Oct 2021 00:17:40 +0200
Subject: [PATCH] fixed repo tests

---
 src/repo.rs | 19 +++++++++----------
 src/tags.rs |  2 +-
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/repo.rs b/src/repo.rs
index 451b2d1..15bd816 100644
--- a/src/repo.rs
+++ b/src/repo.rs
@@ -102,7 +102,6 @@ pub fn split_repo_without_tag(repo: &str) -> Result<Repo, Error> {
 
 #[cfg(test)]
 mod tests {
-    use crate::repo;
     use crate::repo::{Error, Repo};
 
     #[test]
@@ -128,23 +127,23 @@ mod tests {
     #[test]
     fn test_match_yaml_image() {
         use crate::repo::match_yaml_image as test_fn;
-        assert_eq!(test_fn(""), None);
-        assert_eq!(test_fn("version: '2'"), None);
-        assert_eq!(test_fn("image: "), None);
-        assert_eq!(test_fn("  image: "), None);
-        assert_eq!(test_fn("  image: nginx"), Some(("  image: ", "nginx")));
+        assert_eq!(test_fn(""), Err(Error::NoTagFound));
+        assert_eq!(test_fn("version: '2'"), Err(Error::NoTagFound));
+        assert_eq!(test_fn("image: "), Err(Error::NoTagFound));
+        assert_eq!(test_fn("  image: "), Err(Error::NoTagFound));
+        assert_eq!(test_fn("  image: nginx"), Ok(("  image: ", "nginx")));
         assert_eq!(
             test_fn("  image: library/nginx"),
-            Some(("  image: ", "library/nginx"))
+            Ok(("  image: ", "library/nginx"))
         );
         assert_eq!(
             test_fn("  image: ghcr.io/library/nginx"),
-            Some(("  image: ", "ghcr.io/library/nginx"))
+            Ok(("  image: ", "ghcr.io/library/nginx"))
         );
-        assert_eq!(test_fn("#   image: nginx"), None);
+        assert_eq!(test_fn("#   image: nginx"), Err(Error::NoTagFound));
         assert_eq!(
             test_fn("   image: nginx #comment"),
-            Some(("   image: ", "nginx"))
+            Ok(("   image: ", "nginx"))
         );
     }
 
diff --git a/src/tags.rs b/src/tags.rs
index 0d9f0ee..30120de 100644
--- a/src/tags.rs
+++ b/src/tags.rs
@@ -167,7 +167,7 @@ fn format_time_nice(time: chrono::Duration) -> String {
 
 #[cfg(test)]
 mod tests {
-    use crate::tags::{Error, Tags};
+    use crate::tags::Tags;
     #[test]
     fn test_check_repo() {
         assert_eq!(Tags::check_repo("nginx").unwrap(), "library/nginx");