From 78d5298d2d241c178426d2e00987abbf57e66fc3 Mon Sep 17 00:00:00 2001 From: Karan Gathani Date: Fri, 8 Dec 2023 22:22:50 -0500 Subject: [PATCH 1/2] Fix failing tests --- tests/playwright/shiny/shiny-express/page_default/app.py | 4 ++-- .../shiny/shiny-express/page_default/test_page_default.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/playwright/shiny/shiny-express/page_default/app.py b/tests/playwright/shiny/shiny-express/page_default/app.py index 0d95c9436..3ee2c02c3 100644 --- a/tests/playwright/shiny/shiny-express/page_default/app.py +++ b/tests/playwright/shiny/shiny-express/page_default/app.py @@ -28,14 +28,14 @@ with layout.column(width=6): # check height is below 300px - bounding box - with layout.navset_card_tab(id="express_navset_card_tab"): + with layout.navset_card(id="express_navset_card_tab", type="tab"): with layout.nav(title="Two"): ... with layout.column(width=6): with layout.row(): - with layout.navset_tab(id="express_navset_tab"): + with layout.navset(id="express_navset_tab", type="tab"): for fn_txt, fn in [ ("pre", layout.pre), ("div", layout.div), diff --git a/tests/playwright/shiny/shiny-express/page_default/test_page_default.py b/tests/playwright/shiny/shiny-express/page_default/test_page_default.py index b19613fb0..4107b8305 100644 --- a/tests/playwright/shiny/shiny-express/page_default/test_page_default.py +++ b/tests/playwright/shiny/shiny-express/page_default/test_page_default.py @@ -3,6 +3,6 @@ from utils.express_utils import verify_express_page_default -def test_express_accordion(page: Page, local_app: ShinyAppProc) -> None: +def test_page_default(page: Page, local_app: ShinyAppProc) -> None: page.goto(local_app.url) verify_express_page_default(page) From 5ee8136cbecce39248374033cc6203079fba800c Mon Sep 17 00:00:00 2001 From: Karan Gathani Date: Fri, 8 Dec 2023 22:37:44 -0500 Subject: [PATCH 2/2] Add rsconnect installation for deploys tests --- Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 307fd3ba2..d4fc1bb2c 100644 --- a/Makefile +++ b/Makefile @@ -94,13 +94,16 @@ install-playwright: install-trcli: which trcli || pip install trcli +install-rsconnect: ## install the main version of rsconnect till pypi version supports shiny express + pip install git+https://github.com/rstudio/rsconnect-python.git#egg=rsconnect-python + playwright-shiny: install-playwright ## end-to-end tests with playwright pytest tests/playwright/shiny/$(SUB_FILE) playwright-examples: install-playwright ## end-to-end tests on examples with playwright pytest tests/playwright/examples -playwright-deploys: install-playwright ## end-to-end tests on deploys with playwright +playwright-deploys: install-playwright install-rsconnect ## end-to-end tests on deploys with playwright pytest tests/playwright/deploys/$(SUB_FILE) -s testrail-junit: install-playwright install-trcli ## end-to-end tests with playwright and generate junit report