test: fix erros and warnings related to as_flextable

R/as-flextable.R

@@ -51,7 +51,7 @@ as_flextable.grouped_df <- function(
       x %>%
         dplyr::ungroup() %>%
         flextable::as_grouped_data(g) %>%
-        as_flextable(...)
+        flextable::as_flextable(...)
     )
   }
 

R/utils.R

@@ -16,3 +16,7 @@ drop_na <- function(x) {
 last <- function(x) {
   x[[length(x)]]
 }
+
+.Deprecated <- function(...) {
+  if (!getOption("ftExtra.ignore.deprecation", FALSE)) base::.Deprecated(...)
+}

tests/testthat/test-as-flextable.R

@@ -1,43 +1,22 @@
 x <- tibble::as_tibble(iris[c(1, 2, 51, 52), c(5, 1)])
 
-test_that("flextable.data.frame", {
-  expect_identical(flextable(x), flextable::flextable(x))
-  expect_identical(
-    flextable(x, with_blanks("Species", "Sepal.Length")),
-    flextable::flextable(
-      x,
-      col_keys = c("Species", "..after1", "..before1", "Sepal.Length")
-    )
-  )
-})
-
-
 test_that("as.flextable.grouped_df", {
+  options(ftExtra.ignore.deprecation = TRUE)
   d <- dplyr::group_by(x, .data$Species)
   f <- flextable::as_grouped_data(x, "Species")
 
-  expect_identical(flextable(d), as_flextable(f))
+  expect_identical(as_flextable(d), as_flextable(f))
 
   expect_identical(
-    flextable(d, groups_to = "merged"),
+    as_flextable(d, groups_to = "merged"),
     x %>%
       flextable::flextable() %>%
       flextable::merge_v("Species") %>%
       flextable::theme_vanilla()
   )
 
   expect_identical(
-    flextable(d, groups_to = "merged", col_keys = with_blanks("Species")),
-    x %>%
-      flextable::flextable(
-        col_keys = c("Species", "..after1", "Sepal.Length")
-      ) %>%
-      flextable::merge_v("Species") %>%
-      flextable::theme_vanilla()
-  )
-
-  expect_identical(
-    flextable(d, groups_to = "asis"),
+    as_flextable(d, groups_to = "asis"),
     flextable::flextable(x)
   )
 })
@@ -50,10 +29,10 @@ test_that("flextable.grouped_df multi groups", {
     dplyr::group_by(am, cyl, mpg)
   f <- flextable::as_grouped_data(x, groups = c("am", "cyl", "mpg"))
 
-  expect_identical(flextable(d), as_flextable(f))
+  expect_identical(as_flextable(d), as_flextable(f))
 
   expect_identical(
-    flextable(d, groups_to = "merged"),
+    as_flextable(d, groups_to = "merged"),
     x %>%
       dplyr::relocate(am, cyl, mpg) %>%
       flextable::flextable() %>%
@@ -62,7 +41,7 @@ test_that("flextable.grouped_df multi groups", {
   )
 
   expect_identical(
-    flextable(d, groups_to = "merged", groups_arrange = TRUE),
+    as_flextable(d, groups_to = "merged", groups_arrange = TRUE),
     x %>%
       dplyr::relocate(am, cyl, mpg) %>%
       dplyr::arrange(am, cyl, mpg) %>%
@@ -72,30 +51,15 @@ test_that("flextable.grouped_df multi groups", {
   )
 
   expect_identical(
-    flextable(d, groups_to = "merged", groups_pos = "asis"),
+    as_flextable(d, groups_to = "merged", groups_pos = "asis"),
     x %>%
       flextable::flextable() %>%
       flextable::merge_v(c("am", "cyl", "mpg")) %>%
       flextable::theme_vanilla()
   )
 
   expect_identical(
-    flextable(
-      d,
-      groups_to = "merged",
-      col_keys = with_blanks(tidyselect::starts_with("m"))
-    ),
-    x %>%
-      dplyr::relocate(am, cyl, mpg) %>%
-      flextable::flextable(
-        col_keys = c("am", "cyl", "mpg", "..after1", "model", "..after2", "disp")
-      ) %>%
-      flextable::merge_v(c("am", "cyl", "mpg")) %>%
-      flextable::theme_vanilla()
-  )
-
-  expect_identical(
-    flextable(d, groups_to = "asis"),
+    as_flextable(d, groups_to = "asis"),
     flextable::flextable(x)
   )
 })

tests/testthat/test-header-transform.R

@@ -28,9 +28,9 @@ test_that("merge_header", {
   expect_identical(merge_header(ft, FALSE), ft)
 })
 
-test_that("separate-header", {
+test_that("split-header", {
   expect_identical(
-    d %>% flextable() %>% separate_header(),
+    d %>% flextable() %>% split_header(),
     ft %>% flextable::theme_booktabs() %>% flextable::fix_border_issues()
   )
 })