CRAN 0.4.10-1 Release (#14)

* Check reactive class value using `shiny::is.reactive()` (#25) * Check reactive class value using `inherits` * Use `shiny::is.reactive()` instead of `inherits()` * Accepted by CRAN (#26) * CRAN release 0.4.10-1 (#28) Co-authored-by: Barret Schloerke <[email protected]>
cb4ds · May 23, 2020 · a67bbd1 · a67bbd1
1 parent aab9a1a
commit a67bbd1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 16 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: periscope
 Type: Package
 Title: Enterprise Streamlined 'Shiny' Application Framework
-Version: 0.4.9-1
+Version: 0.4.10-1
 Authors@R: c(
     person("Constance", "Brett", email="[email protected]", role = c("aut", "cre")),
     person("Isaac", "Neuhaus", role = "aut", comment = "canvasXpress JavaScript Library Maintainer"),
@@ -31,7 +31,7 @@ Imports:
     DT (>= 0.2),
     openxlsx (>= 3.0),
     ggplot2 (>= 2.2)
-RoxygenNote: 7.0.2
+RoxygenNote: 7.1.0
 Suggests:
     knitr,
     rmarkdown,

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,7 @@
 #Revisions and Change Log
 
+### v0.4.10-1
+* Fixed tests for compatibility with the next release of shiny
 
 ### v0.4.9-1
 * Fixed url typo in readme link

diff --git a/cran-comments.md b/cran-comments.md
@@ -1,10 +1,8 @@
 ## Comments from Maintainer
 
-Enhancements, bug fixes and additional functionality as detailed in News
+This is a very minor correction to our just-accepted 0.4.10 release - we missed a file change in the merge for the release, apologies in advance.
 
-Fixed typo in one url in the README file.  
-
-NOTE: I'm seeing URLs occasionally giving 'could not resolve' notes on urls that are valid, I think it is likely an internet connectivity/slowdown issue where not enough time is given to the request to check the URL.  The https://www.canvasxpress.org url is valid, the certificate matches, and the site is up and accessible.  If you know of a way to deal with this on my end I'm happy to resolve it but will need some additional input on what to set/etc.
+Fixed tests based on input from Barret Schloerke in preparation for the next release of shiny to CRAN next week.
 
 ---  
 
@@ -13,15 +11,15 @@ NOTE: I'm seeing URLs occasionally giving 'could not resolve' notes on urls that
 
 RStudio Server Pro (Ubuntu 18.04.2)  
 
-* R 3.4.4  
 * R 3.5.3  
-* R 3.6.2
+* R 3.6.3
+* R 4.0.0
 
 Travis-CI (Ubuntu 16.04.6)
 
 * R 3.5.3
-* R 3.6.2
-* R devel (2020-03-13 r77948)
+* R 3.6.3
+* R devel (2020-05-04 r78358)
 
 WinBuilder
 
@@ -31,10 +29,7 @@ WinBuilder
 
 RHub
 
-* devtools::check_rhub(interactive = F)  
-  * Ubuntu Linux 16.04 LTS, R-release, GCC
-  * Windows Server 2008 R2 SP1, R-devel, 32/64 bit
-  * Fedora Linux, R-devel, clang, gfortran
+* devtools::check_rhub(interactive = F)
 
 ---  
 

diff --git a/tests/testthat/test_ui_misc_functions.R b/tests/testthat/test_ui_misc_functions.R
@@ -34,15 +34,15 @@ test_that("fw_get_user_log", {
 
 test_that("setup_logging", {
     result <- shiny::isolate(.setup_logging(NULL, periscope:::fw_get_user_log()))
-    expect_equal(class(result), c("reactiveExpr", "reactive"))
+    expect_true(shiny::is.reactive(result))
 })
 
 test_that("setup_logging existing log", {
     logger <- periscope:::fw_get_user_log()
     file.create(paste0(paste(log_directory, logger$name, sep = .Platform$file.sep), ".log"))
 
     result <- shiny::isolate(.setup_logging(NULL,logger))
-    expect_equal(class(result), c("reactiveExpr", "reactive"))
+    expect_true(shiny::is.reactive(result))
 })
 
 test_that("fw_reset_app_options", {