expect_traces isn't exclusive to ggplot

cpsievert · cpsievert · commit c755a440f4b4 · 2016-07-28T12:12:15.000-05:00
diff --git a/R/crosstalk.R b/R/crosstalk.R
diff --git a/R/helpers.R b/R/helpers.R
@@ -54,6 +54,9 @@ hide_legend <- function(p) {
       p$x$layout$annotations[[i]] <- NULL
     }
   }
+  if (length(p$x$layout$annotations) == 0) {
+    p$x$layout$annotations <- NULL
+  }
   p$x$layout$showlegend <- FALSE
   p
 }
diff --git a/man/hide_guides.Rd b/man/hide_guides.Rd
diff --git a/tests/testthat/test-cookbook-axes.R b/tests/testthat/test-cookbook-axes.R
@@ -1,7 +1,6 @@
 context("cookbook axes")
 
 expect_traces <- function(gg, n.traces, name) {
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("cookbook-axes-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-cookbook-lines.R b/tests/testthat/test-cookbook-lines.R
@@ -1,7 +1,6 @@
 context("cookbook lines")
 
 expect_traces <- function(gg, n.traces, name) {
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("cookbook-axes-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-abline.R b/tests/testthat/test-ggplot-abline.R
@@ -3,7 +3,6 @@ context("Abline")
 # 'Abline' refers to the line coefficients, as in y = a  b * x
 
 expect_traces <- function(gg, n.traces, name) {
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("cookbook-axes-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-area.R b/tests/testthat/test-ggplot-area.R
@@ -3,7 +3,6 @@ context("Area")
 # Test that the order of traces is correct
 # Expect traces function
 expect_traces <- function(gg, n_traces, name) {
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n_traces))
   save_outputs(gg, paste0("area-", name))
   L <- gg2list(gg)
diff --git a/tests/testthat/test-ggplot-bar.R b/tests/testthat/test-ggplot-bar.R
@@ -1,7 +1,6 @@
 context("bar")
 
 expect_traces <- function(gg, n.traces, name) {
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("bar-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-boxplot.R b/tests/testthat/test-ggplot-boxplot.R
@@ -1,7 +1,6 @@
 context("Boxplot")
 
 expect_traces <- function(gg, n.traces, name) {
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   save_outputs(gg, paste0("boxplot-", name))
   L <- gg2list(gg)
diff --git a/tests/testthat/test-ggplot-histogram.R b/tests/testthat/test-ggplot-histogram.R
@@ -1,7 +1,6 @@
 context("Histogram")
 
 expect_traces <- function(gg, n.traces, name) {
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("histogram-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-jitter.R b/tests/testthat/test-ggplot-jitter.R
@@ -2,7 +2,6 @@ context("geom_jitter")
 
 # Expect trace function
 expect_traces <- function(gg, n_traces, name) {
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n_traces))
   save_outputs(gg, paste0("jitter-", name))
   L <- gg2list(gg)
diff --git a/tests/testthat/test-ggplot-legend.R b/tests/testthat/test-ggplot-legend.R
@@ -1,7 +1,6 @@
 context("legends")
 
 expect_traces <- function(gg, n.traces, name){
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("legend-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-point.R b/tests/testthat/test-ggplot-point.R
@@ -1,7 +1,6 @@
 context("geom_point")
 
 expect_traces <- function(gg, n.traces, name){
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("smooth-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-polygons.R b/tests/testthat/test-ggplot-polygons.R
@@ -1,7 +1,6 @@
 context("polygon")
 
 expect_traces <- function(gg, n.traces, name){
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("polygon-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-rect.R b/tests/testthat/test-ggplot-rect.R
@@ -1,7 +1,6 @@
 context("geom_rect")
 
 expect_traces <- function(gg, n.traces, name) {
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("rect-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-ribbon.R b/tests/testthat/test-ggplot-ribbon.R
@@ -1,7 +1,6 @@
 context("ribbon")
 
 expect_traces <- function(gg, n.traces, name){
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("ribbon-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-smooth.R b/tests/testthat/test-ggplot-smooth.R
@@ -1,7 +1,6 @@
 context("smooth")
 
 expect_traces <- function(gg, n.traces, name){
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("smooth-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-ticks.R b/tests/testthat/test-ggplot-ticks.R
@@ -5,7 +5,6 @@ PlantGrowth$type <-
 boxes <- ggplot(PlantGrowth, aes(x = group, y = weight)) + geom_boxplot()
 
 expect_traces <- function(gg, n.traces, name){
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("ticks-", name))
   all.traces <- L$data
diff --git a/tests/testthat/test-ggplot-ylim.R b/tests/testthat/test-ggplot-ylim.R
@@ -15,7 +15,6 @@ gg.ylim <-
   ggtitle("Average bill for 2 people")
 
 expect_traces <- function(gg, n.traces, name){
-  stopifnot(is.ggplot(gg))
   stopifnot(is.numeric(n.traces))
   L <- save_outputs(gg, paste0("ylim-", name))
   all.traces <- L$data

Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,9 @@ hide_legend <- function(p) {`
`54`	`54`	`p$x$layout$annotations[[i]] <- NULL`
`55`	`55`	`}`
`56`	`56`	`}`
	`57`	`+ if (length(p$x$layout$annotations) == 0) {`
	`58`	`+ p$x$layout$annotations <- NULL`
	`59`	`+ }`
`57`	`60`	`p$x$layout$showlegend <- FALSE`
`58`	`61`	`p`
`59`	`62`	`}`