fixes for R CMD check

cpsievert · cpsievert · commit a8ea024a359c · 2015-10-08T19:56:10.000+11:00
diff --git a/NAMESPACE b/NAMESPACE
@@ -29,6 +29,7 @@ import(ggplot2)
 import(httr)
 import(jsonlite)
 importFrom(base64enc,base64encode)
+importFrom(grDevices,col2rgb)
 importFrom(htmlwidgets,createWidget)
 importFrom(htmlwidgets,shinyRenderWidget)
 importFrom(htmlwidgets,shinyWidgetOutput)
@@ -37,4 +38,6 @@ importFrom(magrittr,"%>%")
 importFrom(plyr,ddply)
 importFrom(plyr,join)
 importFrom(plyr,summarise)
+importFrom(utils,getFromNamespace)
+importFrom(utils,modifyList)
 importFrom(viridis,viridis)
diff --git a/R/print.R b/R/print.R
@@ -24,7 +24,7 @@ print.plotly <- function(x, ...) {
 #' @param height attribute of the iframe
 #' @export
 embed_notebook <- function(x, width = "100%", height = "525") {
-  if (!requireNamespace("IRdisplay")) {
+  if (system.file(package = "IRdisplay") == "") {
     warning("You need the IRdisplay package to use this function: \n",
             "devtools::install_github(c('IRkernel/repr', 'IRKernel/IRdisplay'))")
     return(x)
diff --git a/R/utils.R b/R/utils.R
@@ -1,3 +1,6 @@
+#' @importFrom grDevices col2rgb
+#' @importFrom utils getFromNamespace modifyList
+
 is.plotly <- function(x) inherits(x, "plotly")
 
 "%||%" <- function(x, y) {
@@ -6,7 +9,7 @@ is.plotly <- function(x) inherits(x, "plotly")
 
 # this function is called after the package is loaded
 .onAttach <- function(...) {
-  usr <- verify("username")
+  usr <- verify("username", warn = FALSE)
   if (nchar(usr) > 0) packageStartupMessage("\n", "Howdy, ", usr, "!")
   invisible(NULL)
 }
@@ -66,9 +69,9 @@ last_plot <- function(data = NULL) {
 }
 
 # Check for credentials/configuration and throw warnings where appropriate
-verify <- function(what = "username") {
+verify <- function(what = "username", warn = TRUE) {
   val <- grab(what)
-  if (val == "") {
+  if (val == "" && warn) {
     switch(what,
            username = warning("You need a plotly username. See help(signup, package = 'plotly')", call. = FALSE),
            api_key = warning("You need an api_key. See help(signup, package = 'plotly')", call. = FALSE))
diff --git a/tests/testthat/test-plotly-filename.R b/tests/testthat/test-plotly-filename.R
@@ -1,6 +1,7 @@
 context("Filename")
 
 test_that("filepath with directories is returned as passed", {
+  skip_on_cran()
   p <- plot_ly(mtcars, x = wt, y = vs, filename = "directory/awesome")
   expect_match(plotly_POST(p)$filename, "directory/awesome")
 })
diff --git a/tests/testthat/test-plotly-getfigure.R b/tests/testthat/test-plotly-getfigure.R
@@ -1,24 +1,28 @@
 context("get_figure")
 
 test_that("requests made by a user who doesn't exist error a 404", {
+  skip_on_cran()
   expect_error({
     get_figure("klmadslfjdfljdsf", 0)
   }, ".*404.*")
 })
 
 test_that("requests made to retrieve a figure that doesn't exist returns a 404", {
+  skip_on_cran()
   expect_error({
     get_figure("get_test_user", 18324823)
   }, ".*404.*")
 })
 
 test_that("requests made to retrieve some elses private file errors a 403", {
+  skip_on_cran()
   expect_error({
     get_figure("get_test_user", 1)
   }, ".*403.*")
 })
 
 test_that("retrieving a public figure ... works.", {
+  skip_on_cran()
   fig <- get_figure("get_test_user", 0)
   # get the data behind the hash
   p <- plotly_build(fig)
