From 2a1d02e12aa129791c01622ccd11bd4d666db40c Mon Sep 17 00:00:00 2001
From: Martin Studer <martin.studer@mirai-solutions.com>
Date: Mon, 7 Oct 2024 17:47:04 +0200
Subject: [PATCH] Fix and update combinations to tests

---
 .github/workflows/ci-tests.yml | 24 ++++++++++--------------
 tests/testthat/test-write.R    |  4 ++--
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml
index de98148..561e263 100644
--- a/.github/workflows/ci-tests.yml
+++ b/.github/workflows/ci-tests.yml
@@ -25,25 +25,26 @@ jobs:
       fail-fast: false
       matrix:
         config:
+          # Spark 3.5 seems currently unavailable so we use 3.4 for now
           - os-name: ubuntu
             os-version: latest
             java: 17
-            spark: "3.5"
+            spark: "3.4"
             r-version: release
           - os-name: ubuntu
-            os-version: "20.04"
+            os-version: latest
+            java: 8
+            spark: "2.4"
+            r-version: devel
+          - os-name: ubuntu
+            os-version: "22.04"
             java: 11
             spark: "3.0"
             r-version: oldrel
-          - os-name: ubuntu
-            os-version: "22.04"
-            java: 17
-            spark: "3.5"
-            r-version: devel
           - os-name: macos
             os-version: latest
             java: 8
-            spark: "3.1"
+            spark: "3.2"
             r-version: release
           - os-name: macos
             os-version: latest
@@ -53,13 +54,8 @@ jobs:
           - os-name: windows
             os-version: latest
             java: 8
-            spark: "2.4"
+            spark: "3.1"
             r-version: oldrel
-          - os-name: windows
-            os-version: "2019"
-            java: 11
-            spark: "3.2"
-            r-version: devel
           - os-name: windows
             os-version: "2022"
             java: 17
diff --git a/tests/testthat/test-write.R b/tests/testthat/test-write.R
index e0ae6e0..c0d8a64 100644
--- a/tests/testthat/test-write.R
+++ b/tests/testthat/test-write.R
@@ -21,7 +21,7 @@ test_that("writing BigQuery tables using direct method works", {
   ) %>% sparklyr::collect()
   
   expect_equal(
-    mtcars %>% arrange_at(names(mtcars)), 
-    as.data.frame(mtcars2) %>% arrange_at(names(mtcars)),
+    mtcars %>% dplyr::arrange_at(names(mtcars)), 
+    as.data.frame(mtcars2) %>% dplyr::arrange_at(names(mtcars)),
     ignore_attr = "row.names")
 })