Merge branch 'main' into popovers

rstudio · Aug 8, 2023 · 177a7c0 · 177a7c0
2 parents 43f8b63 + ba3e637
commit 177a7c0
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/...-dynamic/tests/testthat/test-shinytest2.R → ...testthat/test-310-bslib-sidebar-dynamic.R b/...-dynamic/tests/testthat/test-shinytest2.R → ...testthat/test-310-bslib-sidebar-dynamic.R
@@ -86,12 +86,12 @@ test_that("310-bslib-sidebar-dynamic: dynamically added sidebars are fully funct
     wait_for_js("document.getElementById('layout_1') ? true : false")$
     expect_values()
 
-  expect_screenshot_mac_release(app, selector = "#layout_1")
   expect_sidebar_main_text(1, "cuddly giraffe")
 
   # First sidebar starts open = "open"
   expect_sidebar_shown(id = 1, "inner")
   expect_sidebar_shown(id = 1, "outer")
+  expect_screenshot_mac_release(app, selector = "#layout_1")
 
   # Update an input in the sidebar to test that the output is updated
   app$set_inputs(adjective_1 = "elegant")

diff --git a/inst/apps/314-bslib-tooltips/app.R b/inst/apps/314-bslib-tooltips/app.R
@@ -8,7 +8,7 @@ ui <- page_navbar(
   id = "navbar",
   theme = bs_theme(
     "tooltip-bg" = "#232529",
-    "enable-transitions" = interactive()
+    "enable-transitions" = FALSE
   ),
 
   nav_panel(
@@ -131,4 +131,3 @@ server <- function(input, output, session) {
 }
 
 shinyApp(ui, server)
-
diff --git a/...ips/tests/testthat/_snaps/mac-4.3/314-bslib-tooltips/314-bslib-tooltips-001.png b/...ips/tests/testthat/_snaps/mac-4.3/314-bslib-tooltips/314-bslib-tooltips-001.png