Extract FreeType version check

Makes testing easier

Author: lionel-

R/testthat-ui.R

@@ -28,18 +28,22 @@
 #'   standard families and Symbola font for symbols.
 #' @export
 #' @examples
-#' disp_hist_base <- function() hist(mtcars$disp)
-#' expect_doppelganger("disp-histogram-base", disp_hist_base)
+#' ver <- gdtools::version_freetype()
 #'
-#' if (requireNamespace("ggplot2", quietly = TRUE)) {
+#' if (ver >= "2.6.0") {
+#'   disp_hist_base <- function() hist(mtcars$disp)
+#'   expect_doppelganger("disp-histogram-base", disp_hist_base)
+#' }
+#'
+#' if (ver >= "2.6.0" && requireNamespace("ggplot2", quietly = TRUE)) {
 #'   library("ggplot2")
 #'   disp_hist_ggplot <- ggplot(mtcars, aes(disp)) + geom_histogram()
 #'   expect_doppelganger("disp-histogram-ggplot", disp_hist_ggplot)
 #' }
 expect_doppelganger <- function(title, fig, path = NULL, ...,
                                 user_fonts = NULL) {
-  ver <- gdtools::version_freetype()
-  if (ver < "2.6.0") {
+  if (old_freetype()) {
+    ver <- gdtools::version_freetype()
     msg <- paste("vdiffr requires FreeType >= 2.6.0. Current version:", ver)
     testthat::skip(msg)
   }

R/vdiffr.R

@@ -3,3 +3,7 @@
 #' @importFrom R6 R6Class
 #' @useDynLib vdiffr
 NULL
+
+old_freetype <- function() {
+  gdtools::version_freetype() < "2.6.0"
+}

man/expect_doppelganger.Rd

@@ -18,12 +18,12 @@ on_load <- function() {
   identical(Sys.getenv("DEVTOOLS_LOAD"), "true")
 }
 skip_old_freetype <- function() {
-  if (gdtools::version_freetype() < "2.6.0" ) {
+  if (old_freetype()) {
     skip("FreeType too old for vdiffr")
   }
 }
 
-if (gdtools::version_freetype() >= "2.6.0" && !on_load()) {
+if (!old_freetype() && !on_load()) {
   mock_pkg_dir <- create_mock_pkg()
   mock_test_dir <- file.path(mock_pkg_dir, "tests", "testthat")