Merge pull request #50 from teunbrand/ggplot2_3.5.0

Update tests

Author: henriquesposito

tests/testthat/test-map_autographr.R

@@ -158,7 +158,12 @@ test_that("hierarchy and lineage layouts graph correctly", {
 test_that("autographr works for diff_model objects", {
   skip_on_cran()
   skip_on_ci()
-  test_diff <- autographr(play_diffusion(ison_brandes))
-  expect_equal(test_diff[["guides"]][["shape"]][["name"]], "legend")
-  expect_equal(test_diff[["guides"]][["colour"]][["name"]], "colorbar")
+  test_diff <- autographr(migraph::play_diffusion(ison_brandes))
+  if (inherits(test_diff$guides, "Guides")) {
+    expect_s3_class(test_diff[["guides"]][["guides"]][["shape"]], "GuideLegend")
+    expect_s3_class(test_diff[["guides"]][["guides"]][["colour"]], "GuideColourbar")
+  } else {
+    expect_equal(test_diff[["guides"]][["shape"]][["name"]], "legend")
+    expect_equal(test_diff[["guides"]][["colour"]][["name"]], "colorbar")
+  }
 })

tests/testthat/test-map_theme.R

@@ -50,6 +50,8 @@ test_that("scales graph correctly", {
     mutate(color = c(rep(c(1,2,3), 3), 1, 2)) %>%
     autographr(node_color = color) +
     scale_color_rug()
+  # The `scale_name` field is deprecated from 3.5.0 onwards
+  skip_if(utils::packageVersion("ggplot2") >= "3.5.0")
   expect_equal(test_sdg[["scales"]][["scales"]][[1]][["call"]][["scale_name"]], "SDGs")
   expect_equal(test_sdg[["scales"]][["scales"]][[1]][["call"]][["palette"]][["palette"]], "SDGs")
   expect_equal(test_iheid[["scales"]][["scales"]][[1]][["call"]][["scale_name"]], "IHEID")