Skip to content

Commit

Permalink
-Remove promises from IMPORTS
Browse files Browse the repository at this point in the history
-Add `skprGUI()` shinytest2 tests
  • Loading branch information
tylermorganwall committed Dec 5, 2023
1 parent 72d9a23 commit a76bab6
Show file tree
Hide file tree
Showing 45 changed files with 156 additions and 265 deletions.
1 change: 1 addition & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@

^_pkgdown\.yml$
^pkgdown$
_\.new\.png$
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,5 @@ src/*.o
src/*.so
src/*.dll
docs
# {shinytest2}: Ignore new debug snapshots for `$expect_values()`
*_.new.png
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ Imports:
doFuture,
progressr
LinkingTo: Rcpp, RcppEigen
Suggests: testthat, mbest, ggplot2, lmtest, cli, gridExtra, rintrojs, shinythemes, shiny, shinyjs, gt, shinytest2, promises
Suggests: testthat, mbest, ggplot2, lmtest, cli, gridExtra, rintrojs, shinythemes, shiny, shinyjs, gt, shinytest2
Encoding: UTF-8
URL: https://github.com/tylermorganwall/skpr,
https://tylermorganwall.github.io/skpr/
Expand Down
2 changes: 1 addition & 1 deletion R/skprGUI.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#'
# nocov start
skprGUI = function(browser = FALSE, return_app = FALSE, multiuser = FALSE) {
check_for_suggest_packages(c("shiny","shinythemes","shinyjs","gt","rintrojs", "promises"))
check_for_suggest_packages(c("shiny","shinythemes","shinyjs","gt","rintrojs"))
skpr_progress = getOption("skpr_progress", TRUE)

oplan = future::plan()
Expand Down
1 change: 1 addition & 0 deletions tests/testthat.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
Sys.setenv("R_TESTS" = "")

library(testthat)
library(shinytest2)

test_check("skpr")
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,14 @@

]
},
"separationwarning": ""
"separationwarning": {
"message": "",
"call": "NULL",
"type": [
"shiny.silent.error",
"validation"
]
}
},
"export": {

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,14 @@
],
"type": null
},
"separationwarning": ""
"separationwarning": {
"message": "",
"call": "NULL",
"type": [
"shiny.silent.error",
"validation"
]
}
},
"export": {

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -95,9 +95,9 @@
"deps": [
{
"name": "selectize",
"version": "0.12.4",
"version": "0.15.2",
"src": {
"href": "selectize-0.12.4"
"href": "selectize-0.15.2"
},
"meta": null,
"script": [
Expand All @@ -118,7 +118,14 @@

]
},
"separationwarning": ""
"separationwarning": {
"message": "",
"call": "NULL",
"type": [
"shiny.silent.error",
"validation"
]
}
},
"export": {

Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 1 addition & 5 deletions tests/testthat/apps/app.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,2 @@
library(skpr)

options("skpr_progress" = FALSE)
on.exit(options("skpr_progress" = NULL), add = TRUE)
skprGUI(return_app = TRUE)

skpr::skprGUI(return_app = TRUE)
1 change: 0 additions & 1 deletion tests/testthat/apps/tests/testthat.R

This file was deleted.

Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Diff not rendered.
Diff not rendered.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
library(shinytest2)
library(shiny)

test_that("{shinytest2} recording: apps", {
app <- AppDriver$new(variant = platform_variant(), name = "apps", height = 923,
options("skpr_progress" = FALSE)
on.exit(options("skpr_progress" = NULL), add = TRUE)
app <- AppDriver$new(app_dir = testthat::test_path("apps"),
variant = platform_variant(), name = "apps", height = 923,
width = 1619)
app$set_inputs(setseed = TRUE)
app$set_inputs(seed = 5)
Expand Down

0 comments on commit a76bab6

Please sign in to comment.