Just use legacy for both

rstudio · Mar 20, 2024 · f00fa71 · f00fa71
1 parent 69e4113
commit f00fa71
Show file tree

Hide file tree

Showing 11 changed files with 167 additions and 101 deletions.
diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/linux-4.0/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/linux-4.0/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/linux-4.1/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/linux-4.1/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/linux-4.2/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/linux-4.2/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/linux-4.3/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/linux-4.3/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/mac-4.0/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/mac-4.0/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/mac-4.1/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/mac-4.1/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/mac-4.2/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/mac-4.2/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/mac-4.3/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/mac-4.3/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/windows-4.1/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/windows-4.1/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/_snaps/windows-4.3/mytest/001.json b/inst/apps/126-async-ticks/tests/testthat/_snaps/windows-4.3/mytest/001.json
@@ -3,16 +3,22 @@
 
   },
   "output": {
-    "datatable": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
-    "datatablea": [
-      "OK",
-      "NULL",
-      "c(\"shiny.silent.error\", \"validation\")"
-    ],
+    "datatable": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
+    "datatablea": {
+      "message": "OK",
+      "call": "NULL",
+      "type": [
+        "shiny.silent.error",
+        "validation"
+      ]
+    },
     "image": {
       "message": "OK",
       "call": "NULL",

diff --git a/inst/apps/126-async-ticks/tests/testthat/test-mytest.R b/inst/apps/126-async-ticks/tests/testthat/test-mytest.R
@@ -1,7 +1,13 @@
 library(shinytest2)
 
 test_that("Migrated shinytest test: mytest.R", {
-  app <- AppDriver$new(variant = shinytest2::platform_variant())
+  app <- AppDriver$new(
+    variant = shinytest2::platform_variant(),
+    # Use legacy datatable implementation just for the 
+    # info$datatable$colnames test below. We could, of course, 
+    # update that test, but it's also good to test the legacy.
+    options = list(shiny.legacy.datatable = TRUE)
+  )
 
   app$expect_values()
   app$expect_screenshot()