#112 re-export as.character.form_file - needed for upload to work

ropensci · Aug 2, 2019 · 09282b4 · 09282b4
1 parent 697c683
commit 09282b4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 9 deletions.
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,5 +1,6 @@
 # Generated by roxygen2: do not edit by hand
 
+S3method(as.character,form_file)
 S3method(ok,HttpClient)
 S3method(ok,character)
 S3method(ok,default)

diff --git a/NEWS.md b/NEWS.md
@@ -3,7 +3,7 @@ crul 0.8.4
 
 ### MINOR IMPROVEMENTS
 
-* no longer exporting `as.character.form_file` - avoids conflict with `httr` function of the same name (#112)
+* `jsonlite` package moved to Imports (#112)
 * the `parse()` method in the `HttpResponse` object now checks whether the response raw bytes can be converted to character, and if not just returns raw bytes (#115) (#116)
 * give vignettes titles (#113) (#114)
 

diff --git a/R/upload.R b/R/upload.R
@@ -10,4 +10,5 @@ upload <- function(path, type = NULL) {
   curl::form_file(path, type)
 }
 
+#' @export
 as.character.form_file <- function(x, ...) x
diff --git a/tests/testthat/test-client-post.R b/tests/testthat/test-client-post.R
@@ -125,10 +125,8 @@ test_that("post request with file upload", {
   expect_is(aa$content, "raw")
   expect_null(aa$request$options$readfunction)
   out <- jsonlite::fromJSON(aa$parse("UTF-8"))
-  # FIXME: since v0.8.4 these two tests are failing only on linux
-  # non-interactively, not sure why
-  # expect_named(out$files, "a")
-  # expect_match(out$files$a, "bibentry")
+  expect_named(out$files, "a")
+  expect_match(out$files$a, "bibentry")
 
   ## as data
   aa2 <- cli$post("post", body = file)

diff --git a/tests/testthat/test-retry.R b/tests/testthat/test-retry.R
@@ -117,10 +117,8 @@ test_that("retry wrapping post request with file upload", {
   expect_is(aa2$request$options$readfunction, "function")
   out <- jsonlite::fromJSON(aa2$parse("UTF-8"))
   expect_equal(length(out$files), 0)
-  # FIXME: since v0.8.4 these two tests are failing only on linux
-  # non-interactively, not sure why
-  # expect_is(out$data, "character")
-  # expect_match(out$data, "bibentry")
+  expect_is(out$data, "character")
+  expect_match(out$data, "bibentry")
 
 
   # binary file: jpeg