diff --git a/R/app.R b/R/app.R index 6669fa793..d3f557de8 100644 --- a/R/app.R +++ b/R/app.R @@ -300,10 +300,6 @@ initAutoReloadMonitor <- function(dir) { # > The files are sorted in alphabetical order, on the full path loadHelpers <- function(appDir, envir=globalenv()){ helpersDir <- file.path(appDir, "R") - if (!file.exists(helpersDir)){ - # We may be on a case-sensitive filesystem and have a dir named r/ - helpersDir <- file.path(appDir, "r") - } helpers <- list.files(helpersDir, pattern="\\.[rR]$", recursive=TRUE, full.names=TRUE) lapply(helpers, sourceUTF8, envir=envir) diff --git a/tests/test-helpers/app3-lowercase/app.R b/tests/test-helpers/app3-lowercase/app.R deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/test-helpers/app3-lowercase/r/helper.R b/tests/test-helpers/app3-lowercase/r/helper.R deleted file mode 100644 index 9f67d726a..000000000 --- a/tests/test-helpers/app3-lowercase/r/helper.R +++ /dev/null @@ -1,2 +0,0 @@ - -helper1 <- 789 diff --git a/tests/testthat/test-app.R b/tests/testthat/test-app.R index ae324a57a..b815d2612 100644 --- a/tests/testthat/test-app.R +++ b/tests/testthat/test-app.R @@ -14,11 +14,6 @@ test_that("nested helpers are loaded", { expect_equal(helper2, "def") }) -test_that("lower-case helper dir is loaded", { - loadHelpers("../test-helpers/app3-lowercase") - expect_equal(helper1, 789) -}) - test_that("app with both r/ and R/ prefers R/", { ## App 4 already has a lower-case r/ directory. Try to create an upper. tryCatch(dir.create("../test-helpers/app4-both/R"),