mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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.
This commit is contained in:
Fintan Halpenny 2026-04-29 11:55:56 +01:00 committed by Lorenz Leutgeb
parent 378365aa42
commit b4707e5502
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
crates/radicle-cli/examples/jj-init-bare.md
View File

@ -2,11 +2,8 @@ We initialize Jujutusu for our repository for use with a bare Git repo.
```(stderr) ```(stderr)
$ jj git init --git-repo heartwood heartwood.jj $ 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" Initialized repo in "heartwood.jj"
Hint: Running `git clean -xdf` will remove `.jj/`!
``` ```
``` ```
@ -16,4 +13,4 @@ $ cd heartwood.jj
``` ```
$ rad . $ rad .
rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji rad:z42hL2jL4XNk6K8oHQaSWfMgCL7ji
``` ```

6
crates/radicle-cli/examples/jj-init-colocate.md
View File

@ -5,6 +5,8 @@ $ jj git init --colocate
Done importing changes from the underlying Git repo. Done importing changes from the underlying Git repo.
Hint: The following remote bookmarks aren't associated with the existing local bookmarks: Hint: The following remote bookmarks aren't associated with the existing local bookmarks:
master@rad 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 "." Initialized repo in "."
``` Hint: Running `git clean -xdf` will remove `.jj/`!
```

1
crates/radicle-cli/tests/commands/jj.rs
View File

@ -2,6 +2,7 @@ use crate::util::environment::Environment;
use crate::{program_reports_version, test}; use crate::{program_reports_version, test};
use radicle::git; use radicle::git;
#[ignore = "the bare repository does not have a `rad` remote, and so it cannot determine the RID of the repository"]
#[test] #[test]
fn rad_jj_bare() { fn rad_jj_bare() {
// We test whether `jj` is installed, and have this test succeed if it is not. // We test whether `jj` is installed, and have this test succeed if it is not.