Restructure and fix stubgen integration tests (#88)

* Restructure and fix stubgen integration tests

* fix CI: install cargo component

* remove unused crates

* CI add missing binstall

Author: noise64

.github/workflows/ci.yaml

@@ -32,16 +32,19 @@ jobs:
       run: git fetch origin --deepen=1
     - name: Setup Rust
       run: rustup update stable --no-self-update && rustup default stable
-    - uses: Swatinem/rust-cache@v2
-      with:
-        shared-key: debug
-        cache-all-crates: true
-        save-if: true
     - uses: davidB/rust-cargo-make@v1
+    - uses: cargo-bins/cargo-binstall@main
+    - name: Install cargo-component
+      run: cargo binstall --no-confirm [email protected]
     - name: Install Protoc
       uses: arduino/setup-protoc@v3
       with:
         repo-token: ${{ secrets.GITHUB_TOKEN }}
+    - uses: Swatinem/rust-cache@v2
+      with:
+        shared-key: debug
+        cache-all-crates: true
+        save-if: true
     - name: Build all targets
       run: cargo make --profile ci build
     - name: Unit tests

Cargo.lock

@@ -6,12 +6,11 @@ members = [
     "golem-cli",
     "golem-cloud-cli",
     "wasm-rpc-stubgen",
-    "wasm-rpc-stubgen/tests-integration"
 ]
 
 [workspace.dependencies]
 # Golem wit - git deps
-golem-wit = { git = "https://github.com/golemcloud/golem-wit.git", tag="v1.1.11" }
+golem-wit = { git = "https://github.com/golemcloud/golem-wit.git", tag = "v1.1.11" }
 
 # Golem dep
 golem-client = "=1.1.20"
@@ -46,7 +45,6 @@ clap_complete = "4.5.45"
 cli-table = "0.4.9"
 colored = "3.0.0"
 derive_more = { version = "2.0.1", features = ["display", "into", "from_str"] }
-dir-diff = "0.3.3"
 dirs = "6.0.0"
 fs_extra = "1.3.0"
 futures = "0.3.31"

Cargo.toml

@@ -6,7 +6,9 @@
 # - `cargo make check`: runs rustfmt and clippy checks without applying any fix
 # - `cargo make fix`: runs rustfmt and clippy checks and applies fixes
 # - `cargo make test`: runs all tests
-# - `cargo make unit-tests`: runs unit test tests
+# - `cargo make unit-tests`: runs all unit tests
+# - `cargo make integrations-tests`: runs all integrations tests
+# - `cargo make stubgen-integrations-tests`: runs stubgen integrations tests only
 # - `cargo make publish`: publishes packages to crates.io
 
 [config]
@@ -124,7 +126,12 @@ exec --fail-on-error cargo test --workspace --lib --all-features -- --nocapture
 
 [tasks.integration-tests]
 description = "Run integration tests"
+dependencies = ["stubgen-integration-tests"]
+
+[tasks.stubgen-integration-tests]
+description = "Run stubgen integration tests"
 script_runner = "@duckscript"
 script = '''
-exec --fail-on-error cargo test --package golem-wasm-rpc-stubgen --tests -- --nocapture --report-time %{JUNIT_OPTS}
+exec --fail-on-error cargo test --package golem-wasm-rpc-stubgen :tag: --tests -- --nocapture --report-time %{JUNIT_OPTS}
+exec --fail-on-error cargo test --package golem-wasm-rpc-stubgen :tag:uses_cargo --tests -- --nocapture --test-threads=1 --report-time %{JUNIT_OPTS}
 '''

Makefile.toml

@@ -7,6 +7,8 @@ homepage = "https://golem.cloud"
 repository = "https://github.com/golemcloud/golem-cli"
 description = "Golem WASM RPC stub generator"
 
+autotests = false
+
 [lib]
 path = "src/lib.rs"
 harness = false
@@ -17,11 +19,8 @@ path = "src/main.rs"
 test = false
 
 [[test]]
-name = "wit"
-harness = false
-
-[[test]]
-name = "add_dep"
+name = "integration"
+path = "tests/lib.rs"
 harness = false
 
 [dependencies]
@@ -36,10 +35,8 @@ cargo-component-core = { workspace = true }
 cargo_toml = { workspace = true }
 clap = { workspace = true }
 colored = { workspace = true }
-dir-diff = { workspace = true }
 fs_extra = { workspace = true }
 heck = { workspace = true }
-id-arena = { workspace = true }
 indexmap = { workspace = true }
 indoc = { workspace = true }
 itertools = { workspace = true }
@@ -48,7 +45,6 @@ pretty_env_logger = { workspace = true }
 prettyplease = { workspace = true }
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
-regex = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }