From 7d2842a458dd60d12b34831cf4d633949df78f7d Mon Sep 17 00:00:00 2001
From: Adrian Duke <adrian.duke@gmail.com>
Date: Tue, 3 Mar 2026 15:42:45 +0000
Subject: [PATCH] cli/tests: Refactor remote command tests

---
 crates/radicle-cli/tests/commands.rs        | 51 +-----------------
 crates/radicle-cli/tests/commands/remote.rs | 57 +++++++++++++++++++++
 2 files changed, 58 insertions(+), 50 deletions(-)
 create mode 100644 crates/radicle-cli/tests/commands/remote.rs

diff --git a/crates/radicle-cli/tests/commands.rs b/crates/radicle-cli/tests/commands.rs
index a1b43c10..c70aa0eb 100644
--- a/crates/radicle-cli/tests/commands.rs
+++ b/crates/radicle-cli/tests/commands.rs
@@ -34,6 +34,7 @@ mod commands {
     mod node;
     mod patch;
     mod policy;
+    mod remote;
 }
 
 /// Run a CLI test file.
@@ -440,56 +441,6 @@ fn test_replication_via_seed() {
         .unwrap();
 }
 
-#[test]
-fn rad_remote() {
-    let mut environment = Environment::new();
-    let alice = environment.relay("alice");
-    let bob = environment.relay("bob");
-    let eve = environment.relay("eve");
-    let home = alice.home.clone();
-    let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
-    // Setup a test repository.
-    environment.repository(&alice);
-
-    test(
-        "examples/rad-init.md",
-        environment.work(&alice),
-        Some(&home),
-        [],
-    )
-    .unwrap();
-
-    let mut alice = alice.spawn();
-    let mut bob = bob.spawn();
-    let mut eve = eve.spawn();
-    alice
-        .handle
-        .follow(bob.id, Some(Alias::new("bob")))
-        .unwrap();
-    alice
-        .handle
-        .follow(eve.id, Some(Alias::new("eve")))
-        .unwrap();
-
-    bob.connect(&alice);
-    bob.routes_to(&[(rid, alice.id)]);
-    bob.fork(rid, bob.home.path()).unwrap();
-    alice.has_remote_of(&rid, &bob.id);
-
-    eve.connect(&alice);
-    eve.routes_to(&[(rid, alice.id)]);
-    eve.fork(rid, eve.home.path()).unwrap();
-    alice.has_remote_of(&rid, &eve.id);
-
-    test(
-        "examples/rad-remote.md",
-        environment.work(&alice),
-        Some(&home),
-        [],
-    )
-    .unwrap();
-}
-
 #[test]
 fn framework_home() {
     let mut environment = Environment::new();
diff --git a/crates/radicle-cli/tests/commands/remote.rs b/crates/radicle-cli/tests/commands/remote.rs
new file mode 100644
index 00000000..de68e0c6
--- /dev/null
+++ b/crates/radicle-cli/tests/commands/remote.rs
@@ -0,0 +1,57 @@
+use std::str::FromStr as _;
+
+use radicle::node::{Alias, Handle as _};
+use radicle::prelude::RepoId;
+
+use crate::test;
+use crate::util::environment::Environment;
+
+#[test]
+fn rad_remote() {
+    let mut environment = Environment::new();
+    let alice = environment.relay("alice");
+    let bob = environment.relay("bob");
+    let eve = environment.relay("eve");
+    let home = alice.home.clone();
+    let rid = RepoId::from_str("z42hL2jL4XNk6K8oHQaSWfMgCL7ji").unwrap();
+    // Setup a test repository.
+    environment.repository(&alice);
+
+    test(
+        "examples/rad-init.md",
+        environment.work(&alice),
+        Some(&home),
+        [],
+    )
+    .unwrap();
+
+    let mut alice = alice.spawn();
+    let mut bob = bob.spawn();
+    let mut eve = eve.spawn();
+    alice
+        .handle
+        .follow(bob.id, Some(Alias::new("bob")))
+        .unwrap();
+    alice
+        .handle
+        .follow(eve.id, Some(Alias::new("eve")))
+        .unwrap();
+
+    bob.connect(&alice);
+    bob.routes_to(&[(rid, alice.id)]);
+    bob.fork(rid, bob.home.path()).unwrap();
+    alice.has_remote_of(&rid, &bob.id);
+
+    eve.connect(&alice);
+    eve.routes_to(&[(rid, alice.id)]);
+    eve.fork(rid, eve.home.path()).unwrap();
+    alice.has_remote_of(&rid, &eve.id);
+
+    test(
+        "examples/rad-remote.md",
+        environment.work(&alice),
+        Some(&home),
+        [],
+    )
+    .unwrap();
+}