Merge pull request #40 from ateucher/master

subset animals on windows for when by='random'
sckott · Oct 15, 2015 · 942eef2 · 942eef2
2 parents e1e9468 + 9642555
commit 942eef2
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/R/get_who.R b/R/get_who.R
@@ -4,10 +4,13 @@ get_who <- function(by, length) {
   if (.Platform$OS.type == "windows") {
     ua <- c('shortcat','longcat','fish','signbunny','stretchycat',
             'anxiouscat','longtailcat','grumpycat','mushroom')
+
     if (by %in% ua) {
       stop("If you're on Windows, you can't use:\n", 
            paste0(sort(ua), collapse = "\n"), call. = FALSE)
     }
+
+    animals <- animals[setdiff(names(animals), ua)]
   }
 
   by <- match.arg(by, c(choices = names(animals), "rms", "random"))

diff --git a/tests/testthat/test-say.R b/tests/testthat/test-say.R
@@ -19,3 +19,9 @@ test_that("say by works as expected", {
 test_that("say fails well", {
   expect_error(say(list(4, 5)), "what has to be of length 1")
 })
+
+test_that("say fails with certain characters on windows", {
+  skip_on_os(c("mac", "linux", "solaris"))
+  expect_error(say("Hi", by = "longcat"), "If you're on Windows, you can't use")
+})
+