Add skip_on_cran to db tests (#167)

* Add skip_on_cran to db tests * Fix typo in NEWS.md * Replace skip_on_cran with custom skip_on_runiverse
openjusticeok · May 24, 2024 · 3d26395 · 3d26395
1 parent 08b9163
commit 3d26395
Show file tree

Hide file tree

Showing 11 changed files with 30 additions and 3 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -16,7 +16,7 @@
 ## Bug Fixes
 - Fixed bugs in `ojo_auth()` which prevented it from successfully backing up the `.Renviron` file.
 
-## Package Maintanance
+## Package Maintenance
 - Changed from Base R file paths to the `{fs}` package.
 - Adjusted GitHub Actions workflows to not run on draft PRs.
 - Added spellcheck GitHub Actions.

diff --git a/tests/testthat/helper-runiverse.R b/tests/testthat/helper-runiverse.R
@@ -0,0 +1,7 @@
+# Shoutout to https://github.com/mhpob/matos/
+skip_on_runiverse <- function() {
+  skip_if(
+    Sys.getenv("MY_UNIVERSE", "") != "",
+    "On R-universe."
+  )
+}
diff --git a/tests/testthat/test-ojo_civ_cases.R b/tests/testthat/test-ojo_civ_cases.R
@@ -1,4 +1,6 @@
 test_that("ojo_civ_cases works", {
+  skip_on_runiverse()
+
   testthat::expect_no_error({
     ojo_civ_cases()
   })

diff --git a/tests/testthat/test-ojo_collect.R b/tests/testthat/test-ojo_collect.R
@@ -1,4 +1,6 @@
 test_that("ojo_collect works in interactive mode", {
+  skip_on_runiverse()
+
   expect_no_error({
     ojo_tbl("case") |>
       head(1) |>

diff --git a/tests/testthat/test-ojo_connect.R b/tests/testthat/test-ojo_connect.R
@@ -1,4 +1,6 @@
 test_that("ojo_connect creates a new connection", {
+  skip_on_runiverse()
+
   con <- ojo_connect()
   expect_true(DBI::dbIsValid(con), "Connection should be valid")
 
@@ -7,7 +9,7 @@ test_that("ojo_connect creates a new connection", {
 })
 
 test_that("ojo_connect reuses existing connection", {
-  skip_on_cran()
+  skip_on_runiverse()
 
   con1 <- ojo_connect()
   con2 <- ojo_connect()
@@ -20,7 +22,7 @@ test_that("ojo_connect reuses existing connection", {
 })
 
 test_that("ojo_connect handles connection pooling correctly", {
-  skip_on_cran()
+  skip_on_runiverse()
 
   pool_con <- ojo_connect(.pool = TRUE)
   expect_true(DBI::dbIsValid(pool_con), "Pooled connection should be valid")

diff --git a/tests/testthat/test-ojo_crim_cases.R b/tests/testthat/test-ojo_crim_cases.R
@@ -1,4 +1,6 @@
 test_that("ojo_crim_cases works", {
+  skip_on_runiverse()
+
   testthat::expect_no_error({
     ojo_crim_cases()
   })

diff --git a/tests/testthat/test-ojo_list_schemas.R b/tests/testthat/test-ojo_list_schemas.R
@@ -1,4 +1,6 @@
 test_that("ojo_list_schemas hasn't changed", {
+  skip_on_runiverse()
+
   expect_snapshot_value(
     ojo_list_schemas(),
     style = "deparse"

diff --git a/tests/testthat/test-ojo_list_tables.R b/tests/testthat/test-ojo_list_tables.R
@@ -1,4 +1,6 @@
 test_that("ojo_list_tables hasn't changed", {
+  skip_on_runiverse()
+
   expect_snapshot_value(
     ojo_list_tables("public"),
     style = "deparse"

diff --git a/tests/testthat/test-ojo_list_vars.R b/tests/testthat/test-ojo_list_vars.R
@@ -1,4 +1,6 @@
 test_that("ojo_list_vars hasn't changed", {
+  skip_on_runiverse()
+
   expect_snapshot_value(
     ojo_list_vars("case"),
     style = "deparse"

diff --git a/tests/testthat/test-ojo_query.R b/tests/testthat/test-ojo_query.R
@@ -1,4 +1,6 @@
 test_that("ojo_query executes SQL and returns a tibble", {
+  skip_on_runiverse()
+
   # A simple, safe query that assumes the existence of a 'case' table
   query <- 'SELECT * FROM "case" LIMIT 10'
 
@@ -15,6 +17,8 @@ test_that("ojo_query executes SQL and returns a tibble", {
 
 # Test error handling for malformed queries
 test_that("ojo_query handles SQL errors", {
+  skip_on_runiverse()
+
   # Intentionally malformed SQL query
   bad_query <- "SELEC * FROM nonexistent_table"
 

diff --git a/tests/testthat/test-ojo_tbl.R b/tests/testthat/test-ojo_tbl.R
@@ -20,6 +20,8 @@ test_that("ojo_tbl handles non-existent tables correctly", {
 })
 
 test_that("ojo_tbl's can join", {
+  skip_on_runiverse()
+
   tbl <- ojo_tbl("case")
   tbl2 <- ojo_tbl("minute")