From 098f967174a06cb8d58b318258387c0027c824f5 Mon Sep 17 00:00:00 2001
From: Robert Garrett <robertgarrett404@gmail.com>
Date: Wed, 4 Jun 2025 11:30:55 -0500
Subject: [PATCH] Create a TestConfig struct to separate setup

I was about to copy-paste the entire body of the attach_file_exists test
function into the attach_file_missing function. The only difference is
the file that they upload -- or don't, in the second case. I could make
a try-file-upload function and pass it many different files, but I don't
think I need that. Instead, I'll separate the test setup from the test
sequence itself.
---
 src/api/release_attachment.rs | 83 +++++++++++++++++++++--------------
 1 file changed, 51 insertions(+), 32 deletions(-)

diff --git a/src/api/release_attachment.rs b/src/api/release_attachment.rs
index 43cc840..1cc5884 100644
--- a/src/api/release_attachment.rs
+++ b/src/api/release_attachment.rs
@@ -50,47 +50,23 @@ mod tests {
 
     #[tokio::test]
     async fn attach_file_exists() {
-        let server = std::env::var("TEST_GITEA_SERVER")
-            .expect("Must set server address in env var \"TEST_GITEA_SERVER\"");
-        let repo = std::env::var("TEST_GITEA_REPO")
-            .expect("Must set <user>/<repo> name in env var \"TEST_GITEA_REPO\"");
-        let token = format!(
-            "token {}",
-            std::env::var("TEST_GITEA_KEY")
-                .expect("Must set the API token in env var \"TEST_GITEA_KEY\"")
-        );
-        let release_tag = std::env::var("TEST_GITEA_RELEASE_TAG")
-            .expect("Must set the target release tag in env var \"TEST_GITEA_RELEASE_TAG\"");
-
-        let mut headers = reqwest::header::HeaderMap::new();
-        headers.append(ACCEPT, header::HeaderValue::from_static("application/json"));
-        headers.append("Authorization", token.parse().unwrap());
-
-        let client = reqwest::Client::builder()
-            .user_agent(format!(
-                "gt-tools-autotest-agent{}",
-                env!("CARGO_PKG_VERSION")
-            ))
-            .default_headers(headers)
-            .build()
-            .expect("Failed to build reqwest::Client.");
-
+        let conf = TestConfig::new();
         let release_candidates =
             crate::api::release::list_releases(
-                &client,
-                &server,
-                &repo
+                &conf.client,
+                &conf.server,
+                &conf.repo
             )
             .await
             .expect("Failed to get releases. Pre-conditions unmet, aborting test!");
 
-        let release = match_release_by_tag(&release_tag, release_candidates)
+        let release = match_release_by_tag(&conf.release_tag, release_candidates)
             .expect("Failed to select matching release. Pre-conditions unmet, aborting test!");
         
         let api_result = super::create_release_attachment(
-            &client,
-            &server,
-            &repo,
+            &conf.client,
+            &conf.server,
+            &conf.repo,
             release.id,
             vec![String::from("Cargo.toml")],
         )
@@ -102,6 +78,49 @@ mod tests {
         todo!();
     }
 
+    struct TestConfig {
+        server: String,
+        repo: String,
+        release_tag: String,
+        client: reqwest::Client,
+    }
+
+    impl TestConfig {
+        fn new() -> Self {
+            let server = std::env::var("TEST_GITEA_SERVER")
+                .expect("Must set server address in env var \"TEST_GITEA_SERVER\"");
+            let repo = std::env::var("TEST_GITEA_REPO")
+                .expect("Must set <user>/<repo> name in env var \"TEST_GITEA_REPO\"");
+            let token = format!(
+                "token {}",
+                std::env::var("TEST_GITEA_KEY")
+                    .expect("Must set the API token in env var \"TEST_GITEA_KEY\"")
+            );
+            let release_tag = std::env::var("TEST_GITEA_RELEASE_TAG")
+                .expect("Must set the target release tag in env var \"TEST_GITEA_RELEASE_TAG\"");
+
+            let mut headers = reqwest::header::HeaderMap::new();
+            headers.append(ACCEPT, header::HeaderValue::from_static("application/json"));
+            headers.append("Authorization", token.parse().unwrap());
+
+            let client = reqwest::Client::builder()
+                .user_agent(format!(
+                    "gt-tools-autotest-agent{}",
+                    env!("CARGO_PKG_VERSION")
+                ))
+                .default_headers(headers)
+                .build()
+                .expect("Failed to build reqwest::Client.");
+
+            return Self {
+                server,
+                repo,
+                release_tag,
+                client
+            };
+        }
+    }
+
     // Testing utils
     fn match_release_by_tag(tag: &String, releases: Vec<Release>) -> Option<Release> {
         let mut release: Option<Release> = None;