fix tests

Author: tdhock

inst/htmljs/animint.js

@@ -1098,17 +1098,18 @@ var animint = function (to_select, json_file) {
 
     var colour = "black", colour_off;
     var get_colour;
+    var get_colour_off = function (d) {
+      return colour_off;
+    };
     if(aes.hasOwnProperty("colour")){
       get_colour = get_attr("colour");
+      get_colour_off = get_colour;
     }else{
       get_colour = function (d) {
 	return colour;
       };
     }
     var get_colour_off_default = get_colour;
-    var get_colour_off = function (d) {
-      return colour_off;
-    };
 
     var fill = "black", fill_off = "black";
     var get_fill = function (d) {

tests/testthat/test-renderer1-geom-text-color.R

@@ -3,7 +3,7 @@ library(animint2)
 df <- data.frame(x=1,y="foo")
 viz <- animint(
   text=ggplot()+
-    geom_text(aes(x, 4, label=y), color="black", clickSelects="y", data=df)+
+    geom_text(aes(x, 4, label=y, id="ONETEXT"), color="black", clickSelects="y", data=df)+
     geom_text(aes(x, 3, label=y, color=y), data=df)+
     scale_color_manual(values=c(foo="blue"))+
     geom_text(aes(x, 2, label=y), color="red", data=df)+
@@ -17,7 +17,7 @@ test_that("geom_text color rendered as fill style", {
   expect_identical(opacity, c("1","1","1","1"))
 })
 
-clickID("plot_text_y_variable_foo_label")#not _svg.
+clickID("ONETEXT")
 after.html <- getHTML()
 test_that("geom_text color rendered as fill style", {
   fill <- getStyleValue(after.html, '//text[@class="geom"]', "fill")

tests/testthat/test-renderer2-colour.R

@@ -93,7 +93,7 @@ viz.point <- list(
       fill = disp),
       data = mtcars,
       colour="red",
-      colour_off="transparent",
+      colour_off="yellow",
       alpha_off=1,
       size = 10,
       clickSelects = "gear")+
@@ -122,7 +122,7 @@ test_that("setting alpha_off and colour_off makes only stroke change", {
     '//svg[@id="plot_acoff"]//circle[@class="geom"]',
     "stroke")
   stroke.tab <- sort(table(stroke.str))
-  expect_color(names(stroke.tab), c("red","transparent"))
+  expect_color(names(stroke.tab), c("red","yellow"))
 })
 
 #

tests/testthat/test-renderer2-widerect.R

@@ -1,5 +1,5 @@
 acontext("geom_widerect")
-
+library(animint2)
 expect_source <- function(expected){
   a.list <- getNodeSet(info$html, '//a[@id="a_source_href"]')
   computed <- if(length(a.list)==0){
@@ -8,7 +8,7 @@ expect_source <- function(expected){
     at.mat <- sapply(a.list, xmlAttrs)
     at.mat["href",]
   }
-  expect_identical(computed, expected)
+  expect_identical(as.character(computed), as.character(expected))
 }
 
 recommendation <- data.frame(

tests/testthat/test-renderer3-ChromHMMinit.R

@@ -87,5 +87,5 @@ test_that("animation starts by default", {
 test_that("default tile colour/stroke is transparent", {
   stroke.vec <- getStyleValue(
     info$html, '//g[@class="geom1_tile_parameters"]//rect', "stroke")
-  expect_identical(stroke.vec, rep("black", 90))
+  expect_color(stroke.vec, "black")
 })