Skip to content

Commit

Permalink
Merge branch 'main' into label-html-update
Browse files Browse the repository at this point in the history
  • Loading branch information
@cpsievert
cpsievert committed Apr 8, 2024
2 parents 276c891 + 8dece9b commit 068f32a
Show file tree
Hide file tree
Showing 158 changed files with 997 additions and 810 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ Description: Core shiny team tools to facilitate testing of the shiny-verse.
License: MIT + file LICENSE
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.2.3
RoxygenNote: 7.3.1
Imports:
jsonlite,
progress,
Expand Down
2 changes: 1 addition & 1 deletion R/fix_snaps.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ fix_snaps <- function(

# Make patch file given diff
# git_cmd_(paste0("git format-patch '", original_git_branch, "' --stdout > ", patch_file))
git_cmd_("git diff --binary ", original_git_branch, " > ", patch_file)
git_cmd_("git diff --binary ", original_git_branch, " -- inst/apps > ", patch_file)
}

patch_file
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.0/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.0/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.0/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.1/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.1/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.1/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.2/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.2/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.2/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.3/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.3/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.3/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.0/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.0/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.0/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.1/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.1/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.1/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.2/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.2/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.2/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.3/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.3/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.3/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.1/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.1/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.1/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.3/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.3/mytest/003.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.3/mytest/005.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@
},
{
"name": "htmltools-fill",
"version": "0.5.7.9000",
"version": "0.5.8.9000",
"src": {
"href": "htmltools-fill-0.5.7.9000"
"href": "htmltools-fill-0.5.8.9000"
},
"meta": null,
"script": null,
Expand Down
4 changes: 2 additions & 2 deletions inst/apps/063-superzip-example/tests/testthat/_snaps/linux-4.0/mytest/001.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@
},
{
"name": "leaflet-binding",
"version": "2.2.1.9000",
"version": "2.2.2.9000",
"src": {
"href": "leaflet-binding-2.2.1.9000"
"href": "leaflet-binding-2.2.2.9000"
},
"meta": null,
"script": "leaflet.js",
Expand Down
Loading

0 comments on commit 068f32a

Please sign in to comment.