Fix radicle-httpd tests for radicle 1.1.0

radicle-dev · Dec 2, 2024 · 07ee16c · 07ee16c
1 parent 497ce2c
commit 07ee16c
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/config/default.json b/config/default.json
@@ -1,7 +1,7 @@
 {
   "nodes": {
     "fallbackPublicExplorer": "https://app.radicle.xyz/nodes/$host/$rid$path",
-    "apiVersion": "6.0.0",
+    "apiVersion": "6.2.0",
     "defaultHttpdPort": 443,
     "defaultHttpdScheme": "https"
   },

diff --git a/radicle-httpd/build/Dockerfile b/radicle-httpd/build/Dockerfile
@@ -35,7 +35,7 @@ RUN curl -sSf -o zig.tar.xz         https://ziglang.org/download/0.12.0/zig-linu
     xz -d -c zig.tar.xz | tar -x && \
     mv zig-linux-x86_64-0.12.0/zig /usr/bin/zig && \
     mv zig-linux-x86_64-0.12.0/lib /usr/lib/zig && \
-    cargo install [email protected]
+    cargo install [email protected] --locked
 
 
 # Parts of the macOS SDK are required to build Radicle, we make these available

diff --git a/radicle-httpd/src/api.rs b/radicle-httpd/src/api.rs
@@ -65,18 +65,17 @@ impl Context {
 
         let payloads: BTreeMap<PayloadId, Value> = doc
             .payload()
-            .clone()
-            .into_iter()
+            .iter()
             .filter_map(|(id, payload)| {
-                if id == PayloadId::project() {
+                if id == &PayloadId::project() {
                     let (_, head) = repo.head().ok()?;
                     let patches = self.profile.patches(repo).ok()?;
                     let patches = patches.counts().ok()?;
                     let issues = self.profile.issues(repo).ok()?;
                     let issues = issues.counts().ok()?;
 
                     Some((
-                        id,
+                        id.clone(),
                         json!({
                             "data": payload,
                             "meta": {
@@ -87,7 +86,7 @@ impl Context {
                         }),
                     ))
                 } else {
-                    Some((id, json!({ "data": payload })))
+                    Some((id.clone(), json!({ "data": payload })))
                 }
             })
             .collect();

diff --git a/tests/e2e/node.spec.ts b/tests/e2e/node.spec.ts
@@ -22,7 +22,7 @@ test("node metadata", async ({ page, peerManager }) => {
   await page.goto(peer.uiUrl());
 
   await expect(page.getByText(shortNodeRemote).first()).toBeVisible();
-  await expect(page.getByText("/radicle:1.0.0/")).toBeVisible();
+  await expect(page.getByText("/radicle:1.1.0-pre.4/")).toBeVisible();
 });
 
 test("node repos", async ({ page }) => {

diff --git a/tests/support/heartwood-release b/tests/support/heartwood-release
@@ -1 +1 @@
-1.0.0
+1.1.0-pre.4
diff --git a/tests/support/radicle-httpd-release b/tests/support/radicle-httpd-release
@@ -1 +1 @@
-0.17.0
+0.18.0-pre