From 4cbb5a530698c1ded1da035f1c1e92ef244810cb Mon Sep 17 00:00:00 2001 From: Melkiades Date: Wed, 20 Nov 2024 14:11:52 +0100 Subject: [PATCH 1/4] correct printing output --- DESCRIPTION | 2 +- tests/testthat/test-printing.R | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index c1fe9aa5f..bab8590da 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -29,7 +29,7 @@ URL: https://github.com/insightsengineering/rtables, https://insightsengineering.github.io/rtables/ BugReports: https://github.com/insightsengineering/rtables/issues Depends: - formatters (>= 0.5.9), + formatters (>= 0.5.9.9004), magrittr (>= 1.5), methods, R (>= 2.10) diff --git a/tests/testthat/test-printing.R b/tests/testthat/test-printing.R index 20490f1b5..ec592225d 100644 --- a/tests/testthat/test-printing.R +++ b/tests/testthat/test-printing.R @@ -656,17 +656,25 @@ test_that("row label indentation is kept even if there are newline characters", test_that("Support for newline characters in all the parts", { out <- strsplit(toString(tt_for_nl, hsep = "-"), "\\n")[[1]] + mf <- matrix_form(tt_for_nl, TRUE) + + # topleft is correctly aligned + expect_equal( + mf$strings[seq(mf_nlheader(mf)), 1], + unlist(strsplit(paste0(top_left(tt_for_nl), collapse = "\n"), "\n")) + ) + expected <- c( "why not", "also here", "", "---------------------------------", " ", - " ARM ", - " ", - "a A ", - "b A wo", - "d TWO ", + "a ARM ", + "b ", + "d A ", + " A wo", + " TWO ", "c words rd ", "---------------------------------", "m ", From 4c15d5d9ae0a91be5cf010cdf30d0a32c5fc5efd Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 13:14:52 +0000 Subject: [PATCH 2/4] [skip style] [skip vbump] Restyle files --- tests/testthat/test-printing.R | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/testthat/test-printing.R b/tests/testthat/test-printing.R index ec592225d..74b4ca3b5 100644 --- a/tests/testthat/test-printing.R +++ b/tests/testthat/test-printing.R @@ -657,13 +657,13 @@ test_that("row label indentation is kept even if there are newline characters", test_that("Support for newline characters in all the parts", { out <- strsplit(toString(tt_for_nl, hsep = "-"), "\\n")[[1]] mf <- matrix_form(tt_for_nl, TRUE) - + # topleft is correctly aligned expect_equal( mf$strings[seq(mf_nlheader(mf)), 1], unlist(strsplit(paste0(top_left(tt_for_nl), collapse = "\n"), "\n")) ) - + expected <- c( "why not", "also here", From 2aabace55353a425b74c2a4ac490927b8df5eaf4 Mon Sep 17 00:00:00 2001 From: Melkiades Date: Wed, 20 Nov 2024 15:37:22 +0100 Subject: [PATCH 3/4] empty From 3ba7ab749efeb0f7b0aa90a3b0469e89665d2501 Mon Sep 17 00:00:00 2001 From: shajoezhu Date: Tue, 26 Nov 2024 14:02:45 +0800 Subject: [PATCH 4/4] update docs build with r depdencies --- .github/workflows/docs.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/docs.yaml b/.github/workflows/docs.yaml index 6b3ad6634..7101615f7 100644 --- a/.github/workflows/docs.yaml +++ b/.github/workflows/docs.yaml @@ -22,6 +22,8 @@ jobs: secrets: REPO_GITHUB_TOKEN: ${{ secrets.REPO_GITHUB_TOKEN }} with: - sd-direction: upstream + deps-installation-method: setup-r-dependencies + lookup-refs: | + insightsengineering/formatters default-landing-page: latest-tag additional-unit-test-report-directories: unit-test-report-non-cran