diff --git a/R/biocBuildReport.R b/R/biocBuildReport.R index 58acbc8..6e6ee9b 100644 --- a/R/biocBuildReport.R +++ b/R/biocBuildReport.R @@ -141,7 +141,7 @@ biocBuildReport <- function( vapply(depdf, function(x) identical(length(x), 0L), logical(1L)) ) if (!isEmpty) - y <- merge(y, depdf, by.x = "pkg", by.y = "Package") + y <- merge(y, depdf, by.x = "pkg", by.y = "Package", all.x = TRUE) df <- suppressMessages(left_join(y, z)) # just suppress "Joining by...." df <- as_tibble(df) diff --git a/tests/testthat/test_biocBuildReport.R b/tests/testthat/test_biocBuildReport.R index 4e41812..153d0a9 100644 --- a/tests/testthat/test_biocBuildReport.R +++ b/tests/testthat/test_biocBuildReport.R @@ -21,3 +21,17 @@ test_that("columns are consistent in report output", { expect_true(tibble::is_tibble(bioc3.14_build)) }) +test_that("non-software package types are not dropped (#21)", { + full_build <- biocBuildReport( + "devel", + pkgType = c( + "software", "data-experiment", "data-annotation", "workflows" + ) + ) + reported_types <- unique(full_build[["pkgType"]]) + expect_true(all( + c("data-annotation", "data-experiment", "workflows") %in% + reported_types + )) +}) +