From 168d4e4022c6cd15561ba5d5afa226f1e944b219 Mon Sep 17 00:00:00 2001
From: Robert <49005401+Gitznik@users.noreply.github.com>
Date: Sat, 23 Mar 2024 04:31:33 -0700
Subject: [PATCH] simplify path env var resolving test (#1298)

---
 tests/test_environment.py | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/tests/test_environment.py b/tests/test_environment.py
index f1ff77d527..ae1a8d8662 100644
--- a/tests/test_environment.py
+++ b/tests/test_environment.py
@@ -1,13 +1,8 @@
 import fnmatch
-import os
 from pathlib import Path
 
 from helpers import run_pipx_cli, skip_if_windows
-
-
-def load_dir_from_environ(dir_name: str, default: Path) -> Path:
-    env = os.environ.get(dir_name, default)
-    return Path(os.path.expanduser(env)).resolve()
+from pipx.paths import get_expanded_environ
 
 
 def test_cli(pipx_temp_env, monkeypatch, capsys):
@@ -47,15 +42,11 @@ def test_cli_with_args(monkeypatch, capsys):
 def test_resolve_user_dir_in_env_paths(monkeypatch):
     monkeypatch.setenv("TEST_DIR", "~/test")
     home = Path.home()
-    env_dir = load_dir_from_environ("TEST_DIR", Path.home())
+    env_dir = get_expanded_environ("TEST_DIR")
     assert "~" not in str(env_dir)
     assert env_dir == home / "test"
-
-
-def test_resolve_user_dir_in_env_paths_env_not_set(monkeypatch):
-    home = Path.home()
-    env_dir = load_dir_from_environ("TEST_DIR", Path.home())
-    assert env_dir == home
+    env_dir = get_expanded_environ("THIS_SHOULD_NOT_EXIST")
+    assert env_dir is None
 
 
 @skip_if_windows