From 03f043781bc7d2e7a4b302084832427d04c3cdb1 Mon Sep 17 00:00:00 2001
From: Rich Bielby <richbielby@e.email>
Date: Tue, 12 Nov 2024 14:22:04 +0000
Subject: [PATCH] Adapted proxy settings check output to be more consistent
 with rest of checks output

---
 R/diagnostic_test.R                   |  2 ++
 tests/testthat/test-diagnostic_test.R | 21 +++++++++++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/R/diagnostic_test.R b/R/diagnostic_test.R
index abdfcd7..e27f090 100644
--- a/R/diagnostic_test.R
+++ b/R/diagnostic_test.R
@@ -69,6 +69,8 @@ check_proxy_settings <- function(
     }
   } else {
     message("PASS: No proxy settings found in your Git configuration.")
+    proxy_config <- as.list(rep("", length(proxy_setting_names))) |>
+      setNames(proxy_setting_names)
   }
   return(proxy_config)
 }
diff --git a/tests/testthat/test-diagnostic_test.R b/tests/testthat/test-diagnostic_test.R
index 5e21c50..2295d05 100644
--- a/tests/testthat/test-diagnostic_test.R
+++ b/tests/testthat/test-diagnostic_test.R
@@ -1,10 +1,11 @@
 test_that("Check proxy settings identifies and removes proxy setting", {
   # Set a dummy config parameter for the purposes of testing
   git2r::config(http.proxy.test = "this-is-a-test-entry", global = TRUE)
+  proxy_setting_names = c("http.proxy.test", "https.proxy.test")
   # Check that check_proxy_settings identifies the rogue entry
   expect_equal(
     check_proxy_settings(
-      proxy_setting_names = c("http.proxy.test", "https.proxy.test"),
+      proxy_setting_names = proxy_setting_names,
       clean = FALSE
     ) |>
       suppressMessages(),
@@ -13,7 +14,7 @@ test_that("Check proxy settings identifies and removes proxy setting", {
   # Run the check in clean mode
   expect_equal(
     check_proxy_settings(
-      proxy_setting_names = c("http.proxy.test", "https.proxy.test"),
+      proxy_setting_names = proxy_setting_names,
       clean = TRUE
     ) |>
       suppressMessages(),
@@ -22,10 +23,22 @@ test_that("Check proxy settings identifies and removes proxy setting", {
   # And now run again to see if clean mode worked in removing the rogue setting
   expect_equal(
     check_proxy_settings(
-      proxy_setting_names = c("http.proxy.test", "https.proxy.test")
+      proxy_setting_names = proxy_setting_names
     ) |>
       suppressMessages(),
-    purrr::keep(list(x = NULL), names(list(x = NULL)) != "x")
+    proxy_config <- as.list(rep("", length(proxy_setting_names))) |>
+      setNames(proxy_setting_names)
+  )
+})
+
+test_that("Test GITHUB_PAT diagnostic check", {
+  # Check that check_proxy_settings identifies the rogue entry
+  expect_equal(
+    check_github_pat(
+      clean = FALSE
+    ) |>
+      suppressMessages(),
+    list(GITHUB_PAT = "")
   )
 })