Merge remote-tracking branch 'origin/rel-1718314844'

Crunch-io · Jun 13, 2024 · 16c4bd4 · 16c4bd4
2 parents 538554d + ad99c37
commit 16c4bd4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/docker/jenkins/Dockerfile.rcrunch b/docker/jenkins/Dockerfile.rcrunch
@@ -1,4 +1,4 @@
-FROM rstudio/r-base:3.6-bionic
+FROM docker-proxy.nexus.crint.net/rstudio/r-base:4.3-jammy
 ARG RPROXY_CREDS
 ARG HOMEDIR=/home/jenkins
 ARG USER=997
@@ -8,7 +8,7 @@ ENV R_LIBS=${HOMEDIR}/rlibs
 USER root
 RUN locale-gen en_US.UTF-8
 ENV LANG=en_US.UTF-8
-RUN apt-get update && apt-get install build-essential libtiff5-dev libfribidi-dev libfontconfig1-dev libgit2-dev libssl-dev libcurl4-gnutls-dev libxml2-dev libsodium-dev -y
+RUN apt-get update && apt-get install build-essential libtiff5-dev libfribidi-dev libfontconfig1-dev libgit2-dev libssl-dev libcurl4-gnutls-dev libxml2-dev libsodium-dev libharfbuzz-dev libfribidi-dev -y
 # Add the user/group jenkins
 RUN groupadd --gid ${GROUP} jenkins \
     && useradd --uid ${USER} --gid jenkins --shell /bin/bash --create-home -d ${HOMEDIR} jenkins

diff --git a/tests/testthat/test-export-dataset.R b/tests/testthat/test-export-dataset.R
@@ -172,7 +172,7 @@ with_mock_crunch({
 validExport <- function(df2) {
     expect_identical(dim(df2), dim(ds))
     expect_equal(df2$v3, df$v3)
-    expect_identical(levels(df2$v4), c("B", "C"))
+    expect_identical(sort(unique(df2$v4)), c("B", "C"))
     ## assert more
 }
 # nolint end
@@ -201,7 +201,7 @@ with_test_authentication({
         write.csv(ds[ds$v4 == "C", ], file = filename)
         df2 <- read.csv(filename)
         expect_identical(nrow(df2), 10L)
-        expect_identical(levels(df2$v4), "C")
+        expect_identical(unique(df2$v4), "C")
     })
 
     test_that("Can filter columns in export", {
@@ -220,7 +220,7 @@ with_test_authentication({
         df2 <- read.csv(filename)
         expect_identical(dim(df2), c(10L, 2L))
         expect_identical(names(df2), c("v2", "v4"))
-        expect_identical(levels(df2$v4), "C")
+        expect_identical(unique(df2$v4), "C")
     })
 
     test_that("Can export category ids", {