better checks for tune install

Author: topepo

tests/testthat/helpers.R

@@ -1,10 +1,19 @@
 
 # In some cases, the test value needs to be wrapped in an empty
 #  environment. If arguments are set in the model specification
-# (as opposed to being set by a `translate` function), they will 
-# need this wrapper. 
+# (as opposed to being set by a `translate` function), they will
+# need this wrapper.
 
 new_empty_quosure <- function(expr) {
   new_quosure(expr, env = empty_env())
 }
 
+tune_check <- function() {
+  if (rlang::is_installed("tune")) {
+    res <- utils::packageVersion("tune") <= "0.1.6"
+  } else {
+    res <- TRUE
+  }
+  res
+}
+

tests/testthat/test_extract.R

@@ -4,10 +4,7 @@ context("model extraction")
 # ------------------------------------------------------------------------------
 
 test_that('extract', {
-  skip_if(
-    rlang::is_installed("tune") |
-      utils::packageVersion("tune") <= "0.1.6"
-  )
+  skip_if(tune_check())
 
   x <- linear_reg() %>% set_engine("lm") %>% fit(mpg ~ ., data = mtcars)
   x_no_spec <- x
@@ -26,10 +23,7 @@ test_that('extract', {
 
 test_that('extract parameter set from model with no parameters', {
   skip_on_covr()
-  skip_if(
-    rlang::is_installed("tune") |
-      utils::packageVersion("tune") <= "0.1.6"
-  )
+  skip_if(tune_check())
 
   lm_model <- linear_reg() %>% set_engine("lm")
 
@@ -40,10 +34,7 @@ test_that('extract parameter set from model with no parameters', {
 
 test_that('extract parameter set from model with main and engine parameters', {
   skip_on_covr()
-  skip_if(
-    rlang::is_installed("tune") |
-      utils::packageVersion("tune") <= "0.1.6"
-  )
+  skip_if(tune_check())
 
   bst_model <-
     boost_tree(mode = "classification", trees = hardhat::tune("funky name \n")) %>%
@@ -68,10 +59,7 @@ test_that('extract parameter set from model with main and engine parameters', {
 
 test_that('extract single parameter from model with no parameters', {
   skip_on_covr()
-  skip_if(
-    rlang::is_installed("tune") |
-      utils::packageVersion("tune") <= "0.1.6"
-  )
+  skip_if(tune_check())
 
   lm_model <- linear_reg() %>% set_engine("lm")
 
@@ -82,10 +70,7 @@ test_that('extract single parameter from model with no parameters', {
 
 test_that('extract single parameter from model with main and engine parameters', {
   skip_on_covr()
-  skip_if(
-    rlang::is_installed("tune") |
-      utils::packageVersion("tune") <= "0.1.6"
-  )
+  skip_if(tune_check())
 
   bst_model <-
     boost_tree(mode = "classification", trees = hardhat::tune("funky name \n")) %>%