From 1ffed41cf93d13c3b7dfc7e3b5fa72f30794e31d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sun, 9 Apr 2023 11:20:15 +0200
Subject: [PATCH] fix backend tests

---
 backend/Cargo.lock                            |  1 +
 backend/Cargo.toml                            |  2 ++
 backend/tests/worker.rs                       | 27 ++++++++++++++++---
 .../scripts/get/[...hash]/+page.svelte        |  2 +-
 4 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 922d069483..7184f082fe 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -4873,6 +4873,7 @@ dependencies = [
  "rand 0.8.5",
  "reqwest",
  "rsa",
+ "serde",
  "serde_json",
  "sha2 0.10.6",
  "sqlx",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 945f2e6717..47f1c7970f 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -49,11 +49,13 @@ rsa.workspace = true
 base64.workspace = true
 sha2.workspace = true
 
+
 [dev-dependencies]
 serde_json.workspace = true
 reqwest.workspace = true
 windmill-queue.workspace = true
 axum.workspace = true
+serde.workspace = true
 
 [workspace.dependencies]
 windmill-api = { path = "./windmill-api" }
diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs
index 6e5cc0e012..bb0ec0e304 100644
--- a/backend/tests/worker.rs
+++ b/backend/tests/worker.rs
@@ -1,4 +1,5 @@
 use futures::{stream, Stream};
+use serde::Deserialize;
 use serde_json::json;
 use sqlx::{postgres::PgListener, types::Uuid, Pool, Postgres, Transaction};
 use windmill_api::jobs::{CompletedJob, Job};
@@ -1518,6 +1519,8 @@ async fn test_go_job(db: Pool<Postgres>) {
     let port = server.addr.port();
 
     let content = r#"
+package inner
+
 import "fmt"
 
 func main(derp string) (string, error) {
@@ -2024,6 +2027,16 @@ async fn test_branchall_simple(db: Pool<Postgres>) {
     assert_eq!(result, serde_json::json!([[1, 2], [1, 3]]));
 }
 
+#[derive(Deserialize)]
+struct ErrorResult {
+    error: NamedError,
+}
+
+#[derive(Deserialize)]
+struct NamedError {
+    name: String,
+}
+
 #[sqlx::test(fixtures("base"))]
 async fn test_branchall_skip_failure(db: Pool<Postgres>) {
     initialize_tracing().await;
@@ -2059,8 +2072,11 @@ async fn test_branchall_skip_failure(db: Pool<Postgres>) {
         .unwrap();
 
     assert_eq!(
-        result,
-        serde_json::json!([{"error": {"name": "Error", "stack": "Error: failure\n    at main (file:///tmp/main.ts:1:31)\n    at run (file:///tmp/wrapper.ts:9:26)\n    at file:///tmp/wrapper.ts:14:1", "message": "failure"}}, [1,3]])
+        serde_json::from_value::<ErrorResult>(result)
+            .unwrap()
+            .error
+            .name,
+        "Error"
     );
 
     let flow: FlowValue = serde_json::from_value(json!({
@@ -2093,8 +2109,11 @@ async fn test_branchall_skip_failure(db: Pool<Postgres>) {
         .unwrap();
 
     assert_eq!(
-        result,
-        serde_json::json!([ {"error": {"name": "Error", "stack": "Error: failure\n    at main (file:///tmp/main.ts:1:31)\n    at run (file:///tmp/wrapper.ts:9:26)\n    at file:///tmp/wrapper.ts:14:1", "message": "failure"}}, [1, 2]])
+        serde_json::from_value::<ErrorResult>(result)
+            .unwrap()
+            .error
+            .name,
+        "Error"
     );
 }
 
diff --git a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
index 426b172a84..802ea5fc07 100644
--- a/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/scripts/get/[...hash]/+page.svelte
@@ -331,7 +331,7 @@
 						startIcon={{ icon: faArrowLeft }}
 						href="/scripts/get/{script.parent_hashes[0]}?workspace_id={$workspaceStore}"
 						dropdownItems={script.parent_hashes.map((hash) => ({
-							href: `/scripts/get/${hash}?workspace_id={$workspaceStore}`,
+							href: `/scripts/get/${hash}?workspace_id=${$workspaceStore}`,
 							label: hash
 						}))}
 					>