From 1f43b558e545ce31ce4ae66d5b2400cbca196075 Mon Sep 17 00:00:00 2001 From: Jan Marvin Garbuszus Date: Fri, 18 Aug 2023 00:30:32 +0200 Subject: [PATCH] [wb_load] add path to object on. closes #741 (#742) * [wb_load] add path to object on * fix test --- R/wb_load.R | 1 + tests/testthat/test-read_from_created_wb.R | 14 ++++++++++++++ tests/testthat/test-read_sources.R | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/R/wb_load.R b/R/wb_load.R index 377f28514..d33887961 100644 --- a/R/wb_load.R +++ b/R/wb_load.R @@ -65,6 +65,7 @@ wb_load <- function( xmlFiles <- xmlFiles[ordr] wb <- wb_workbook() + wb$path <- file grep_xml <- function(pattern, perl = TRUE, value = TRUE, ...) { # targets xmlFiles; has presents diff --git a/tests/testthat/test-read_from_created_wb.R b/tests/testthat/test-read_from_created_wb.R index 35a8c7e33..085303956 100644 --- a/tests/testthat/test-read_from_created_wb.R +++ b/tests/testthat/test-read_from_created_wb.R @@ -173,3 +173,17 @@ test_that("reading with pre defined types works", { expect_equal(got, dat, ignore_attr = TRUE) }) + +test_that("wb_load contains path", { + + tmp <- temp_xlsx() + wb_workbook()$add_worksheet()$add_worksheet()$save(tmp) + wb_load(tmp)$remove_worksheet()$save() + + wb <- wb_load(tmp) + + exp <- c(`Sheet 1` = "Sheet 1") + got <- wb$get_sheet_names() + expect_equal(exp, got) + +}) diff --git a/tests/testthat/test-read_sources.R b/tests/testthat/test-read_sources.R index 05dd8db42..d136bc918 100644 --- a/tests/testthat/test-read_sources.R +++ b/tests/testthat/test-read_sources.R @@ -37,7 +37,7 @@ test_that("wb_load from different sources", { wb_file <- wb_load(xlsxFile) # Loading from URL vs local not equal - expect_equal_workbooks(wb_url, wb_file, ignore_fields = "datetimeCreated") + expect_equal_workbooks(wb_url, wb_file, ignore_fields = c("datetimeCreated", "path")) })