Merge pull request #218 from r-lib/fix/tests

Author: gaborcsardi

R/gh.R

@@ -289,6 +289,9 @@ gh_make_request <- function(x, error_call = caller_env()) {
 
   # Reduce connection timeout from curl's 10s default to 5s
   req <- httr2::req_options(req, connecttimeout_ms = 5000)
+  if (Sys.getenv("GH_FORCE_HTTP_1_1") == "true") {
+    req <- httr2::req_options(req, http_version = 2)
+  }
 
   if (!isFALSE(getOption("gh_cache"))) {
     req <- httr2::req_cache(

tests/testthat/setup.R

@@ -0,0 +1,4 @@
+withr::local_options(
+  gh_cache = FALSE,
+  .local_envir = testthat::teardown_env()
+)

tests/testthat/test-gh_whoami.R

@@ -9,6 +9,7 @@ test_that("whoami works in presence of PAT", {
 test_that("whoami errors with bad/absent PAT", {
   skip_if_no_github()
   skip_on_ci() # since no token sometimes fails due to rate-limiting
+  withr::local_envvar(GH_FORCE_HTTP_1_1 = "true")
 
   expect_snapshot(error = TRUE, {
     gh_whoami(.token = "")

tests/testthat/test-mock-repos.R

@@ -14,9 +14,10 @@ test_that("repos, some basics", {
   res <- gh(
     TMPL("/orgs/{org}/repos"),
     org = "r-lib",
-    type = "sources"
+    type = "sources",
+    sort = "full_name"
   )
-  expect_true("desc" %in% vapply(res, "[[", "name", FUN.VALUE = ""))
+  expect_true("actions" %in% vapply(res, "[[", "name", FUN.VALUE = ""))
 
   res <- gh("/repositories")
   expect_true(all(c("id", "name", "full_name") %in% names(res[[1]])))