Merge branch 'main' into close-enough

SchlossLab · Oct 25, 2021 · 7e905cc · 7e905cc
2 parents 91fbdb8 + 8e7d8cd
commit 7e905cc
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 35 deletions.
diff --git a/docs/articles/introduction.html b/docs/articles/introduction.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -3,5 +3,5 @@ pkgdown: 1.6.1
 pkgdown_sha: ~
 articles:
   introduction: introduction.html
-last_built: 2021-05-19T19:53Z
+last_built: 2021-10-25T17:27Z
 
diff --git a/docs/reference/read_dist.html b/docs/reference/read_dist.html
diff --git a/docs/reference/read_tax.html b/docs/reference/read_tax.html
diff --git a/tests/testthat/test-rmd_helpers.R b/tests/testthat/test-rmd_helpers.R
@@ -24,23 +24,13 @@ test_that("inline_hook() uses paste_oxford_list() and format_number() correctly"
 
 test_that("set_knitr_opts() works", {
   chunk <- list(
-    eval = TRUE, echo = FALSE, results = "markup", tidy = TRUE,
-    tidy.opts = NULL, collapse = FALSE, prompt = FALSE, comment = "##",
-    highlight = TRUE, strip.white = TRUE, size = "normalsize",
-    background = "#F7F7F7", cache = FALSE, cache.path = "cache/",
-    cache.vars = NULL, cache.lazy = TRUE, dependson = NULL, autodep = FALSE,
-    cache.rebuild = FALSE, fig.keep = "high", fig.show = "asis",
-    fig.align = "default", fig.path = "figure/", dev = NULL,
-    dev.args = NULL, dpi = 72, fig.ext = NULL, fig.width = 7,
-    fig.height = 7, fig.env = "figure", fig.cap = NULL, fig.scap = NULL,
-    fig.lp = "fig:", fig.subcap = NULL, fig.pos = "", out.width = NULL,
-    out.height = NULL, out.extra = NULL, fig.retina = 1, external = TRUE,
-    sanitize = FALSE, interval = 1, aniopts = "controls,loop",
-    warning = FALSE, error = TRUE, message = TRUE, render = NULL,
-    ref.label = NULL, child = NULL, engine = "R", split = FALSE,
-    include = TRUE, purl = TRUE
+    tidy = TRUE,
+    echo = FALSE,
+    eval = TRUE,
+    warning = FALSE,
+    cache = FALSE
   )
   set_knitr_opts()
-  expect_equal(knitr::opts_chunk$get(), chunk)
+  expect_equal(knitr::opts_chunk$get()[names(chunk)], chunk)
   expect_equal(knitr::knit_hooks$get("inline"), inline_hook)
 })