tweak the nested module name extraction: use extractModName

PredictiveEcology · Jun 5, 2024 · f17d2ef · f17d2ef
1 parent 222aad7
commit f17d2ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/R/setupProject.R b/R/setupProject.R
@@ -492,7 +492,7 @@ setupProject <- function(name, paths, modules, packages,
   modulePackages <- setupModules(name, paths, modulesSUB, inProject = inProject, useGit = useGit,
                                  gitUserName = gitUserName, updateRprofile = updateRprofile,
                                  overwrite = overwrite, envir = envirCur, verbose = verbose)
-  modules <- Require::extractPkgName(basename(names(modulePackages)))
+  modules <- extractModName(names(modulePackages))
   names(modules) <- names(modulePackages)
 
   if (missing(packages))

diff --git a/tests/testthat/test-setupProject.R b/tests/testthat/test-setupProject.R
@@ -307,6 +307,7 @@ test_that("test setupProject - nested modulePath scfm B_bDP", {
     })
   )
 
+  expect_false(any(grepl("@", out$modules)))
   expect_true(all(names(out) %in% c("modules", "paths", "params", "times")))
   expect_true(all(fs::path_has_parent(out$paths$modulePath, getwd())))
-Original file line number
+Diff line change
@@ Expand Up @@
         })
       )
+      expect_false(any(grepl("@", out$modules)))
       expect_true(all(names(out) %in% c("modules", "paths", "params", "times")))
       expect_true(all(fs::path_has_parent(out$paths$modulePath, getwd())))
@@ Expand Down @@