finish migrating cloud skip logic

Author: cpsievert

tests/testthat/helper-skip.R

@@ -1,13 +1,17 @@
-# Some tests make plot.ly HTTP requests and require a valid user account
-# (see test-plotly-filename.R). For security reasons, these tests should be 
-# skipped on pull requests (the .travis.yml file uses encrypted credentials
-# & encrypted environment vars cannot be accessed on pull request builds)
-skip_if_not_master <- function() {
+r_version <- paste(R.version$major, R.version$minor, sep = ".")
+r_release <- rversions::r_release()$version
+is_release <- isTRUE(r_release == r_version)
+is_win <- .Platform$OS.type == "windows"
+
+skip_cloud_tests <- function() {
+  skip_on_cran()
   if (is.na(Sys.getenv("plotly_username", NA))) {
-    return(skip("Testing plot.ly API calls requires a plotly account"))
+    skip("Cloud testing requires a plotly account (plotly_username)")
+  }
+  if (is.na(Sys.getenv("plotly_api_key", NA))) {
+    skip("Cloud testing requires a plotly account (plotly_api_key)")
+  }
+  if (!is_release || !is_win) {
+    skip("Cloud testing is only run on Windows with the current release of R")
   }
-  is_pr <- grepl("^[0-9]+$", Sys.getenv("TRAVIS_PULL_REQUEST"))
-  is_r_release <- Sys.getenv("TRAVIS_R_VERSION_STRING", "release") == "release"
-  if (!is_pr && is_r_release) return(invisible(TRUE))
-  skip("plot.ly API calls are only tested on the master build on r-release")
 }

tests/testthat/test-api.R

@@ -1,22 +1,3 @@
-r_version <- paste(R.version$major, R.version$minor, sep = ".")
-r_release <- rversions::r_release()$version
-is_release <- isTRUE(r_release == r_version)
-is_win <- .Platform$OS.type == "windows"
-
-skip_cloud_tests <- function() {
-  skip_on_cran()
-  if (is.na(Sys.getenv("plotly_username", NA))) {
-    skip("Cloud testing requires a plotly account (plotly_username)")
-  }
-  if (is.na(Sys.getenv("plotly_api_key", NA))) {
-    skip("Cloud testing requires a plotly account (plotly_api_key)")
-  }
-  if (!is_release || !is_win) {
-    skip("Cloud testing is only run on Windows with the current release of R")
-  }
-}
-
-
 test_that("api() returns endpoints", {
   skip_cloud_tests()
 
@@ -33,8 +14,7 @@ test_that("Can search with white-space", {
 })
 
 test_that("Changing a filename works", {
-  skip_on_cran()
-  skip_if_not_master()
+  skip_cloud_tests()
 
   id <- plotly:::new_id()
   f <- api("files/cpsievert:14680", "PATCH", list(filename = id))
@@ -174,3 +154,58 @@ test_that("filename supports names with paths included ", {
   expect_match(f$filename, "awesome")
   expect_true(f$parented)
 })
+
+
+
+
+test_that("requests made by a user who doesn't exist error a 404", {
+  skip_cloud_tests()
+  
+  expect_error({
+    get_figure("klmadslfjdfljdsf", 0)
+  }, ".*404.*")
+})
+
+test_that("requests made to retrieve a figure that doesn't exist returns a 404", {
+  skip_cloud_tests()
+  
+  expect_error({
+    get_figure("get_test_user", 18324823)
+  }, ".*404.*")
+})
+
+test_that("requests made to retrieve some elses private file errors", {
+  skip_cloud_tests()
+  
+  expect_error(get_figure("get_test_user", 1))
+})
+
+test_that("retrieving a public figure ... works.", {
+  skip_cloud_tests()
+  
+  fig <- get_figure("get_test_user", 0)
+  # get the data behind the hash
+  p <- plotly_build(fig)$x
+  expect_equivalent(p$data[[1]]$x, c("1", "2", "3"))
+})
+
+test_that("can add traces to a subplot figure", {
+  skip_cloud_tests()
+  
+  fig <- get_figure('chelsea_lyn', 6366)
+  p <- add_lines(fig, x = c(1, 2, 3), y = c(4, 2, 4))
+  expect_equivalent(
+    length(plotly_build(fig)$x$data) + 1, 
+    length(plotly_build(p)$x$data)
+  )
+})
+
+test_that("posting a hidden plot returns a secret key", {
+  skip_cloud_tests()
+  
+  res <- api_create(plot_ly(), sharing = "secret")
+  expect_true(res$share_key_enabled)
+  expect_true(nchar(res$share_key) > 1)
+})
+
+