Merge pull request #18 from ThinkR-open/fix-markdown-time

Fix markdown and time tests

Author: statnmap

.github/workflows/R-CMD-check.yaml

@@ -7,7 +7,7 @@ on:
     branches: [main, master]
   schedule:
     # * is a special character in YAML so you have to quote this string
-    - cron:  '59 23,11 * * 3'
+    - cron:  '01 00 * * 3'
 
 name: R-CMD-check
 

.github/workflows/test-coverage.yaml

@@ -3,11 +3,9 @@
 on:
   push:
     branches: [main, master]
-  pull_request:
-    branches: [main, master]
   schedule:
     # * is a special character in YAML so you have to quote this string
-    - cron:  '59 23,11 * * 3'
+    - cron:  '01 00 * * 3'
 
 name: test-coverage
 

tests/testthat/test-get_info_files.R

@@ -1,5 +1,5 @@
-time_before_date <- Sys.Date()
-time_before <- as.character(time_before_date)
+time_before <- Sys.time()
+Sys.sleep(1)
 
 repo_pkg <- fake_repo(as.package = TRUE)
 repo_no_pkg <- fake_repo()
@@ -10,27 +10,21 @@ infos <- get_info(files[grep("example", files)], repo = repo_pkg)
 infos_not_in_repo <- get_info(files[grep("my_mean", files)], repo = repo_pkg)
 
 # if check started one day and finishes the other day
-time_after_date <- Sys.Date()
-time_after <- as.character(time_after_date)
+Sys.sleep(1)
+time_after <- Sys.time()
 
 test_that("get_info works", {
   expect_true(infos$in_repository)
   expect_equal(infos$file, "example.txt")
 
-  expect_gte(as.Date(infos$last_modif), time_before_date)
-  expect_lte(as.Date(infos$last_modif), time_after_date)
-  expect_true(as.character(as.Date(infos$first_modif)) %in%
-                c(setNames(time_before, "first"), setNames(time_after, "first")))
-  expect_true(as.character(as.Date(infos$last_modif)) %in%
-                c(setNames(time_before, "last"), setNames(time_after, "first")))
+  expect_gte(infos$last_modif, time_before)
+  expect_lte(infos$last_modif, time_after)
 
   expect_false(infos_not_in_repo$in_repository)
   expect_equal(infos_not_in_repo$file, "R/my_mean.R")
   expect_true(is.na(infos_not_in_repo$first_modif))
-  expect_gte(as.Date(infos_not_in_repo$last_modif), time_before_date)
-  expect_lte(as.Date(infos_not_in_repo$last_modif), time_after_date)
-  expect_true(as.character(as.Date(infos_not_in_repo$last_modif)) %in%
-               c(setNames(time_before, "last"), setNames(time_after, "first")))
+  expect_gte(infos_not_in_repo$last_modif, time_before)
+  expect_lte(infos_not_in_repo$last_modif, time_after)
 })
 
 # get_last_modif ----

tests/testthat/test-git_down.R

@@ -12,12 +12,14 @@ if (rmarkdown::pandoc_available("1.12.3")) {
     )
   })
   lines <- readLines(file.path(dirname(res), "section-issue.html"))
-  one_line_exists <- grep('<h2><span class="header-section-number">1.2</span> Issue: #1</h2>',
-                          lines, fixed = TRUE)
-  sub_commit_1 <- grep('<h3><span class="header-section-number">1.2.1</span> commit: example: modification</h3>',
-                       lines, fixed = TRUE)
-  sub_commit_2 <- grep('<h3><span class="header-section-number">1.2.2</span> commit: Add NEWS</h3>',
-                       lines, fixed = TRUE)
+  # like <h2><span>1.2</span> Issue: #1</h2>',
+  one_line_exists <- grep('h2.+1[.]2.+Issue: #1.+h2', lines, fixed = FALSE)
+  # like <h3><span>1.2.1</span> commit: example: modification</h3>',
+  sub_commit_1 <- grep('h3.+1[.]2[.]1.+commit: example: modification.+h3',
+                       lines, fixed = FALSE)
+  # like <h3><span>1.2.2</span> commit: Add NEWS</h3>',
+  sub_commit_2 <- grep('h3.+1[.]2[.]2.+commit: Add NEWS.+h3',
+                       lines, fixed = FALSE)
 
   test_that("git_down function",{
     expect_match(res, regexp = ".html")
@@ -39,8 +41,9 @@ if (rmarkdown::pandoc_available("1.12.3")) {
   })
 
   lines <- readLines(file.path(dirname(res), "section-digit.html"))
-  one_line_exists <- grep('<h2><span class="header-section-number">1.2</span> <code>#--:digit:--+</code>: #1</h2>',
-                          lines, fixed = TRUE)
+  # like <h2><span>1.2</span> <code>#--:digit:--+</code>: #1</h2>',
+  one_line_exists <- grep('h2.+1[.]2.+<code>#--:digit:--\\+</code>: #1.+h2',
+                          lines, fixed = FALSE)
 
   test_that("git_down no name function",{
     expect_match(res, regexp = ".html")
@@ -69,14 +72,16 @@ if (rmarkdown::pandoc_available("1.12.3")) {
     expect_true(file.exists(tickets_file))
 
     lines <- readLines(tickets_file)
-    one_line_ticket_exists <- grep('<h2><span class="header-section-number">1.2</span> Ticket: ticket1234</h2>',
-                                   lines, fixed = TRUE)
+    # like <h2><span>1.2</span> Ticket: ticket1234</h2>'
+    one_line_ticket_exists <- grep('h2.*1.2.*Ticket: ticket1234.*h2',
+                                   lines, fixed = FALSE)
 
     expect_true(length(one_line_ticket_exists) == 1)
 
     lines <- readLines(issues_file)
-    one_line_exists <- grep('<h2><span class="header-section-number">2.2</span> Issue: #1</h2>',
-                            lines, fixed = TRUE)
+    # like <h2><span>2.2</span> Issue: #1</h2>',
+    one_line_exists <- grep('h2.+2[.]2.+Issue: #1.+h2',
+                            lines, fixed = FALSE)
     expect_true(length(one_line_exists) == 1)
   })