Skip to content

Commit

Permalink
Fixes CRAN checks from win-devel
Browse files Browse the repository at this point in the history
  • Loading branch information
cimentadaj committed Oct 15, 2019

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent 7219837 commit 7ecb849
Showing 5 changed files with 39 additions and 30 deletions.
35 changes: 18 additions & 17 deletions .Rbuildignore
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
^appveyor\.yml$
^.*\.Rproj$
^\.Rproj\.user$
^packrat/
^\.Rprofile$
^README.Rmd
^\.travis\.yml$
^cran-comments\.md$
^CONDUCT\.md$
^revdep$
^codecov\.yml$
^LICENSE\.md$
^docs$
^\.github$
^codemeta\.json$
^intro_ropensci\.*$
^intro_ropensci.Rmd$
^appveyor\.yml$
^.*\.Rproj$
^\.Rproj\.user$
^packrat/
^\.Rprofile$
^README.Rmd
^\.travis\.yml$
^cran-comments\.md$
^CONDUCT\.md$
^revdep$
^codecov\.yml$
^LICENSE\.md$
^docs$
^\.github$
^codemeta\.json$
^intro_ropensci\.*$
^intro_ropensci.Rmd$
^CRAN-RELEASE$
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
@@ -128,6 +128,6 @@ This will save the ESS rounds into separate folders and unzip them in the specif

---

Please note that this project is released with a [Contributor Code of Conduct](CONDUCT.md). By participating in this project you agree to abide by its terms.
Please note that this project is released with a [Contributor Code of Conduct](https://ropensci.github.io/essurvey/CONDUCT.html). By participating in this project you agree to abide by its terms.

[![ropensci_footer](https://ropensci.org/public_images/ropensci_footer.png)](https://ropensci.org)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -186,7 +186,7 @@ R with the `haven` package for all `essurvey` related functions to work.
-----

Please note that this project is released with a [Contributor Code of
Conduct](CONDUCT.md). By participating in this project you agree to
abide by its terms.
Conduct](https://ropensci.github.io/essurvey/CONDUCT.html). By
participating in this project you agree to abide by its terms.

[![ropensci\_footer](https://ropensci.org/public_images/ropensci_footer.png)](https://ropensci.org)
19 changes: 12 additions & 7 deletions tests/testthat/test-3-rounds.R
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# Environment variables from Travis CI
ess_email <- Sys.getenv("ess_email")

round_one <- import_rounds(1, ess_email)
run_tests <- Sys.getenv("NOT_CRAN") == "true"
if (run_tests) {
# Environment variables from Travis CI
ess_email <- Sys.getenv("ess_email")
round_one <- import_rounds(1, ess_email)
}

# Test for all rounds
available_rounds <- show_rounds()
all_rounds <- import_rounds(available_rounds, ess_email)


if (run_tests) {
# Test for all rounds
available_rounds <- show_rounds()
all_rounds <- import_rounds(available_rounds, ess_email)
}

test_that("import_rounds checks for args", {
expect_error(import_rounds(numeric()),
9 changes: 6 additions & 3 deletions tests/testthat/test-4-recode_missings.R
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
context("test-recode_missings.R")

ess_email <- Sys.getenv("ess_email")
round_seven <- import_rounds(7, ess_email)
run_tests <- Sys.getenv("NOT_CRAN") == "true"
if (run_tests) {
ess_email <- Sys.getenv("ess_email")
round_seven <- import_rounds(7, ess_email)
}

test_that("recoded object is a df", {
skip_on_cran()
2

recode_esp <- recode_missings(round_seven)
expect_is(recode_esp, "data.frame")
})

0 comments on commit 7ecb849

Please sign in to comment.