Fix assert macros (#1563)

software-mansion · Aug 29, 2024 · 2b945d5 · 2b945d5
1 parent ba72e5d
commit 2b945d5
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 7 deletions.
diff --git a/scarb/src/compiler/plugin/builtin.rs b/scarb/src/compiler/plugin/builtin.rs
@@ -112,7 +112,7 @@ impl CairoPlugin for BuiltinTestAssertsPlugin {
     fn id(&self) -> PackageId {
         PackageId::new(
             PackageName::TEST_ASSERTS_PLUGIN,
-            semver::Version::new(0, 1, 0),
+            crate::version::get().cairo.version.to_version().unwrap(),
             SourceId::for_std(),
         )
     }

diff --git a/scarb/src/ops/resolve.rs b/scarb/src/ops/resolve.rs
@@ -102,7 +102,7 @@ pub fn resolve_workspace_with_opts(
                     ManifestDependency::builder()
                         .kind(DepKind::Target(TargetKind::TEST))
                         .name(PackageName::TEST_ASSERTS_PLUGIN)
-                        .version_req(DependencyVersionReq::exact(&semver::Version::new(0, 1, 0)))
+                        .version_req(version_req.clone())
                         .source_id(SourceId::for_std())
                         .build(),
                 ],

diff --git a/scarb/tests/test_subcommand.rs b/scarb/tests/test_subcommand.rs
@@ -73,3 +73,23 @@ fn errors_when_missing_script_and_cairo_test() {
         error: no such command: `cairo-test`
         "#});
 }
+
+#[test]
+fn assert_macros_available() {
+    let t = TempDir::new().unwrap();
+    ProjectBuilder::start()
+        .dev_dep_builtin("assert_macros")
+        .dep_cairo_test()
+        .lib_cairo(indoc! {r#"
+            #[test]
+            fn some() {
+                assert_eq!(1, 1);
+            }
+        "#})
+        .build(&t);
+    Scarb::quick_snapbox()
+        .args(["build", "--test"])
+        .current_dir(&t)
+        .assert()
+        .success();
+}
diff --git a/utils/scarb-test-support/src/project_builder.rs b/utils/scarb-test-support/src/project_builder.rs
@@ -93,16 +93,24 @@ impl ProjectBuilder {
         self
     }
 
-    pub fn dep_starknet(self) -> Self {
-        self.dep("starknet", Dep.version(CAIRO_VERSION))
+    pub fn dep_builtin(self, name: impl ToString) -> Self {
+        self.dep(name, Dep.version(CAIRO_VERSION))
     }
 
-    pub fn dep_cairo_test(self) -> Self {
-        self.dev_dep("cairo_test", Dep.version(CAIRO_VERSION))
+    pub fn dev_dep_builtin(self, name: impl ToString) -> Self {
+        self.dev_dep(name, Dep.version(CAIRO_VERSION))
     }
 
     pub fn dep_cairo_run(self) -> Self {
-        self.dep("cairo_run", Dep.version(CAIRO_VERSION))
+        self.dep_builtin("cairo_run")
+    }
+
+    pub fn dep_starknet(self) -> Self {
+        self.dep_builtin("starknet")
+    }
+
+    pub fn dep_cairo_test(self) -> Self {
+        self.dev_dep_builtin("cairo_test")
     }
 
     pub fn manifest_package_extra(mut self, extra: impl ToString) -> Self {