diff --git a/data/cran_to_spdx.rda b/data/cran_to_spdx.rda index 6d408fc..2555f31 100644 Binary files a/data/cran_to_spdx.rda and b/data/cran_to_spdx.rda differ diff --git a/tests/testthat/_snaps/cff_create.md b/tests/testthat/_snaps/cff_create.md index 6578e1a..9d94f0e 100644 --- a/tests/testthat/_snaps/cff_create.md +++ b/tests/testthat/_snaps/cff_create.md @@ -328,11 +328,13 @@ - family-names: Boettiger given-names: Carl email: cboettig@gmail.com + orcid: https://orcid.org/0000-0002-1642-628X url: https://httpbin.org/status/404 contact: - family-names: Boettiger given-names: Carl email: cboettig@gmail.com + orcid: https://orcid.org/0000-0002-1642-628X keywords: - metadata - codemeta diff --git a/tests/testthat/_snaps/utils-create.md b/tests/testthat/_snaps/utils-create.md index 0c356ee..e6367ef 100644 --- a/tests/testthat/_snaps/utils-create.md +++ b/tests/testthat/_snaps/utils-create.md @@ -1034,6 +1034,7 @@ - family-names: Boettiger given-names: Carl email: cboettig@gmail.com + orcid: https://orcid.org/0000-0002-1642-628X abstract: Codemeta defines a 'JSON-LD' format for describing software metadata. This package provides utilities to generate, parse, and modify codemeta.jsonld files automatically for R packages. @@ -1042,6 +1043,7 @@ - family-names: Boettiger given-names: Carl email: cboettig@gmail.com + orcid: https://orcid.org/0000-0002-1642-628X keywords: - metadata - codemeta diff --git a/tests/testthat/test-cff_create.R b/tests/testthat/test-cff_create.R index 591fe61..8531f6f 100644 --- a/tests/testthat/test-cff_create.R +++ b/tests/testthat/test-cff_create.R @@ -295,10 +295,11 @@ test_that("Parsing many persons", { test_that("Parsing wrong urls", { - rvers <- getRversion() - skip_if(rvers <= "4.4.1", "Snapshot created with R 4.5.0") skip_on_cran() + rvers <- getRversion() + skip_if(rvers < "4.4.1", "Snapshot created with R 4.4.*") + desc_path <- system.file("examples/DESCRIPTION_wrong_urls", package = "cffr") a_cff <- cff_create(desc_path, diff --git a/tests/testthat/test-methods.R b/tests/testthat/test-methods.R index eff44e6..c8acdc1 100644 --- a/tests/testthat/test-methods.R +++ b/tests/testthat/test-methods.R @@ -135,6 +135,7 @@ test_that("Convert list of authors", { test_that("as.person method", { + path <- system.file("examples/CITATION_complete.cff", package = "cffr") the_cff <- cff_read(path) @@ -228,8 +229,6 @@ test_that("head and tail", { }) test_that("toBibtex", { - rvers <- getRversion() - skip_if(rvers <= "4.4.1", "Snapshot created with R 4.5.0") skip_on_os("mac") skip_on_os("linux") skip_on_os("solaris") diff --git a/tests/testthat/test-utils-create.R b/tests/testthat/test-utils-create.R index 62b02e6..0acbeb4 100644 --- a/tests/testthat/test-utils-create.R +++ b/tests/testthat/test-utils-create.R @@ -1,6 +1,6 @@ test_that("Merge all DESCRIPTION files with CITATION_basic", { rvers <- getRversion() - skip_if(rvers <= "4.4.1", "Snapshot created with R 4.5.0") + skip_if(rvers < "4.4.1", "Snapshot created with R 4.4.*") skip_on_cran() allfiles <- list.files(