From b4707e5502a2dbe5c8966c9180ab35c6cac305a8 Mon Sep 17 00:00:00 2001
From: Fintan Halpenny <fintan.halpenny@gmail.com>
Date: Wed, 29 Apr 2026 11:55:56 +0100
Subject: [PATCH] cli: Amend jj tests

Update the output of `rad_jj_colocated_patch` so that it passes with the current version of `jj` being used:
```
jj --version
jj 0.35.0
```

Mark `rad_jj_bare` as `ignore` since it currently cannot determine the
RID from the `rad` remote.
---
 crates/radicle-cli/examples/jj-init-bare.md     | 7 ++-----
 crates/radicle-cli/examples/jj-init-colocate.md | 6 ++++--
 crates/radicle-cli/tests/commands/jj.rs         | 1 +
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/crates/radicle-cli/examples/jj-init-bare.md b/crates/radicle-cli/examples/jj-init-bare.md
index 6668f965..24a3f36e 100644
--- a/crates/radicle-cli/examples/jj-init-bare.md
+++ b/crates/radicle-cli/examples/jj-init-bare.md
@@ -2,11 +2,8 @@ We initialize Jujutusu for our repository for use with a bare Git repo.
 
 ```(stderr)
 $ jj git init --git-repo heartwood heartwood.jj
-Done importing changes from the underlying Git repo.
-Working copy  (@) now at: lvxkkpmk 9ec513df (empty) (no description set)
-Parent commit (@-)      : xpnzuzwn f2de534b master | Second commit
-Added 1 files, modified 0 files, removed 0 files
 Initialized repo in "heartwood.jj"
+Hint: Running `git clean -xdf` will remove `.jj/`!
 ```
 
 ```
@@ -16,4 +13,4 @@ $ cd heartwood.jj
 ```
 $ rad .
 rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
-```
\ No newline at end of file
+```
diff --git a/crates/radicle-cli/examples/jj-init-colocate.md b/crates/radicle-cli/examples/jj-init-colocate.md
index 8da7c473..f66273d5 100644
--- a/crates/radicle-cli/examples/jj-init-colocate.md
+++ b/crates/radicle-cli/examples/jj-init-colocate.md
@@ -5,6 +5,8 @@ $ jj git init --colocate
 Done importing changes from the underlying Git repo.
 Hint: The following remote bookmarks aren't associated with the existing local bookmarks:
   master@rad
-Hint: Run `jj bookmark track master@rad` to keep local bookmarks updated on future pulls.
+Hint: Run the following command to keep local bookmarks updated on future pulls:
+  jj bookmark track master[..]rad
 Initialized repo in "."
-```
\ No newline at end of file
+Hint: Running `git clean -xdf` will remove `.jj/`!
+```
diff --git a/crates/radicle-cli/tests/commands/jj.rs b/crates/radicle-cli/tests/commands/jj.rs
index c0c01d00..68a4f1e0 100644
--- a/crates/radicle-cli/tests/commands/jj.rs
+++ b/crates/radicle-cli/tests/commands/jj.rs
@@ -2,6 +2,7 @@ use crate::util::environment::Environment;
 use crate::{program_reports_version, test};
 use radicle::git;
 
+#[ignore = "the bare repository does not have a `rad` remote, and so it cannot determine the RID of the repository"]
 #[test]
 fn rad_jj_bare() {
     // We test whether `jj` is installed, and have this test succeed if it is not.