Merge pull request #144 from animint/combine-renderer-tests

rm selenium, combine renderer1,2,3

.github/workflows/tests.yaml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test-suite: [ renderer1,renderer2,renderer3,compiler,CRAN]
+        test-suite: [ renderer, compiler, CRAN ]
 
     name: Test Suite ${{ matrix.test-suite }}
     env: 
@@ -21,8 +21,6 @@ jobs:
       GH_ACTION: "ENABLED"
     steps:
       - uses: actions/checkout@v3
-      - name: Start Selenium Docker
-        run: docker run -d --network="host" selenium/standalone-firefox-debug:2.53.0
       - name: install and update texlive
         run: /usr/bin/sudo DEBIAN_FRONTEND=noninteractive apt update -y -qq
       - run: /usr/bin/sudo DEBIAN_FRONTEND=noninteractive apt install texlive texlive-fonts-extra -y

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: animint2
 Title: Animated Interactive Grammar of Graphics
-Version: 2024.6.6
+Version: 2024.8.27
 URL: https://animint.github.io/animint2/
 BugReports: https://github.com/animint/animint2/issues
 Authors@R: c(
@@ -87,7 +87,7 @@ Suggests:
     htmltools,
     rmarkdown,
     testthat,
-    RSelenium, XML,
+    XML,
     devtools,
     httr,
     maps,
@@ -102,7 +102,6 @@ Suggests:
     svglite,
     ggplot2,
     chromote
-Remotes: ropensci/[email protected]
 License: GPL-3
 Encoding: UTF-8
 LazyData: true
@@ -281,6 +280,6 @@ Collate:
     'z_scales.R'
     'z_theme_animint.R'
     'z_transformShape.R'
-RoxygenNote: 7.2.3
+RoxygenNote: 7.3.2
 Config/Needs/website: tidyverse/tidytemplate
 VignetteBuilder: knitr

NAMESPACE

@@ -507,10 +507,13 @@ import(plyr)
 import(scales)
 importFrom(grDevices,col2rgb)
 importFrom(grDevices,rgb)
+importFrom(grid,arrow)
+importFrom(grid,unit)
 importFrom(knitr,knit_print)
 importFrom(methods,is)
 importFrom(plyr,as.quoted)
 importFrom(plyr,defaults)
+importFrom(scales,alpha)
 importFrom(stats,na.omit)
 importFrom(stats,setNames)
 importFrom(utils,browseURL)

NEWS.md

@@ -1,14 +1,18 @@
+# Changes in version 2024.8.27 (PR#144)
+
+- Remove selenium, combine renderer tests into single CI job.
+
 # Changes in version 2024.6.6 (PR#126)
 
-  - Add chromote as headless browser for testing and remove phantomjs/firefox support
+- Add chromote as headless browser for testing and remove phantomjs/firefox support
 
 # Changes in version 2024.3.12 (PR#119)
 
-  - Add validation checks for duplicate args passed geom and aes
+- Add validation checks for duplicate args passed geom and aes
 
 # Changes in version 2024.2.4 (PR#116)
 
-  - Add validation checks for duplicate and missing args passed to animint.
+- Add validation checks for duplicate and missing args passed to animint.
 
 # Changes in version 2024.1.24 (PR#112)
 

R/z_facets.R

@@ -1,4 +1,3 @@
-
 # Determine titles to put on facet panels.
 # The implementation here is a modified version of facet_strips.
 getStrips <- function(facet, panel, ...)
@@ -36,7 +35,6 @@ build_strip <- function(panel, label_df, labeller, side = "right", ...) {
   labels <- matrix(list(), nrow = nrow(label_df), ncol = ncol(label_df))
   labels <- lapply(labeller(label_df), cbind)
   labels <- do.call("cbind", labels)
-
   # unlike ggplot2, we collapse "layers" of strips into 1 layer
   apply(labels, 1, paste, collapse = "; ")
 }

tests/testthat.R

@@ -1,45 +1,17 @@
 library("testthat")
 library("animint2")
-library("RSelenium");library("XML")
+library("XML")
 setwd("testthat")
 source("helper-functions.R")
 source("helper-HTML.R")
 source("helper-plot-data.r")
-
-## RSelenium does not work with all versions of firefox, TDH usually
-## tests using one of the following.
-
-## thocking@silene:~/R/animint-mine(fix-common-chunk)$ firefox --version
-## Mozilla Firefox 11.0
-## thocking@silene:~/R/animint(animation-fix)$ java -jar ~/lib/R/library/RSelenium/bin/selenium-server-standalone.jar --version
-## 10:10:58.942 INFO - Launching a standalone server
-## 10:10:58.973 INFO - Java: Sun Microsystems Inc. 23.25-b01
-## 10:10:58.973 INFO - OS: Linux 3.8.0-44-generic amd64
-## 10:10:58.987 INFO - v2.44.0, with Core v2.44.0. Built from revision 76d78cf
-## > packageVersion("RSelenium")
-## [1] ‘1.3.6’
-
-## > packageVersion("RSelenium")
-## [1] ‘1.3.5’
-## tdhock@recycled:~/R/animint(roc-bugfix)$ firefox --version
-## Mozilla Firefox 41.0
-## tdhock@recycled:~/R/animint(roc-bugfix*)$ java -jar ~/lib/R/library/RSelenium/bin/selenium-server-standalone.jar --version
-## 08:13:17.803 INFO - Launching a standalone Selenium Server
-## 08:13:17.877 INFO - Java: Oracle Corporation 24.79-b02
-## 08:13:17.877 INFO - OS: Linux 3.13.0-65-generic i386
-## 08:13:17.907 INFO - v2.47.0, with Core v2.47.0. Built from revision 0e4837e
-
 filter <- Sys.getenv("TEST_SUITE")
-# If we're running in github actions then use Firefox, since we can
-# use the Selenium docker image instead of relying on PhantomJS.
 gh.action <- Sys.getenv("GH_ACTION")
-dont.need.browser <- grepl("compiler", filter)
-use.browser <- !dont.need.browser
+use.browser <- grepl("renderer", filter)
 if(filter == ""){
   filter <- NULL
 }
 message(gh.action)
-tests_init()
-
+if(use.browser)tests_init()
 tests_run(filter=filter)
-tests_exit()
+if(use.browser)tests_exit()

tests/testthat/helper-functions.R

@@ -330,10 +330,7 @@ unequal <- function(object, expected, ...){
 #' tests_exit()
 #' }
 #'
-
 tests_run <- function(dir = ".", filter = NULL) {
-  if (!"package:RSelenium" %in% search())
-    stop("Please load RSelenium: library(RSelenium)")
   if (!"package:testthat" %in% search())
     stop("Please load testthat: library(testthat)")
   testDir <- find_test_path(dir)