Merge branch 'development'

PredictiveEcology · Jun 7, 2024 · 5a96ee9 · 5a96ee9
2 parents 115d6ea + 45bc4a9
commit 5a96ee9
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -15,7 +15,7 @@ URL:
     https://spades-core.predictiveecology.org/,
     https://github.com/PredictiveEcology/SpaDES.core
 Date: 2024-06-06
-Version: 2.1.2
+Version: 2.1.3
 Authors@R: c(
     person("Alex M", "Chubaty", , "achubaty@for-cast.ca", role = c("aut"),
            comment = c(ORCID = "0000-0001-7146-8135")),
@@ -59,6 +59,7 @@ Suggests:
     httr,
     knitr,
     lattice,
+    lme4,
     logging,
     magrittr,
     NLMR (>= 1.1.1),

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,8 @@
+# SpaDES.core 2.1.3
+
+* fix issue with Windows short paths in tests;
+* improved documentation;
+
 # SpaDES.core 2.1.2
 
 * fixed bug in `restartSpades()`;

diff --git a/R/misc-methods.R b/R/misc-methods.R
@@ -414,7 +414,7 @@ moduleCodeFiles <- function(paths, modules) {
 }
 
 #' Recursively Filter a list
-#' @inheritParams Filter
+#' @inheritParams funprog
 #' @keywords internal
 FilterRecursive <- function(f, x) {
   Filter(f, x) |>

diff --git a/man/FilterRecursive.Rd b/man/FilterRecursive.Rd
diff --git a/tests/testthat/test-load.R b/tests/testthat/test-load.R
@@ -461,6 +461,7 @@ test_that("Filenames for simList", {
 test_that("loadSimList handles symlinked files sensibly", {
   skip_on_cran()
   skip_on_ci()
+  skip_if_not_installed("lme4")
 
   prjDir <- "~/GitHub/BC_HRV"
 

diff --git a/tests/testthat/test-simList.R b/tests/testthat/test-simList.R
@@ -40,8 +40,8 @@ test_that("simList object initializes correctly (1)", {
   rm(w)
 
   ## test path accessors
-  expect_identical(figurePath(mySim), normPath(file.path(outputPath(mySim), "figures")))
-  expect_identical(logPath(mySim), normPath(file.path(outputPath(mySim), "log")))
+  expect_identical(normPath(figurePath(mySim)), normPath(file.path(outputPath(mySim), "figures")))
+  expect_identical(normPath(logPath(mySim)), normPath(file.path(outputPath(mySim), "log")))
 
   ### SLOT .xData
   expect_is(envir(mySim), "environment")