Merge pull request #261 from ropensci/fix-text-with-size-parameter

if user supplied text, don't auto-fill text attribute with size info

Author: chriddyp

.travis.yml

@@ -20,7 +20,6 @@ script:
 
 after_success:
   - cd ../plotly-test-table
-  - ls -R
   - Rscript ../plotly/inst/build-push-comment.R
 
 env:

R/trace_generation.R

@@ -541,7 +541,9 @@ geom2trace <- list(
               mode="markers",
               marker=paramORdefault(params, aes2marker, marker.defaults))
     if("size" %in% names(data)){
-      L$text <- paste("size:", data$size)
+      if(!("text" %in% names(data))) {
+        L$text <- paste("size:", data$size)
+      }
       L$marker$sizeref <- default.marker.sizeref
       # Make sure sizes are passed as a list even when there is only one element.
       s <- data$size

inst/build-push-comment.R

@@ -54,8 +54,11 @@ if (tpr != "false" && tpr != "") {
   base_pngs <- dir(base_dir, pattern = "\\.png$")
   # Re-run (current) test suite with master branch if it's missing any tests 
   if (!all(this_pngs %in% base_pngs)) {
+    cat(base_hash, file = "base_hash.txt")
     dir.create(base_dir, showWarnings = FALSE)
-    devtools::install_github("ropensci/plotly", ref = base_hash)
+    system2("Rscript", 
+            c("-e", shQuote("devtools::install_github('ropensci/plotly', ref = readLines('base_hash.txt'))"))
+    )
     print("Rerunning tests with master")
     try(source("../plotly/tests/testthat.R", chdir = TRUE))
   }
@@ -107,7 +110,7 @@ if (tpr != "false" && tpr != "") {
   # strip any leading/trailing whitespace in urls
   hashes$url <- sub("\\s$", "", sub("^\\s", "", hashes$url))
   hashes <- hashes[hashes$commit %in% c(this_hash, base_hash), ]
-  devtools::install("../plotly")
+  system("R CMD INSTALL ../plotly")
   diffs <- character()
   for (i in tests) {
     test_info <- hashes[hashes$test %in% i, ]