Cleanup and rename test features and workflows, skip test failing on older scarb in scheduled tests (#3784)

<!-- Reference any GitHub issues resolved by this PR -->

Closes #

## Introduced changes

<!-- A brief description of the changes -->

-

## Checklist

<!-- Make sure all of these are complete -->

- [ ] Linked relevant issue
- [ ] Updated relevant documentation
- [ ] Added relevant tests
- [ ] Performed self-review of the code
- [ ] Added changes to `CHANGELOG.md`

Author: cptartur

.github/workflows/ci.yml

@@ -37,7 +37,7 @@ jobs:
         with:
           tool: [email protected]
       - name: Build and archive tests
-        run: cargo nextest archive --cargo-profile ci -p forge --features skip_plugin_checks --archive-file 'nextest-archive-${{ runner.os }}.tar.zst'
+        run: cargo nextest archive --cargo-profile ci -p forge --archive-file 'nextest-archive-${{ runner.os }}.tar.zst'
       - name: Upload archive to workflow
         uses: actions/upload-artifact@v4
         with:
@@ -126,9 +126,9 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
       - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
       - uses: software-mansion/setup-universal-sierra-compiler@v1
+      # No setup scarb action is used because we want to install multiple versions of scarb through asdf
       - uses: asdf-vm/actions/install@1902764435ca0dd2f3388eea723a4f92a4eb8302
-      - run: cargo test --profile ci --package forge e2e::plugin_versions
-      - run: cargo test --profile ci --package forge e2e::plugin_diagnostics
+      - run: cargo test --profile ci --package forge --features test_for_multiple_scarb_versions e2e::plugin_diagnostic
 
   test-requirements-check-special-conditions:
     name: Test requirements check special conditions
@@ -147,20 +147,6 @@ jobs:
 
       - run: cargo test --profile ci --package forge --features scarb_2_10_0 --test main e2e::requirements::test_warning_on_scarb_version_below_recommended
 
-  # TODO(#3212): Closures in Cairo are fully supported since version 2.11
-  test-interact-with-state:
-    name: Test interact with state
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6
-      - uses: software-mansion/setup-scarb@v1
-      - uses: software-mansion/setup-universal-sierra-compiler@v1
-
-      - run: cargo test --profile ci --package forge --features interact-with-state --test main integration::interact_with_state
-      - run: cargo test --profile ci --package forge --features interact-with-state --test main e2e::running::test_interact_with_state
-
   test-forge-runner:
     name: Test Forge Runner
     runs-on: ubuntu-latest
@@ -192,18 +178,6 @@ jobs:
       - name: Run Data Transformer tests
         run: cargo test --profile ci -p data-transformer
 
-  test-forge-debugging:
-    name: Test Forge Debugging
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v5
-      - uses: dtolnay/rust-toolchain@stable
-      - uses: Swatinem/rust-cache@9d47c6ad4b02e050fd481d890b2ea34778fd09d6 # v2.7.8
-      - uses: software-mansion/setup-scarb@v1
-      - uses: software-mansion/setup-universal-sierra-compiler@58146c4184fa6ec5e8aaf02309ab85e35f782ed0 # v1.0.0
-      - name: Run Forge Debugging tests
-        run: cargo test --profile ci -p forge --features debugging --test main e2e::debugging
-
   test-forge-scarb-plugin:
     name: Test Forge Scarb Plugin
     runs-on: ubuntu-latest

.github/workflows/scheduled.yml

@@ -49,7 +49,7 @@ jobs:
       - uses: software-mansion/setup-universal-sierra-compiler@v1
 
       - run: cargo test --profile ci --lib -p forge
-      - run: cargo test --profile ci -p forge integration --features assert_non_exact_gas
+      - run: cargo test --profile ci -p forge integration --features non_exact_gas_assertions,skip_test_for_scarb_since_2_11
 
   test-forge-e2e:
     if: github.event.repository.fork == false
@@ -91,7 +91,7 @@ jobs:
         run: |
           curl -L https://raw.githubusercontent.com/software-mansion/cairo-coverage/main/scripts/install.sh | sh
 
-      - run: cargo test --profile ci -p forge --features skip_plugin_checks e2e
+      - run: cargo test --profile ci -p forge --features skip_test_for_only_latest_scarb,skip_test_for_scarb_since_2_11 e2e
 
   test-cast:
     if: github.event.repository.fork == false

crates/forge/Cargo.toml

@@ -6,13 +6,12 @@ edition.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-smoke = []
 scarb_2_10_0 = []
 no_scarb_installed = []
-debugging = []
-assert_non_exact_gas = ["test_utils/assert_non_exact_gas"]
-skip_plugin_checks = []
-interact-with-state = []
+non_exact_gas_assertions = ["test_utils/non_exact_gas_assertions"]
+skip_test_for_only_latest_scarb = []
+skip_test_for_scarb_since_2_11 = []
+test_for_multiple_scarb_versions = []
 
 [dependencies]
 anyhow.workspace = true

crates/forge/test_utils/Cargo.toml

@@ -6,7 +6,7 @@ edition.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [features]
-assert_non_exact_gas = []
+non_exact_gas_assertions = []
 
 [dependencies]
 walkdir.workspace = true

crates/forge/test_utils/src/runner.rs

@@ -321,7 +321,7 @@ pub fn assert_gas(result: &[TestTargetSummary], test_case_name: &str, asserted_g
 // and to assert gas values with a margin in scheduled tests, as values can vary for different Scarb versions
 // FOR LOCAL DEVELOPMENT ALWAYS USE EXACT CALCULATIONS
 fn assert_gas_with_margin(gas: GasVector, asserted_gas: GasVector) -> bool {
-    if cfg!(feature = "assert_non_exact_gas") {
+    if cfg!(feature = "non_exact_gas_assertions") {
         let diff = gas_vector_abs_diff(&gas, &asserted_gas);
         diff.l1_gas.0 <= 10 && diff.l1_data_gas.0 <= 10 && diff.l2_gas.0 <= 200_000
     } else {

crates/forge/tests/e2e/fuzzing.rs

@@ -292,6 +292,10 @@ fn generate_arg_cheatcode() {
 }
 
 #[test]
+#[cfg_attr(
+    feature = "skip_test_for_only_latest_scarb",
+    ignore = "Plugin checks skipped"
+)]
 fn no_fuzzer_attribute() {
     let temp = setup_package("fuzzing");
     let test_file = temp.child("tests/no_attribute.cairo");

crates/forge/tests/e2e/mod.rs

@@ -10,7 +10,6 @@ mod completions;
 mod components;
 mod contract_artifacts;
 mod coverage;
-#[cfg(feature = "debugging")]
 mod debugging;
 mod docs_snippets_validation;
 mod env;

crates/forge/tests/e2e/new.rs

@@ -1,6 +1,3 @@
-#[cfg(feature = "smoke")]
-use super::common::runner::{get_current_branch, get_remote_url};
-
 use super::common::runner::{runner, snforge_test_bin_path, test_runner};
 use assert_fs::TempDir;
 use assert_fs::fixture::{FileTouch, PathChild};
@@ -305,65 +302,6 @@ fn get_expected_output(template: &Template) -> &str {
     }
 }
 
-#[test]
-#[cfg(feature = "smoke")]
-fn test_init_project_with_custom_snforge_dependency_git() {
-    let temp = tempdir_with_tool_versions().unwrap();
-
-    runner(&temp)
-        .args(["new", "test_name"])
-        .env("DEV_DISABLE_SNFORGE_STD_DEPENDENCY", "true")
-        .assert()
-        .success();
-
-    let project_path = temp.join("test_name");
-    let manifest_path = project_path.join("Scarb.toml");
-
-    let scarb_toml = std::fs::read_to_string(&manifest_path).unwrap();
-    let mut scarb_toml = DocumentMut::from_str(&scarb_toml).unwrap();
-
-    let dependencies = scarb_toml
-        .get_mut("dev-dependencies")
-        .unwrap()
-        .as_table_mut()
-        .unwrap();
-
-    let branch = get_current_branch();
-    let remote_url = format!("https://github.com/{}", get_remote_url());
-
-    let mut snforge_std = InlineTable::new();
-    snforge_std.insert("git", Value::String(Formatted::new(remote_url.clone())));
-    snforge_std.insert("branch", Value::String(Formatted::new(branch)));
-
-    dependencies.remove("snforge_std");
-    dependencies.insert("snforge_std", Item::Value(Value::InlineTable(snforge_std)));
-
-    std::fs::write(&manifest_path, scarb_toml.to_string()).unwrap();
-
-    let output = test_runner(&temp)
-        .current_dir(&project_path)
-        .assert()
-        .success();
-
-    let expected = formatdoc!(
-        r"
-        [..]Updating git repository {}
-        [..]Compiling test_name v0.1.0[..]
-        [..]Finished[..]
-
-        Collected 2 test(s) from test_name package
-        Running 0 test(s) from src/
-        Running 2 test(s) from tests/
-        [PASS] test_name_integrationtest::test_contract::test_increase_balance [..]
-        [PASS] test_name_integrationtest::test_contract::test_cannot_increase_balance_with_zero_value [..]
-        Tests: 2 passed, 0 failed, 0 ignored, 0 filtered out
-        ",
-        remote_url.trim_end_matches(".git")
-    );
-
-    assert_stdout_contains(output, expected);
-}
-
 #[test]
 fn create_new_project_and_check_gitignore() {
     let temp = tempdir_with_tool_versions().unwrap();

crates/forge/tests/e2e/plugin_diagnostics.rs

@@ -7,7 +7,10 @@ use snapbox::cmd::Command as SnapboxCommand;
 use std::fs;
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    feature = "skip_test_for_only_latest_scarb",
+    ignore = "Plugin checks skipped"
+)]
 #[allow(clippy::too_many_lines)]
 fn syntax() {
     let temp = setup_package_at_path(Utf8PathBuf::from("diagnostics/syntax"));
@@ -123,7 +126,10 @@ fn syntax() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    feature = "skip_test_for_only_latest_scarb",
+    ignore = "Plugin checks skipped"
+)]
 fn semantic() {
     let temp = setup_package_at_path(Utf8PathBuf::from("diagnostics/semantic"));
     let output = SnapboxCommand::from_std(
@@ -168,7 +174,10 @@ fn semantic() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    feature = "skip_test_for_only_latest_scarb",
+    ignore = "Plugin checks skipped"
+)]
 fn parameters() {
     let temp = setup_package_at_path(Utf8PathBuf::from("diagnostics/parameters"));
     let output = SnapboxCommand::from_std(
@@ -222,7 +231,10 @@ fn parameters() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    feature = "skip_test_for_only_latest_scarb",
+    ignore = "Plugin checks skipped"
+)]
 fn multiple() {
     let temp = setup_package_at_path(Utf8PathBuf::from("diagnostics/multiple"));
     let output = SnapboxCommand::from_std(
@@ -323,7 +335,10 @@ fn multiple() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    feature = "skip_test_for_only_latest_scarb",
+    ignore = "Plugin checks skipped"
+)]
 fn generic() {
     let temp = setup_package_at_path(Utf8PathBuf::from("diagnostics/generic"));
     let output = SnapboxCommand::from_std(
@@ -356,7 +371,10 @@ fn generic() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    feature = "skip_test_for_only_latest_scarb",
+    ignore = "Plugin checks skipped"
+)]
 fn inline_macros() {
     let temp = setup_package_at_path(Utf8PathBuf::from("diagnostics/inline_macros"));
     let output = SnapboxCommand::from_std(
@@ -389,7 +407,10 @@ fn inline_macros() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    feature = "skip_test_for_only_latest_scarb",
+    ignore = "Plugin checks skipped"
+)]
 fn different_attributes() {
     fn generate_attributes() -> impl Iterator<Item = String> {
         let attributes = vec![
@@ -438,7 +459,10 @@ fn different_attributes() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    feature = "skip_test_for_only_latest_scarb",
+    ignore = "Plugin checks skipped"
+)]
 fn test_case() {
     let temp = setup_package_at_path(Utf8PathBuf::from("diagnostics/test_case_attr"));
     let output = SnapboxCommand::from_std(

crates/forge/tests/e2e/plugin_versions.rs

@@ -8,7 +8,10 @@ use test_utils::tempdir_with_tool_versions;
 use toml_edit::ImDocument;
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    not(feature = "test_for_multiple_scarb_versions"),
+    ignore = "Multiple scarb versions must be installed"
+)]
 fn new_with_new_scarb() {
     let temp = tempdir_with_tool_versions().unwrap();
     runner(&temp)
@@ -39,7 +42,10 @@ fn new_with_new_scarb() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    not(feature = "test_for_multiple_scarb_versions"),
+    ignore = "Multiple scarb versions must be installed"
+)]
 fn new_with_old_scarb() {
     let temp = tempdir_with_tool_versions().unwrap();
     Command::new("asdf")
@@ -75,7 +81,10 @@ fn new_with_old_scarb() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    not(feature = "test_for_multiple_scarb_versions"),
+    ignore = "Multiple scarb versions must be installed"
+)]
 fn new_scarb_new_macros() {
     let temp = tempdir_with_tool_versions().unwrap();
     runner(&temp)
@@ -112,7 +121,10 @@ fn new_scarb_new_macros() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    not(feature = "test_for_multiple_scarb_versions"),
+    ignore = "Multiple scarb versions must be installed"
+)]
 fn new_scarb_deprecated_macros() {
     let temp = tempdir_with_tool_versions().unwrap();
     runner(&temp)
@@ -157,7 +169,10 @@ fn new_scarb_deprecated_macros() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    not(feature = "test_for_multiple_scarb_versions"),
+    ignore = "Multiple scarb versions must be installed"
+)]
 fn new_scarb_old_macros() {
     let temp = tempdir_with_tool_versions().unwrap();
     runner(&temp)
@@ -183,7 +198,10 @@ fn new_scarb_old_macros() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    not(feature = "test_for_multiple_scarb_versions"),
+    ignore = "Multiple scarb versions must be installed"
+)]
 fn old_scarb_new_macros() {
     let temp = tempdir_with_tool_versions().unwrap();
     Command::new("asdf")
@@ -217,7 +235,10 @@ fn old_scarb_new_macros() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    not(feature = "test_for_multiple_scarb_versions"),
+    ignore = "Multiple scarb versions must be installed"
+)]
 fn old_scarb_deprecated_macros() {
     let temp = tempdir_with_tool_versions().unwrap();
     Command::new("asdf")
@@ -264,7 +285,10 @@ fn old_scarb_deprecated_macros() {
 }
 
 #[test]
-#[cfg_attr(feature = "skip_plugin_checks", ignore = "Plugin checks skipped")]
+#[cfg_attr(
+    not(feature = "test_for_multiple_scarb_versions"),
+    ignore = "Multiple scarb versions must be installed"
+)]
 fn old_scarb_old_macros() {
     let temp = tempdir_with_tool_versions().unwrap();
     Command::new("asdf")