fix tests for #124

Author: mpadge

DESCRIPTION

@@ -1,6 +1,6 @@
 Package: repometrics
 Title: Metrics for Your Code Repository
-Version: 0.1.6.142
+Version: 0.1.6.143
 Authors@R: 
     person("Mark", "Padgham", , "mark.padgham@email.com", role = c("aut", "cre"),
            comment = c(ORCID = "0000-0003-2172-5265"))

codemeta.json

@@ -8,7 +8,7 @@
   "codeRepository": "https://github.com/ropensci-review-tools/repometrics",
   "issueTracker": "https://github.com/ropensci-review-tools/repometrics/issues",
   "license": "https://spdx.org/licenses/GPL-3.0",
-  "version": "0.1.6.142",
+  "version": "0.1.6.143",
   "programmingLanguage": {
     "@type": "ComputerLanguage",
     "name": "R",

tests/testthat/helper-rm-data.R

@@ -42,13 +42,13 @@ mock_rm_data <- function (repo = TRUE) {
 
     # rm-data-user:
     logins <- c ("gaborcsardi", "hfrick", "mpadge")
-    ended_at <- as.POSIXct ("2024-01-01T00:00:00")
+    end_date <- as.POSIXct ("2024-01-01T00:00:00")
     for (login in logins) {
         prfx <- paste0 ("gh_user", match (login, logins), "_")
         pars <- list (
             login = login,
             n_per_page = 1L,
-            ended_at = ended_at,
+            end_date = end_date,
             nyears = 1
         )
         general <- httptest2::with_mock_dir (paste0 (prfx, "general"), {
@@ -81,9 +81,9 @@ mock_rm_data <- function (repo = TRUE) {
     writeLines (desc, desc_path)
 
     # test-cm-metrics.R only tests cran downloads for this one date:
-    end_date <- as.Date ("2024-08-01")
+    end_date_cran <- as.Date ("2024-08-01")
     dl <- httptest2::with_mock_dir ("cran_dl", {
-        cm_metric_cran_downloads (path, end_date = end_date)
+        cm_metric_cran_downloads (path, end_date = end_date_cran)
     })
 
     # The return full mocked data set:
@@ -104,7 +104,7 @@ mock_rm_data <- function (repo = TRUE) {
             pars <- list (
                 login = login,
                 n_per_page = 1L,
-                ended_at = ended_at,
+                end_date = end_date,
                 nyears = 1
             )
 

tests/testthat/helper-user-relations.R

@@ -46,7 +46,7 @@ mock_user_rel_data <- function () {
         date = rep (timestamp, 2L)
     )
     attr (commit_cmt, "started_at") <- timestamp_minus_year
-    attr (commit_cmt, "ended_at") <- timestamp
+    attr (commit_cmt, "end_date") <- timestamp
 
     issues <- data.frame (
         opened_at = rep (timestamp, 2L),
@@ -59,7 +59,7 @@ mock_user_rel_data <- function () {
         repo_languages = I (c ("R", "C"))
     )
     attr (issues, "started_at") <- timestamp_minus_year
-    attr (issues, "ended_at") <- timestamp
+    attr (issues, "end_date") <- timestamp
 
     issue_cmts <- data.frame (
         org_repo = commits$repo,

tests/testthat/test-data-rm-gh-user.R

@@ -80,12 +80,12 @@ test_that ("repometrics_data_user fn", {
     dat_mocked <- mock_rm_data (repo = FALSE)
 
     login <- "gaborcsardi"
-    ended_at <- as.POSIXct ("2024-01-01T00:00:00")
+    end_date <- as.POSIXct ("2024-01-01T00:00:00")
 
     dat <- repometrics_data_user (
         login = login,
         n_per_page = 1L,
-        ended_at = ended_at,
+        end_date = end_date,
         nyears = 1
     )
     expect_identical (dat, dat_mocked$gaborcsardi)

tests/testthat/test-data-rm.R

@@ -6,14 +6,14 @@ test_that ("repometrics data full", {
 
     data_repo <- repometrics_data_repo (path, num_cores = 1L)
 
-    ended_at <- as.POSIXct ("2024-01-01T00:00:00")
+    end_date <- as.POSIXct ("2024-01-01T00:00:00")
     logins <- data_repo$rm$contribs_from_gh_api$login
 
     data_ctbs <- lapply (logins, function (login) {
         repometrics_data_user (
             login = login,
             n_per_page = 1L,
-            ended_at = ended_at,
+            end_date = end_date,
             nyears = 1
         )
     })
@@ -22,7 +22,7 @@ test_that ("repometrics data full", {
     data <- repometrics_data (
         path,
         num_cores = 1L,
-        ended_at = ended_at,
+        end_date = end_date,
         nyears = 1
     )