Modularize step defs

Cargo.toml

@@ -45,5 +45,5 @@ native = ["algonaut_client/native"]
 rustls = ["algonaut_client/rustls"]
 
 [[test]]
-name = "cucumber"
+name = "features_runner"
 harness = false # Allows Cucumber to print output instead of libtest

Makefile

@@ -1,5 +1,5 @@
 integration:
-	cargo test --test cucumber --
+	cargo test --test features_runner --
 
 docker-test:
 	./tests/docker/run_docker.sh

tests/features_runner.rs

@@ -0,0 +1,14 @@
+use cucumber::WorldInit;
+use step_defs::integration;
+
+mod step_defs;
+
+#[tokio::main]
+async fn main() {
+    integration::algod::World::run(integration_path("algod")).await;
+    integration::abi::World::run(integration_path("abi")).await;
+}
+
+fn integration_path(feature_name: &str) -> String {
+    format!("tests/features/integration/{}.feature", feature_name)
+}

tests/step_defs/integration/abi.rs

@@ -0,0 +1,29 @@
+use algonaut::algod::v2::Algod;
+use algonaut::algod::AlgodBuilder;
+use async_trait::async_trait;
+use cucumber::{given, WorldInit};
+use std::convert::Infallible;
+
+#[derive(Default, Debug, WorldInit)]
+pub struct World {
+    algod: Option<Algod>,
+}
+
+#[async_trait(?Send)]
+impl cucumber::World for World {
+    type Error = Infallible;
+
+    async fn new() -> Result<Self, Self::Error> {
+        Ok(Self::default())
+    }
+}
+
+#[given(expr = "an algod v2 client")]
+async fn an_algod_v2_client(w: &mut World) {
+    let algod = AlgodBuilder::new()
+        .bind("http://localhost:60000")
+        .auth("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")
+        .build_v2()
+        .unwrap();
+    w.algod = Some(algod)
+}

tests/cucumber.rs → tests/step_defs/integration/algod.rs

@@ -60,8 +60,3 @@ async fn i_can_get_the_block_info(w: &mut World) {
     let last_round = w.last_round.unwrap();
     algod_client.block(Round(last_round)).await.unwrap();
 }
-
-#[tokio::main]
-async fn main() {
-    World::run("tests/features/integration").await;
-}

tests/step_defs/integration/mod.rs

@@ -0,0 +1,2 @@
+pub mod abi;
+pub mod algod;

tests/step_defs/mod.rs

@@ -0,0 +1 @@
+pub mod integration;