Merge branch 'v044'

rstudio · Dec 4, 2017 · fac01c4 · fac01c4
2 parents 88c46b3 + 91ceec4
commit fac01c4
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -2,8 +2,8 @@ Encoding: UTF-8
 Package: plumber
 Type: Package
 Title: An API Generator for R
-Version: 0.4.3
-Date: 2017-07-24
+Version: 0.4.4
+Date: 2017-12-01
 Roxygen: list(markdown = TRUE)
 Authors@R: c(
   person(family="Trestle Technology, LLC", role="aut", email="[email protected]"),

diff --git a/NAMESPACE b/NAMESPACE
@@ -25,6 +25,9 @@ export(sessionCookie)
 import(R6)
 import(crayon)
 import(stringi)
+importFrom(grDevices,dev.off)
+importFrom(grDevices,jpeg)
+importFrom(grDevices,png)
 importFrom(httpuv,runServer)
 importFrom(jsonlite,fromJSON)
 importFrom(stats,runif)

diff --git a/R/images.R b/R/images.R
@@ -1,5 +1,6 @@
 #' @param imageFun The function to call to setup the image device (e.g. `png`)
 #' @param args A list of supplemental arguments to be passed into jpeg()
+#' @importFrom grDevices dev.off jpeg png
 #' @noRd
 render_image <- function(imageFun, contentType, args=NULL){
   list(

diff --git a/tests/testthat/test-cookies.R b/tests/testthat/test-cookies.R
@@ -30,6 +30,8 @@ test_that("missing cookie values are empty string", {
 })
 
 test_that("cookies can convert to string", {
+  testthat::skip_on_cran()
+
   expect_equal(cookieToStr("abc", 123), "abc=123")
   expect_equal(cookieToStr("complex", "string with spaces"), "complex=string%20with%20spaces")
   expect_equal(cookieToStr("abc", 123, path="/somepath"), "abc=123; Path=/somepath")