Fix snforge new (#3906)

commit-id:13eded66

---

**Stack**:
- #3907
- #3906 ⬅


⚠️ *Part of a stack created by [spr](https://github.com/ejoffe/spr). Do
not merge manually using the UI - doing so may have unexpected results.*

Author: ksew1

crates/forge/src/new.rs

@@ -17,6 +17,7 @@ static TEMPLATES_DIR: Dir = include_dir!("snforge_templates");
 
 const DEFAULT_ASSERT_MACROS: Version = Version::new(0, 1, 0);
 const MINIMAL_SCARB_FOR_CORRESPONDING_ASSERT_MACROS: Version = Version::new(2, 8, 0);
+const SCARB_WITHOUT_CAIRO_TEST_TEMPLATE: Version = Version::new(2, 13, 0);
 
 struct Dependency {
     name: String,
@@ -263,8 +264,9 @@ fn add_assert_macros(document: &mut DocumentMut) -> Result<()> {
     };
 
     document
-        .get_mut("dev-dependencies")
-        .and_then(|dep| dep.as_table_mut())
+        .entry("dev-dependencies")
+        .or_insert(Item::Table(Table::new()))
+        .as_table_mut()
         .context("Failed to get dev-dependencies from Scarb.toml")?
         .insert("assert_macros", value(version.to_string()));
 
@@ -377,19 +379,29 @@ pub fn new(
             cmd.arg("--no-vcs");
         }
 
-        cmd.env("SCARB_INIT_TEST_RUNNER", "cairo-test")
+        // TODO(#3910)
+        let test_runner = if scarb_version < SCARB_WITHOUT_CAIRO_TEST_TEMPLATE {
+            "cairo-test"
+        } else {
+            "none"
+        };
+
+        cmd.env("SCARB_INIT_TEST_RUNNER", test_runner)
             .run()
             .context("Failed to initialize a new project")?;
 
-        ScarbCommand::new_with_stdio()
-            .current_dir(&project_path)
-            .manifest_path(scarb_manifest_path.clone())
-            .offline()
-            .arg("remove")
-            .arg("--dev")
-            .arg("cairo_test")
-            .run()
-            .context("Failed to remove cairo_test dependency")?;
+        // TODO(#3910)
+        if scarb_version < SCARB_WITHOUT_CAIRO_TEST_TEMPLATE {
+            ScarbCommand::new_with_stdio()
+                .current_dir(&project_path)
+                .manifest_path(scarb_manifest_path.clone())
+                .offline()
+                .arg("remove")
+                .arg("--dev")
+                .arg("cairo_test")
+                .run()
+                .context("Failed to remove cairo_test dependency")?;
+        }
     }
 
     add_template_to_scarb_manifest(&scarb_manifest_path)?;

crates/forge/tests/e2e/new.rs

@@ -5,6 +5,7 @@ use forge::CAIRO_EDITION;
 use forge::Template;
 use forge::scarb::config::SCARB_MANIFEST_TEMPLATE_CONTENT;
 use indoc::{formatdoc, indoc};
+use itertools::Itertools;
 use regex::Regex;
 use scarb_api::ScarbCommand;
 use shared::test_utils::output_assert::assert_stdout_contains;
@@ -117,7 +118,7 @@ fn validate_init(project_path: &PathBuf, validate_snforge_std: bool, template: &
     let scarb_toml = fs::read_to_string(manifest_path.clone()).unwrap();
 
     let expected = get_expected_manifest_content(template, validate_snforge_std);
-    assert_matches(&expected, &scarb_toml);
+    assert_manifest_matches(&expected, &scarb_toml);
 
     let mut scarb_toml = DocumentMut::from_str(&scarb_toml).unwrap();
 
@@ -331,3 +332,20 @@ fn create_new_project_and_check_gitignore() {
 
     assert_eq!(gitignore_content, expected_gitignore_content);
 }
+
+/// Asserts that two manifest contents match, ignoring the order of lines.
+///
+/// # Why Line Order Can Vary
+///
+/// Starting from Scarb version 2.13, `scarb init` no longer inserts the `[dev-dependencies]` section.
+/// When tools like `forge new` generate a new project, they insert this section later
+/// in the manifest. As a result, the relative placement of `[dev-dependencies]` and other sections
+/// might differ depending on the version of Scarb used.
+fn assert_manifest_matches(expected: &str, actual: &str) {
+    // TODO(#3910)
+    fn sort_lines(s: &str) -> String {
+        s.lines().sorted().join("\n")
+    }
+
+    assert_matches(sort_lines(expected), sort_lines(actual));
+}