remove map_or and add some more tests

software-mansion · Mar 3, 2023 · 036d14a · 036d14a
1 parent cd90716
commit 036d14a
Show file tree

Hide file tree

Showing 2 changed files with 59 additions and 5 deletions.
diff --git a/scarb/src/manifest_editor/add.rs b/scarb/src/manifest_editor/add.rs
@@ -52,10 +52,10 @@ impl Op for AddDependency {
 
         let dep = Dep::resolve(*self, ctx)?;
 
-        let was_sorted = tab.as_table_like().map_or(true, |dep_table| {
-            let values = dep_table.get_values();
+        let was_sorted = {
+            let values = tab.as_table_like().unwrap().get_values();
             is_sorted(values.iter().map(|(key, _)| key[0]))
-        });
+        };
 
         let dep_key = dep.toml_key().to_string();
         dep.upsert(tab.as_table_like_mut().unwrap().entry(&dep_key));

diff --git a/scarb/tests/e2e/add.rs b/scarb/tests/e2e/add.rs
@@ -377,6 +377,62 @@ fn should_sort_if_already_sorted() {
             foo = "1.0.0"
         "#})
         .run();
+
+    ManifestEditHarness::offline()
+        .args(["add", "[email protected]"])
+        .input(indoc! {r#"
+            [package]
+            name = "hello"
+            version = "1.0.0"
+
+            [dependencies]
+            bar = "1.0.0"
+            
+            dep = "1.0.0"
+            foo = "1.0.0"
+        "#})
+        .output(indoc! {r#"
+            [package]
+            name = "hello"
+            version = "1.0.0"
+
+            [dependencies]
+            bar = "1.0.0"
+            cat = "2.0.0"
+
+            dep = "1.0.0"
+            foo = "1.0.0"
+        "#})
+        .run();
+
+    ManifestEditHarness::offline()
+        .args(["add", "[email protected]"])
+        .input(indoc! {r#"
+            [package]
+            name = "hello"
+            version = "1.0.0"
+
+            [dependencies]
+            bar = "1.0.0"
+            cat = "2.0.0"
+            
+            dep = "1.0.0"
+            foo = "1.0.0"
+        "#})
+        .output(indoc! {r#"
+            [package]
+            name = "hello"
+            version = "1.0.0"
+
+            [dependencies]
+            bar = "1.0.0"
+            cat = "2.0.0"
+            
+            dep = "1.0.0"
+            dog = "2.0.0"
+            foo = "1.0.0"
+        "#})
+        .run();
 }
 
 #[test]
@@ -391,7 +447,6 @@ fn should_not_sort_if_already_unsorted() {
             [dependencies]
             bar = "1.0.0"
             foo = "1.0.0"
-            
             dep = "1.0.0"
         "#})
         .output(indoc! {r#"
@@ -402,7 +457,6 @@ fn should_not_sort_if_already_unsorted() {
             [dependencies]
             bar = "1.0.0"
             foo = "1.0.0"
-            
             dep = "1.0.0"
             apple = "1.0.0"
         "#})