Merge branch 'master' into locale

cpsievert · cpsievert · commit 64c7a56ed1b8 · 2018-05-30T14:51:23.000-05:00
diff --git a/tests/testthat/test-plotly-partial-bundles.R b/tests/testthat/test-plotly-partial-bundles.R
@@ -27,7 +27,7 @@ test_that("Can find the right bundle", {
   
   p3 <- plot_ly(z = ~volcano) %>% add_surface()
   p4 <- partial_bundle(p3)
-  expect_match(plotlyjsBundle(p3)$name, "gl3d")
+  expect_match(plotlyjsBundle(p4)$name, "gl3d")
   
   # At least right now, we don't support multiple partial bundles
   expect_warning(
