diff --git a/.Rbuildignore b/.Rbuildignore index a9288d9..5e02156 100644 --- a/.Rbuildignore +++ b/.Rbuildignore @@ -1,3 +1,5 @@ +^paper$ +^CRAN-RELEASE$ ^.*\.Rproj$ ^\.Rproj\.user$ ^cran-comments\.md$ diff --git a/.gitignore b/.gitignore index c833a2c..17b15dd 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ .RData .Ruserdata inst/doc +paper diff --git a/DESCRIPTION b/DESCRIPTION index 5b3a5a5..6b206f2 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: apa Type: Package Title: Format Outputs of Statistical Tests According to APA Guidelines -Version: 0.3.1 +Version: 0.3.2 Authors@R: person("Daniel", "Gromer", email = "dgromer@mailbox.org", role = c("aut", "cre")) Description: Formatter functions in the 'apa' package take the return value of a statistical test function, e.g. a call to chisq.test() and return a string @@ -25,5 +25,5 @@ Suggests: knitr Encoding: UTF-8 LazyData: true -RoxygenNote: 6.1.0 +RoxygenNote: 6.1.1 VignetteBuilder: knitr diff --git a/NEWS.md b/NEWS.md index f90d216..131d689 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,10 @@ +# apa 0.3.2 + +## Bug fixes + +* Fix a test that returned a wrong result in r-devel (t-test now returns a list + with more elements). + # apa 0.3.1 ## Bug fixes diff --git a/cran-comments.md b/cran-comments.md index cd1d7e7..3506668 100644 --- a/cran-comments.md +++ b/cran-comments.md @@ -1,6 +1,6 @@ ## Test environments * local Windows 10 Professional 64-bit install, R 3.5.1 -* local Ubuntu 18.04 64-bit install, R 3.5.1 +* devtools::check_win_devel() * rhub::check_with_rdevel() ## R CMD check results diff --git a/tests/testthat/test-t-test.R b/tests/testthat/test-t-test.R index e3e04b3..2b871fb 100644 --- a/tests/testthat/test-t-test.R +++ b/tests/testthat/test-t-test.R @@ -1,7 +1,14 @@ context("t_test") test_that("t_test equals to t.test", { - expect_equal(t.test(1:10, y = c(7:20))[], t_test(1:10, y = c(7:20))[-10]) + + x <- t.test(1:10, y = c(7:20))[] + + y <- t_test(1:10, y = c(7:20)) + # Remove 'data' entry + y <- y[!(names(y) == "data")] + + expect_equal(x, y) }) test_that("t_test returns input data", {