From 790e1af298aa7c9f39fb7cfe15615307ed87d597 Mon Sep 17 00:00:00 2001
From: Joel Klinghed <the_jk@spawned.biz>
Date: Sun, 26 Jan 2025 22:21:29 +0100
Subject: Fix tests after adding git repos

Use testdir to create directories to put test git in.
Use custom test method to find githook binary.
Stop using remote so that git repo doesn't try to fetch.
---
 server/src/tests.rs | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

(limited to 'server/src/tests.rs')

diff --git a/server/src/tests.rs b/server/src/tests.rs
index b96a5b3..f1489d8 100644
--- a/server/src/tests.rs
+++ b/server/src/tests.rs
@@ -7,6 +7,7 @@ use sqlx::{Acquire, Executor, Pool};
 use std::fmt::Display;
 use std::sync::OnceLock;
 use stdext::function_name;
+use testdir::testdir;
 
 use crate::api_model;
 
@@ -114,7 +115,11 @@ async fn async_client_with_private_database(test_name: String) -> Client {
         "url" => db_url.into(),
     };
 
-    let figment = base_figment.merge(("databases", map!["eyeballs" => db_config]));
+    let git_root = testdir!();
+
+    let figment = base_figment
+        .merge(("databases", map!["eyeballs" => db_config]))
+        .merge(("git_server_root", git_root));
 
     Client::tracked(crate::rocket_from_config(figment))
         .await
@@ -185,7 +190,7 @@ async fn new_project(client: &Client) -> api_model::Project {
             .json(&api_model::ProjectData {
                 title: Some("foo"),
                 description: Some("bar"),
-                remote: Some("fum"),
+                remote: None,
                 main_branch: Some("zod"),
             }),
     )
@@ -296,7 +301,7 @@ async fn test_project_new() {
     assert_eq!(project.id, "test");
     assert_eq!(project.title, "foo");
     assert_eq!(project.description, "bar");
-    assert_eq!(project.remote, "fum");
+    assert_eq!(project.remote, "");
     assert_eq!(project.main_branch, "zod");
     assert_eq!(project.users.len(), 1);
     let user = project.users.get(0).unwrap();
@@ -329,7 +334,7 @@ async fn test_project_new_duplicate() {
         .json(&api_model::ProjectData {
             title: Some("foo"),
             description: Some("bar"),
-            remote: Some("fum"),
+            remote: None,
             main_branch: Some("zod"),
         })
         .header(&FAKE_IP)
@@ -351,8 +356,8 @@ async fn test_project_update() {
         &api_model::ProjectData {
             title: Some("foo"),
             description: None,
-            remote: Some("fum"),
-            main_branch: None,
+            remote: None,
+            main_branch: Some("fum"),
         },
     ))
     .await;
@@ -390,7 +395,7 @@ async fn test_project_update_unknown() {
         .json(&api_model::ProjectData {
             title: Some("foo"),
             description: Some("bar"),
-            remote: Some("fum"),
+            remote: None,
             main_branch: Some("zod"),
         })
         .header(&FAKE_IP)
-- 
cgit v1.2.3-70-g09d2