Skip to content

Commit fac01c4

Browse files
committed
Merge branch 'v044'
2 parents 88c46b3 + 91ceec4 commit fac01c4

File tree

4 files changed

+8
-2
lines changed

4 files changed

+8
-2
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ Encoding: UTF-8
22
Package: plumber
33
Type: Package
44
Title: An API Generator for R
5-
Version: 0.4.3
6-
Date: 2017-07-24
5+
Version: 0.4.4
6+
Date: 2017-12-01
77
Roxygen: list(markdown = TRUE)
88
Authors@R: c(
99
person(family="Trestle Technology, LLC", role="aut", email="cran@trestletech.com"),

NAMESPACE

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ export(sessionCookie)
2525
import(R6)
2626
import(crayon)
2727
import(stringi)
28+
importFrom(grDevices,dev.off)
29+
importFrom(grDevices,jpeg)
30+
importFrom(grDevices,png)
2831
importFrom(httpuv,runServer)
2932
importFrom(jsonlite,fromJSON)
3033
importFrom(stats,runif)

R/images.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
#' @param imageFun The function to call to setup the image device (e.g. `png`)
22
#' @param args A list of supplemental arguments to be passed into jpeg()
3+
#' @importFrom grDevices dev.off jpeg png
34
#' @noRd
45
render_image <- function(imageFun, contentType, args=NULL){
56
list(

tests/testthat/test-cookies.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ test_that("missing cookie values are empty string", {
3030
})
3131

3232
test_that("cookies can convert to string", {
33+
testthat::skip_on_cran()
34+
3335
expect_equal(cookieToStr("abc", 123), "abc=123")
3436
expect_equal(cookieToStr("complex", "string with spaces"), "complex=string%20with%20spaces")
3537
expect_equal(cookieToStr("abc", 123, path="/somepath"), "abc=123; Path=/somepath")

0 commit comments

Comments
 (0)