Use /home/me in game tests

Amanse · Feb 19, 2024 · 45e3e23 · 45e3e23
1 parent d943cbc
commit 45e3e23
Showing 1 changed file with 14 additions and 12 deletions.
diff --git a/src/config/game.rs b/src/config/game.rs
@@ -39,12 +39,10 @@ impl Game {
         let mut cmd = Command::new("sh");
 
         if !self.is_native {
-            let ulwgl_path = format!("{}/.local/share/ULWGL", std::env::var("HOME")?);
-
             #[cfg(feature = "nixos")]
             cmd.arg("steam-run");
 
-            cmd.arg(format!("{}/ulwgl-run", ulwgl_path.clone()));
+            cmd.arg(format!("{}/ulwgl-run", get_ulwgl_path()));
         }
 
         cmd.arg(self.exect_path.clone());
@@ -78,12 +76,23 @@ impl Game {
     }
 }
 
+fn get_ulwgl_path() -> String {
+    format!("{}/.local/share/ULWGL", std::env::var("HOME").unwrap())
+}
+
 #[cfg(test)]
 mod tests {
     use std::ffi::OsStr;
 
     use super::Game;
 
+    fn get_ulwgl_exec_path() -> String {
+        format!(
+            "{}/.local/share/ULWGL/ulwgl-run",
+            std::env::var("HOME").unwrap()
+        )
+    }
+
     fn get_game() -> Game {
         Game {
             id: 0,
@@ -130,17 +139,10 @@ mod tests {
         #[cfg(feature = "nixos")]
         assert_eq!(
             args,
-            &[
-                "steam-run",
-                "/home/me/.local/share/ULWGL/ulwgl-run",
-                "/home/me/exec"
-            ]
+            &["steam-run", &get_ulwgl_exec_path(), "/home/me/exec"]
         );
 
         #[cfg(not(feature = "nixos"))]
-        assert_eq!(
-            args,
-            &["/home/me/.local/share/ULWGL/ulwgl-run", "/home/me/exec"]
-        );
+        assert_eq!(args, &[&get_ulwgl_exec_path(), "/home/me/exec"]);
     }
 }