Skip to content

Commit 82d5811

Browse files
authored
Merge branch 'main' into report_redesign_poc@main
Signed-off-by: Marcin <[email protected]>
2 parents c62e0bb + d3e9699 commit 82d5811

19 files changed

+90
-11
lines changed

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ default_language_version:
66
python: python3
77
repos:
88
- repo: https://github.com/lorenzwalthert/precommit
9-
rev: v0.4.3.9003
9+
rev: v0.4.3.9005
1010
hooks:
1111
- id: style-files
1212
name: Style code with `styler`

DESCRIPTION

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Type: Package
22
Package: teal.modules.general
33
Title: General Modules for 'teal' Applications
4-
Version: 0.4.0.9000
5-
Date: 2025-02-28
4+
Version: 0.4.0.9001
5+
Date: 2025-03-11
66
Authors@R: c(
77
person("Dawid", "Kaledkowski", , "[email protected]", role = c("aut", "cre")),
88
person("Pawel", "Rucki", , "[email protected]", role = "aut"),
@@ -27,7 +27,7 @@ Depends:
2727
ggplot2 (>= 3.4.0),
2828
R (>= 4.1),
2929
shiny (>= 1.6.0),
30-
teal (>= 0.16.0.9000),
30+
teal (>= 0.16.0.9002),
3131
teal.transform (>= 0.6.0)
3232
Imports:
3333
bslib (>= 0.8.0),
@@ -61,8 +61,8 @@ Imports:
6161
teal.code (>= 0.6.1),
6262
teal.data (>= 0.7.0),
6363
teal.logger (>= 0.3.2),
64-
teal.reporter (>= 0.4.0.9000),
65-
teal.widgets (>= 0.4.3.9000),
64+
teal.reporter (>= 0.4.0.9004),
65+
teal.widgets (>= 0.4.3.9001),
6666
tern (>= 0.9.7),
6767
tibble (>= 2.0.0),
6868
tidyr (>= 0.8.3),
@@ -80,13 +80,13 @@ Suggests:
8080
shinytest2,
8181
testthat (>= 3.1.9),
8282
withr (>= 2.0.0)
83-
Remotes:
84-
insightsengineering/teal@redesign@main,
85-
insightsengineering/teal.widgets@test@bslib@main,
86-
insightsengineering/teal.reporter@redesign@main
8783
VignetteBuilder:
8884
knitr,
8985
rmarkdown
86+
Remotes:
87+
insightsengineering/teal.reporter@redesign@main,
88+
insightsengineering/teal.widgets@main,
89+
insightsengineering/teal@redesign@main
9090
Config/Needs/verdepcheck: haleyjeppson/ggmosaic, tidyverse/ggplot2,
9191
rstudio/shiny, insightsengineering/teal,
9292
insightsengineering/teal.slice, insightsengineering/teal.transform,

NEWS.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# teal.modules.general 0.4.0.9000
1+
# teal.modules.general 0.4.0.9001
22

33
# teal.modules.general 0.4.0
44

tests/testthat/test-examples.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,7 @@ for (i in rd_files()) {
152152
paste0("example-", basename(i)),
153153
{
154154
testthat::skip_on_cran()
155+
testthat::skip("chromium")
155156
skip_if_too_deep(5)
156157
testthat::skip_if_not_installed("pkgload")
157158
if (basename(i) %in% strict_exceptions) {

tests/testthat/test-shinytest2-tm_a_pca.R

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ app_driver_tm_a_pca <- function() {
3232
}
3333

3434
testthat::test_that("e2e - tm_a_pca: Module is initialised with the specified defaults in function call.", {
35+
testthat::skip("chromium")
3536
skip_if_too_deep(5)
3637

3738
app_driver <- app_driver_tm_a_pca()
@@ -56,6 +57,7 @@ testthat::test_that("e2e - tm_a_pca: Module is initialised with the specified de
5657
})
5758

5859
testthat::test_that("e2e - tm_a_pca: Eigenvector table should have data extract selection Murder/Assault on header.", {
60+
testthat::skip("chromium")
5961
skip_if_too_deep(5)
6062

6163
app_driver <- app_driver_tm_a_pca()
@@ -73,6 +75,7 @@ testthat::test_that("e2e - tm_a_pca: Eigenvector table should have data extract
7375
})
7476

7577
testthat::test_that("e2e - tm_a_pca: Eigenvector table should have data extract selection Murder/UrbanPop on header.", {
78+
testthat::skip("chromium")
7679
skip_if_too_deep(5)
7780

7881
app_driver <- app_driver_tm_a_pca()
@@ -90,6 +93,7 @@ testthat::test_that("e2e - tm_a_pca: Eigenvector table should have data extract
9093
})
9194

9295
testthat::test_that("e2e - tm_a_pca: Color by columns (data_extract) must be from non-selected variable set.", {
96+
testthat::skip("chromium")
9397
skip_if_too_deep(5)
9498

9599
app_driver <- app_driver_tm_a_pca()
@@ -107,6 +111,7 @@ testthat::test_that("e2e - tm_a_pca: Color by columns (data_extract) must be fro
107111
})
108112

109113
testthat::test_that("e2e - tm_a_pca: Changing output encodings of tables_display does not generate errors.", {
114+
testthat::skip("chromium")
110115
skip_if_too_deep(5)
111116

112117
app_driver <- app_driver_tm_a_pca()
@@ -128,6 +133,7 @@ testthat::test_that("e2e - tm_a_pca: Changing output encodings of tables_display
128133
})
129134

130135
testthat::test_that("e2e - tm_a_pca: Changing output encodings for 'plot type' does not generate errors.", {
136+
testthat::skip("chromium")
131137
skip_if_too_deep(5)
132138

133139
app_driver <- app_driver_tm_a_pca()
@@ -151,6 +157,7 @@ testthat::test_that("e2e - tm_a_pca: Changing output encodings for 'plot type' d
151157
})
152158

153159
testthat::test_that("e2e - tm_a_pca: Changing output encodings of 'standardization' does not generate errors.", {
160+
testthat::skip("chromium")
154161
skip_if_too_deep(5)
155162

156163
app_driver <- app_driver_tm_a_pca()
@@ -169,6 +176,7 @@ testthat::test_that("e2e - tm_a_pca: Changing output encodings of 'standardizati
169176
})
170177

171178
testthat::test_that("e2e - tm_a_pca: Changing output encodings of 'NA action' does not generate errors.", {
179+
testthat::skip("chromium")
172180
skip_if_too_deep(5)
173181

174182
app_driver <- app_driver_tm_a_pca()
@@ -183,6 +191,7 @@ testthat::test_that("e2e - tm_a_pca: Changing output encodings of 'NA action' do
183191
})
184192

185193
testthat::test_that("e2e - tm_a_pca: Changing output encodings of 'plot_type' hides and shows options.", {
194+
testthat::skip("chromium")
186195
skip_if_too_deep(5)
187196

188197
app_driver <- app_driver_tm_a_pca()
@@ -215,6 +224,7 @@ testthat::test_that("e2e - tm_a_pca: Changing output encodings of 'plot_type' hi
215224
})
216225

217226
testthat::test_that("e2e - tm_a_pca: Changing output encodings of 'theme' does not generate errors.", {
227+
testthat::skip("chromium")
218228
skip_if_too_deep(5)
219229

220230
app_driver <- app_driver_tm_a_pca()
@@ -233,6 +243,7 @@ testthat::test_that("e2e - tm_a_pca: Changing output encodings of 'theme' does n
233243
})
234244

235245
testthat::test_that("e2e - tm_a_pca: Changing output encodings of 'font size' does not generate errors.", {
246+
testthat::skip("chromium")
236247
skip_if_too_deep(5)
237248

238249
app_driver <- app_driver_tm_a_pca()

tests/testthat/test-shinytest2-tm_a_regression.R

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ app_driver_tm_a_regression <- function() {
4646
}
4747

4848
testthat::test_that("e2e - tm_a_regression: Data parameter and module label is passed properly.", {
49+
testthat::skip("chromium")
4950
skip_if_too_deep(5)
5051

5152
app_driver <- app_driver_tm_a_regression()
@@ -64,6 +65,7 @@ testthat::test_that("e2e - tm_a_regression: Data parameter and module label is p
6465

6566
testthat::test_that("e2e - tm_a_regression:
6667
Data extract spec elements are initialized with the default values specified by response and regressor arg.", {
68+
testthat::skip("chromium")
6769
skip_if_too_deep(5)
6870

6971
app_driver <- app_driver_tm_a_regression()
@@ -83,6 +85,7 @@ testthat::test_that("e2e - tm_a_regression:
8385
})
8486

8587
testthat::test_that("e2e - tm_a_regression: Plot type is set properly.", {
88+
testthat::skip("chromium")
8689
skip_if_too_deep(5)
8790

8891
app_driver <- app_driver_tm_a_regression()
@@ -96,6 +99,7 @@ testthat::test_that("e2e - tm_a_regression: Plot type is set properly.", {
9699

97100
testthat::test_that("e2e - tm_a_regression:
98101
Plot type has 7 specific choices & changing choices does not throw errors.", {
102+
testthat::skip("chromium")
99103
skip_if_too_deep(5)
100104

101105
app_driver <- app_driver_tm_a_regression()
@@ -123,6 +127,7 @@ testthat::test_that("e2e - tm_a_regression:
123127
})
124128

125129
testthat::test_that("e2e - tm_a_regression: Outlier definition and label are visible by default.", {
130+
testthat::skip("chromium")
126131
skip_if_too_deep(5)
127132

128133
app_driver <- app_driver_tm_a_regression()
@@ -135,6 +140,7 @@ testthat::test_that("e2e - tm_a_regression: Outlier definition and label are vis
135140
})
136141

137142
testthat::test_that("e2e - tm_a_regression: Outlier definition and label have default values and label text.", {
143+
testthat::skip("chromium")
138144
skip_if_too_deep(5)
139145

140146
app_driver <- app_driver_tm_a_regression()
@@ -163,6 +169,7 @@ testthat::test_that("e2e - tm_a_regression: Outlier definition and label have de
163169
})
164170

165171
testthat::test_that("e2e - tm_a_regression: Unchecking display outlier hides outlier label and definition.", {
172+
testthat::skip("chromium")
166173
skip_if_too_deep(5)
167174

168175
app_driver <- app_driver_tm_a_regression()

tests/testthat/test-shinytest2-tm_data_table.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ app_driver_tm_data_table <- function() {
2121
}
2222

2323
test_that("e2e - tm_data_table: Initializes without errors", {
24+
testthat::skip("chromium")
2425
skip_if_too_deep(5)
2526
app_driver <- app_driver_tm_data_table()
2627

@@ -35,6 +36,7 @@ test_that("e2e - tm_data_table: Initializes without errors", {
3536
})
3637

3738
test_that("e2e - tm_data_table: Verify checkbox displayed over data table", {
39+
testthat::skip("chromium")
3840
skip_if_too_deep(5)
3941
app_driver <- app_driver_tm_data_table()
4042

@@ -44,6 +46,7 @@ test_that("e2e - tm_data_table: Verify checkbox displayed over data table", {
4446
})
4547

4648
test_that("e2e - tm_data_table: Verify module displays data table", {
49+
testthat::skip("chromium")
4750
skip_if_too_deep(5)
4851
app_driver <- app_driver_tm_data_table()
4952

@@ -80,6 +83,7 @@ test_that("e2e - tm_data_table: Verify module displays data table", {
8083
})
8184

8285
test_that("e2e - tm_data_table: Verify default variable selection and set new selection", {
86+
testthat::skip("chromium")
8387
skip_if_too_deep(5)
8488
app_driver <- app_driver_tm_data_table()
8589

tests/testthat/test-shinytest2-tm_file_viewer.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ app_driver_tm_file_viewer <- function() {
1717
}
1818

1919
test_that("e2e - tm_file_viewer: Initializes without errors and shows files tree specified in input_path argument", {
20+
testthat::skip("chromium")
2021
skip_if_too_deep(5)
2122
app_driver <- app_driver_tm_file_viewer()
2223

@@ -42,6 +43,7 @@ test_that("e2e - tm_file_viewer: Initializes without errors and shows files tree
4243
})
4344

4445
test_that("e2e - tm_file_viewer: Shows selected image file", {
46+
testthat::skip("chromium")
4547
skip_if_too_deep(5)
4648
app_driver <- app_driver_tm_file_viewer()
4749

@@ -58,6 +60,7 @@ test_that("e2e - tm_file_viewer: Shows selected image file", {
5860
})
5961

6062
test_that("e2e - tm_file_viewer: Shows selected text file", {
63+
testthat::skip("chromium")
6164
skip_if_too_deep(5)
6265
app_driver <- app_driver_tm_file_viewer()
6366

@@ -80,6 +83,7 @@ test_that("e2e - tm_file_viewer: Shows selected text file", {
8083
})
8184

8285
test_that("e2e - tm_file_viewer: Shows selected url", {
86+
testthat::skip("chromium")
8387
skip_if_too_deep(5)
8488
app_driver <- app_driver_tm_file_viewer()
8589

tests/testthat/test-shinytest2-tm_front_page.R

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ app_driver_tm_front_page <- function() {
2222
}
2323

2424
test_that("e2e - tm_front_page: Initializes without errors and check html elements", {
25+
testthat::skip("chromium")
2526
skip_if_too_deep(5)
2627
app_driver <- app_driver_tm_front_page()
2728

@@ -46,6 +47,7 @@ test_that("e2e - tm_front_page: Initializes without errors and check html elemen
4647
})
4748

4849
test_that("e2e - tm_front_page: Verify the module displays tables", {
50+
testthat::skip("chromium")
4951
skip_if_too_deep(5)
5052
app_driver <- app_driver_tm_front_page()
5153
# tables
@@ -58,6 +60,7 @@ test_that("e2e - tm_front_page: Verify the module displays tables", {
5860
})
5961

6062
test_that("e2e - tm_front_page: Verify the module displays metadata", {
63+
testthat::skip("chromium")
6164
skip_if_too_deep(5)
6265
app_driver <- app_driver_tm_front_page()
6366

tests/testthat/test-shinytest2-tm_g_association.R

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ app_driver_tm_g_association <- function() {
4545
}
4646

4747
testthat::test_that("e2e - tm_g_association: Data parameter and module label is passed properly.", {
48+
testthat::skip("chromium")
4849
skip_if_too_deep(5)
4950

5051
app_driver <- app_driver_tm_g_association()
@@ -63,6 +64,7 @@ testthat::test_that("e2e - tm_g_association: Data parameter and module label is
6364

6465
testthat::test_that("e2e - tm_g_association:
6566
Data extract spec elements are initialized with the default values specified by ref and vars arguments.", {
67+
testthat::skip("chromium")
6668
skip_if_too_deep(5)
6769
app_driver <- app_driver_tm_g_association()
6870

@@ -84,6 +86,7 @@ testthat::test_that("e2e - tm_g_association:
8486
})
8587

8688
testthat::test_that("e2e - tm_g_association: Module plot is visible.", {
89+
testthat::skip("chromium")
8790
skip_if_too_deep(5)
8891
app_driver <- app_driver_tm_g_association()
8992

@@ -93,6 +96,7 @@ testthat::test_that("e2e - tm_g_association: Module plot is visible.", {
9396
})
9497

9598
testthat::test_that("e2e - tm_g_association: Check and set default values for radio buttons.", {
99+
testthat::skip("chromium")
96100
skip_if_too_deep(5)
97101
app_driver <- app_driver_tm_g_association()
98102

0 commit comments

Comments
 (0)