Skip to content

Commit e8ef2f9

Browse files
committed
More useful string tests on failure with expect_match
1 parent 594ea25 commit e8ef2f9

1 file changed

Lines changed: 19 additions & 19 deletions

File tree

tests/testthat/test-reactable.R

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1395,12 +1395,12 @@ test_that("static rendering", {
13951395
elementId = "stable-id-static-rendering"
13961396
)
13971397
rendered <- htmltools::renderTags(tbl)
1398-
expect_true(grepl("data-react-ssr", rendered$html))
1399-
expect_true(grepl(">column-y-cell<", rendered$html))
1398+
expect_match(rendered$html, "data-react-ssr", fixed = TRUE)
1399+
expect_match(rendered$html, ">column-y-cell<", fixed = TRUE)
14001400
expect_snapshot(cat(rendered$html))
14011401

14021402
# JS evals should always be serialized as an array
1403-
expect_true(grepl('"evals":[]', rendered$html, fixed = TRUE))
1403+
expect_match(rendered$html, '"evals":[]', fixed = TRUE)
14041404

14051405
# Themes critical CSS should be included in <head>
14061406
tbl <- reactable(
@@ -1429,8 +1429,8 @@ test_that("static rendering", {
14291429
elementId = "stable-id-custom-js-evals"
14301430
)
14311431
rendered <- htmltools::renderTags(tbl)
1432-
expect_true(grepl("js-rendered_2_", rendered$html))
1433-
expect_true(grepl("<b>column-y-cell</b>", rendered$html))
1432+
expect_match(rendered$html, "js-rendered_2_", fixed = TRUE)
1433+
expect_match(rendered$html, "<b>column-y-cell</b>", fixed = TRUE)
14341434
expect_snapshot(cat(rendered$html))
14351435

14361436
# Custom render functions and JS evals that call React externally should work
@@ -1443,7 +1443,7 @@ test_that("static rendering", {
14431443
elementId = "stable-id-external-React"
14441444
)
14451445
rendered <- htmltools::renderTags(tbl)
1446-
expect_true(grepl("<b>column-y-cell</b>", rendered$html))
1446+
expect_match(rendered$html, "<b>column-y-cell</b>", fixed = TRUE)
14471447
expect_snapshot(cat(rendered$html))
14481448

14491449
# Known limitation: default expanded rows with defaultExpanded = TRUE is not currently supported.
@@ -1505,17 +1505,17 @@ test_that("static rendering", {
15051505
)
15061506
rendered <- htmltools::renderTags(tbl)
15071507
html <- rendered$html
1508-
expect_true(grepl("pre_str_suffix", html, fixed = TRUE))
1509-
expect_true(grepl(">75%<", html, fixed = TRUE))
1510-
expect_true(grepl(">52.9%<", html, fixed = TRUE))
1511-
expect_true(grepl(">$10.00<", html, fixed = TRUE))
1512-
expect_true(grepl(">€11.12<", html, fixed = TRUE))
1513-
expect_true(grepl(">1,234.1<", html, fixed = TRUE))
1514-
expect_true(grepl(">₹1,234,567.40<", html, fixed = TRUE))
1508+
expect_match(html, "pre_str_suffix", fixed = TRUE)
1509+
expect_match(html, ">75%<", fixed = TRUE)
1510+
expect_match(html, ">52.9%<", fixed = TRUE)
1511+
expect_match(html, ">$10.00<", fixed = TRUE)
1512+
expect_match(html, ">€11.12<", fixed = TRUE)
1513+
expect_match(html, ">1,234.1<", fixed = TRUE)
1514+
expect_match(html, ">₹1,234,567.40<", fixed = TRUE)
15151515
# Date/time formatting depends on the local timezone, which can't easily be controlled in tests
1516-
expect_false(grepl("_date_2019-05-06T03:22:15Z_date_", html))
1516+
expect_no_match(html, "_date_2019-05-06T03:22:15Z_date_", fixed = TRUE)
15171517
html <- sub(">_date_.+_date_<", ">_date_replaced_date_<", html)
1518-
expect_false(grepl("_time_2019-05-06T03:22:15Z_time_", html))
1518+
expect_no_match(html, "_time_2019-05-06T03:22:15Z_time_", fixed = TRUE)
15191519
html <- sub(">_time_.+_time_<", ">_time_replaced_time_<", html)
15201520
expect_snapshot_html_with_utf8(html)
15211521

@@ -1527,16 +1527,16 @@ test_that("static rendering", {
15271527
elementId = "stable-id-CSR-fallback"
15281528
)
15291529
expect_warning({ rendered <- htmltools::renderTags(tbl) }, "Failed to render table to static HTML:\nError: error rendering JS")
1530-
expect_false(grepl("data-react-ssr", rendered$html))
1531-
expect_false(grepl(">column-y-cell<", rendered$html))
1530+
expect_no_match(rendered$html, "data-react-ssr", fixed = TRUE)
1531+
expect_no_match(rendered$html, ">column-y-cell<", fixed = TRUE)
15321532
expect_snapshot(cat(rendered$html))
15331533

15341534
# Custom knit_print method should work
15351535
tbl <- reactable(data, static = TRUE)
15361536
output <- knitr::knit_print(tbl, options = list(screenshot.force = FALSE))
1537-
expect_true(grepl("data-react-ssr", output))
1537+
expect_match(output, "data-react-ssr", fixed = TRUE)
15381538

15391539
tbl <- reactable(data)
15401540
output <- knitr::knit_print(tbl, options = list(screenshot.force = FALSE))
1541-
expect_false(grepl("data-react-ssr", output))
1541+
expect_no_match(output, "data-react-ssr", fixed = TRUE)
15421542
})

0 commit comments

Comments
 (0)