Radish alpha
h
rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5
Radicle Heartwood Protocol & Stack
Radicle
Git
cli: Amend jj tests
Merged fintohaps opened 1 day ago

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.

3 files changed +7 -7 378365aa b4707e55
modified 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
+
```
modified 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/`!
+
```
modified 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.