Merge pull request #488 from ycphs/gh_issue_485

fix warning thrown in (un)groupRows. closes #485
ycphs · Aug 1, 2024 · ab2be82 · ab2be82
2 parents 89917b6 + a13fa67
commit ab2be82
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/R/wrappers.R b/R/wrappers.R
@@ -4611,7 +4611,7 @@ groupRows <- function(wb, sheet, rows, hidden = FALSE) {
     stop("Hidden should be a logical value (TRUE/FALSE).")
   }
 
-  if (any(rows) < 1L) {
+  if (any(rows < 1L)) {
     stop("Invalid rows entered (<= 0).")
   }
 
@@ -4653,7 +4653,7 @@ ungroupRows <- function(wb, sheet, rows) {
 
   sheet <- wb$validateSheet(sheet)
 
-  if (any(rows) < 1L) {
+  if (any(rows < 1L)) {
     stop("Invalid rows entered (<= 0).")
   }
 

diff --git a/tests/testthat/test-outlines.R b/tests/testthat/test-outlines.R
@@ -52,13 +52,34 @@ test_that("ungroup columns", {
 
 test_that("ungroup rows", {
   wb <- createWorkbook()
-  assign("wb", wb, envir = .GlobalEnv)
   addWorksheet(wb, "Sheet 1")
   groupRows(wb, "Sheet 1", 1:3, hidden = T)
   ungroupRows(wb, "Sheet 1", 1:3)
 
   expect_equal(length(wb$outlineLevels[[1]]), 0L)
-  rm(wb)
+})
+
+test_that("no warnings #485", {
+
+  wb <- createWorkbook()
+  addWorksheet(wb, "Sheet 1")
+
+  expect_silent(
+    groupRows(
+      rows = c(1),
+      sheet = "Sheet 1",
+      wb = wb
+    )
+  )
+
+  expect_silent(
+    ungroupRows(
+      rows = c(1),
+      sheet = "Sheet 1",
+      wb = wb
+    )
+  )
+
 })