From 9e9bb78db755cf018b4dabd48a6d63f1d123afbb Mon Sep 17 00:00:00 2001
From: Sergio <77530549+sergi0g@users.noreply.github.com>
Date: Sat, 16 Nov 2024 13:14:52 +0200
Subject: [PATCH] Fix broken tests

---
 src/structs/version.rs       | 10 +++++-----
 src/utils/sort_update_vec.rs | 13 +++++++++++--
 2 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/src/structs/version.rs b/src/structs/version.rs
index 0eab411..6c24cde 100644
--- a/src/structs/version.rs
+++ b/src/structs/version.rs
@@ -145,14 +145,14 @@ mod tests {
     #[rustfmt::skip]
     fn version() {
         assert_eq!(Version::from_tag("5.3.2"                   ), Some(Version { major: 5,  minor: Some(3),   patch: Some(2)  }));
-        assert_eq!(Version::from_tag("14"                      ), Some(Version { major: 14, minor: Some(0),   patch: Some(0)  }));
+        assert_eq!(Version::from_tag("14"                      ), Some(Version { major: 14, minor: None,   patch: None  }));
         assert_eq!(Version::from_tag("v0.107.53"               ), Some(Version { major: 0,  minor: Some(107), patch: Some(53) }));
-        assert_eq!(Version::from_tag("12-alpine"               ), Some(Version { major: 12, minor: Some(0),   patch: Some(0)  }));
+        assert_eq!(Version::from_tag("12-alpine"               ), Some(Version { major: 12, minor: None,   patch: None  }));
         assert_eq!(Version::from_tag("0.9.5-nginx"             ), Some(Version { major: 0,  minor: Some(9),   patch: Some(5)  }));
-        assert_eq!(Version::from_tag("v27.0"                   ), Some(Version { major: 27, minor: Some(0),   patch: Some(0)  }));
-        assert_eq!(Version::from_tag("16.1"                    ), Some(Version { major: 16, minor: Some(1),   patch: Some(0)  }));
+        assert_eq!(Version::from_tag("v27.0"                   ), Some(Version { major: 27, minor: Some(0),   patch: None  }));
+        assert_eq!(Version::from_tag("16.1"                    ), Some(Version { major: 16, minor: Some(1),   patch: None  }));
         assert_eq!(Version::from_tag("version-1.5.6"           ), Some(Version { major: 1,  minor: Some(5),   patch: Some(6)  }));
-        assert_eq!(Version::from_tag("15.4-alpine"             ), Some(Version { major: 15, minor: Some(4),   patch: Some(0)  }));
+        assert_eq!(Version::from_tag("15.4-alpine"             ), Some(Version { major: 15, minor: Some(4),   patch: None  }));
         assert_eq!(Version::from_tag("pg14-v0.2.0"             ), Some(Version { major: 0,  minor: Some(2),   patch: Some(0)  }));
         assert_eq!(Version::from_tag("18-jammy-full.s6-v0.88.0"), Some(Version { major: 0,  minor: Some(88),  patch: Some(0)  }));
         assert_eq!(Version::from_tag("fpm-2.1.0-prod"          ), Some(Version { major: 2,  minor: Some(1),   patch: Some(0)  }));
diff --git a/src/utils/sort_update_vec.rs b/src/utils/sort_update_vec.rs
index c34fc1c..a55781c 100644
--- a/src/utils/sort_update_vec.rs
+++ b/src/utils/sort_update_vec.rs
@@ -1,9 +1,18 @@
+use std::cmp::Ordering;
+
 use crate::structs::image::Image;
 
 /// Sorts the update vector alphabetically and where Some(true) > Some(false) > None
 pub fn sort_image_vec(updates: &[Image]) -> Vec<Image> {
     let mut sorted_updates = updates.to_vec();
-    sorted_updates.sort_unstable_by_key(|img| img.has_update());
+    sorted_updates.sort_by(|a, b| {
+        let cmp = a.has_update().cmp(&b.has_update());
+        if cmp == Ordering::Equal {
+            a.reference.cmp(&b.reference)
+        } else {
+            cmp
+        }
+    });
     sorted_updates.to_vec()
 }
 
@@ -14,7 +23,7 @@ mod tests {
     use super::*;
 
     /// Test the `sort_update_vec` function
-    /// TODO: test semver as well
+    /// TODO: test versioning as well
     #[test]
     fn test_ordering() {
         // Create test objects