Skip to content

Commit 4fff6f0

Browse files
a kludge for ancient windows (probably ancient knitr?)
1 parent 478d3f5 commit 4fff6f0

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

inst/tests/other.Rraw

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,8 @@ if (loaded[["dplyr"]]) {
102102
DT = data.table(A=c("b","c","a"), B=10:12)
103103
setindex(DT, A)
104104
DT2 = dplyr::arrange(DT, A)
105-
test(2.2, DT2[A=="c"], data.table(A="c", B=11L))
105+
# old versions of dplyr might coerce to tbl or data.frame
106+
if (is.data.table(DT2)) test(2.2, DT2[A=="c"], data.table(A="c", B=11L))
106107
}
107108

108109
if (FALSE) { # loaded[["reshape"]]
@@ -203,6 +204,8 @@ if (loaded[["knitr"]]) {
203204
tmp = tempfile()
204205
on.exit({unlink(tmp); options(old)})
205206
invisible(knit(testDir("knitr.Rmd"), tmp, quiet=TRUE))
207+
# TODO(R>=3.6.0): Try removing this kludge
208+
if (packageVersion("knitr") < "1.45") writeLines(gsub("^```\\s*r", "```r", readLines(tmp)))
206209
test(11.2, tools::Rdiff(tmp, testDir("knitr.md.save")), 0L)
207210
})
208211
}

0 commit comments

Comments
 (0)