Merge branch 'main' into selenium

ashbythorpe · Nov 3, 2023 · c01dd4d · c01dd4d
2 parents a30aed2 + 7ebfd14
commit c01dd4d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/R/global_actions.R b/R/global_actions.R
@@ -36,7 +36,7 @@ open_url <- function(url, session = NULL) {
   driver <- session$driver
 
   if (session$session == "chromote") {
-    promise <- driver$Page$loadEventFired(wait_ = FALSE)
+    promise <- driver$Page$loadEventFired(wait_ = FALSE, timeout_ = 60)
     driver$Page$navigate(url, wait_ = FALSE)
     driver$wait_for(promise)
   } else {
@@ -96,7 +96,7 @@ back <- function(session = NULL) {
     if (index > 1) {
       new_id <- history[[index - 1]]$id
 
-      promise <- driver$Page$loadEventFired(wait_ = FALSE)
+      promise <- driver$Page$loadEventFired(wait_ = FALSE, timeout_ = 60)
       driver$Page$navigateToHistoryEntry(new_id, wait_ = FALSE)
       driver$wait_for(promise)
     } else {
@@ -130,7 +130,7 @@ forward <- function(session = NULL) {
     if (index < length(history)) {
       new_id <- history[[index + 1]]$id
 
-      promise <- driver$Page$loadEventFired(wait_ = FALSE)
+      promise <- driver$Page$loadEventFired(wait_ = FALSE, timeout_ = 60)
       driver$Page$navigateToHistoryEntry(new_id, wait_ = FALSE)
       driver$wait_for(promise)
     } else {
@@ -179,7 +179,7 @@ reload <- function(session = NULL) {
   driver <- session$driver
 
   if (session$session == "chromote") {
-    promise <- driver$Page$loadEventFired(wait_ = FALSE)
+    promise <- driver$Page$loadEventFired(wait_ = FALSE, timeout_ = 60)
     session$driver$Page$reload(wait_ = FALSE)
     driver$wait_for(promise)
   } else {

diff --git a/R/utils.R b/R/utils.R
@@ -82,8 +82,7 @@ selenider_available <- function(session = c("chromote", "selenium"), online = TR
   if (session == "chromote") {
     is_installed("chromote") && tryCatch(
       {
-        chromote::find_chrome()
-        TRUE
+        !is.null(suppressMessages(chromote::find_chrome()))
       },
       error = function(e) FALSE
     )

diff --git a/_pkgdown.yml b/_pkgdown.yml
@@ -2,6 +2,9 @@ url: https://ashbythorpe.github.io/selenider/
 template:
   bootstrap: 5
 
+development:
+  mode: auto
+
 reference:
 - title: Start a session
 - contents: