Skip to content

Commit 068f32a

Browse files
cpsievertcpsievert
committed
Merge branch 'main' into label-html-update
2 parents 276c891 + 8dece9b commit 068f32a

File tree

158 files changed

+997
-810
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+997
-810
lines changed

‎DESCRIPTION

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ Description: Core shiny team tools to facilitate testing of the shiny-verse.
1010
License: MIT + file LICENSE
1111
Encoding: UTF-8
1212
Roxygen: list(markdown = TRUE)
13-
RoxygenNote: 7.2.3
13+
RoxygenNote: 7.3.1
1414
Imports:
1515
jsonlite,
1616
progress,

‎R/fix_snaps.R

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ fix_snaps <- function(
103103

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

109109
patch_file

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.0/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.0/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.0/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.1/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.1/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.1/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.2/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.2/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.2/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.3/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.3/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/linux-4.3/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.0/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.0/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.0/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.1/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.1/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.1/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.2/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.2/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.2/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.3/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.3/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/mac-4.3/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.1/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.1/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.1/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.3/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.3/mytest/003.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/026-shiny-inline/tests/testthat/_snaps/windows-4.3/mytest/005.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -126,9 +126,9 @@
126126
},
127127
{
128128
"name": "htmltools-fill",
129-
"version": "0.5.7.9000",
129+
"version": "0.5.8.9000",
130130
"src": {
131-
"href": "htmltools-fill-0.5.7.9000"
131+
"href": "htmltools-fill-0.5.8.9000"
132132
},
133133
"meta": null,
134134
"script": null,

‎inst/apps/063-superzip-example/tests/testthat/_snaps/linux-4.0/mytest/001.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -168,9 +168,9 @@
168168
},
169169
{
170170
"name": "leaflet-binding",
171-
"version": "2.2.1.9000",
171+
"version": "2.2.2.9000",
172172
"src": {
173-
"href": "leaflet-binding-2.2.1.9000"
173+
"href": "leaflet-binding-2.2.2.9000"
174174
},
175175
"meta": null,
176176
"script": "leaflet.js",

0 commit comments

Comments
 (0)