merge conflicts with master

plotly · mkcor · May 7, 2015 · Mar 31, 2015 · Mar 31, 2015 · Mar 31, 2015
commit f90928b9a0ed59d4af6fd41d0f79aab75ff4fa3d
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: plotly
 Type: Package
 Title: Interactive, publication-quality graphs online.
-Version: 0.5.30
+Version: 0.5.31
 Authors@R: c(person("Chris", "Parmer", role = c("aut", "cre"),
     email = "chris@plot.ly"),
     person("Scott", "Chamberlain", role = "aut",

diff --git a/NEWS b/NEWS
@@ -1,7 +1,11 @@
-0.5.30 -- 5 May 2015
+0.5.31 -- 5 May 2015
 
 Add test-cookbook-lines.R and fix bugs that showed up in those tests.
 
+0.5.30 -- 4 May 2015
+
+Let gg2list() return a figure object.
+
 0.5.29 -- 16 April 2015
 
 geom_density() as filled area chart #202 

diff --git a/tests/testthat/test-cookbook-axes.R b/tests/testthat/test-cookbook-axes.R
@@ -72,14 +72,14 @@ bp.scale.hide <- bp + scale_y_continuous(limits=c(5, 7.5))
 test_that("scale_y(limits) hides points", {
   info <- expect_traces(bp.scale.hide, 3, "scale.hide")
   expect_legend(info, leg())
-  expect_equal(info$kwargs$layout$yaxis$range, c(5, 7.5))
+  expect_equal(info$layout$yaxis$range, c(5, 7.5))
 })
 
 bp.coord <- bp + coord_cartesian(ylim=c(5, 7.5))
 test_that("Using coord_cartesian zooms into the area", {
   info <- expect_traces(bp.coord, 3, "coord-ylim")
   expect_legend(info, leg())
-  expect_equal(info$kwargs$layout$yaxis$range, c(5, 7.5))
+  expect_equal(info$layout$yaxis$range, c(5, 7.5))
 })
 
 # Create some noisy exponentially-distributed data
@@ -189,7 +189,7 @@ bp.fonts <- bp +
 test_that("element_text face, colour, size, angle, vjust, size", {
   info <- expect_traces(bp.fonts, 3, "fonts")
   expect_legend(info, leg())
-  x <- info$kwargs$layout$xaxis
+  x <- info$layout$xaxis
   xtitle <- x[["titlefont"]]
   xtick <- x[["tickfont"]]
   expect_identical(xtitle$color, toRGB("#990000"))

diff --git a/tests/testthat/test-ggplot-bar.R b/tests/testthat/test-ggplot-bar.R
@@ -79,7 +79,8 @@ test_that("Very basic bar graph", {
     expect_null(tr$marker$line$width)
     expect_false(tr$showlegend)
   }
-  expect_null(info$kwargs$layout$annotations)
+  expect_null(info$layout$annotations)
+  expect_false(info$layout$showlegend)
 })
 
 test_that("Map the time of day to different fill colors", {