From 19b816062ea58c133135c767446d5010b59eef09 Mon Sep 17 00:00:00 2001 From: Karan Date: Tue, 3 Sep 2024 12:02:18 -0700 Subject: [PATCH 1/4] fix(tests): Add env vars for shinyapps.io --- .github/workflows/deploy-tests.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-tests.yaml b/.github/workflows/deploy-tests.yaml index 67da5add2..d96644b99 100644 --- a/.github/workflows/deploy-tests.yaml +++ b/.github/workflows/deploy-tests.yaml @@ -110,9 +110,9 @@ jobs: DEPLOY_APPS: "true" DEPLOY_CONNECT_SERVER_URL: "${{ (matrix.config.released_connect_server && 'https://connect.posit.it/') || 'https://rsc.radixu.com/' }}" DEPLOY_CONNECT_SERVER_API_KEY: "${{ (matrix.config.released_connect_server && secrets.DEPLOY_CONNECT_POSIT_SERVER_API_KEY) || secrets.DEPLOY_CONNECT_SERVER_API_KEY }}" - DEPLOY_SHINYAPPS_NAME: "${{ matrix.config.test_shinyappsio && matrix.config.shinyapps_name }}" - DEPLOY_SHINYAPPS_TOKEN: "${{ matrix.config.test_shinyappsio && matrix.config.shinyapps_token }}" - DEPLOY_SHINYAPPS_SECRET: "${{ matrix.config.test_shinyappsio && matrix.config.shinyapps_secret }}" + DEPLOY_SHINYAPPS_NAME: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_NAME }}" + DEPLOY_SHINYAPPS_TOKEN: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_TOKEN }}" + DEPLOY_SHINYAPPS_SECRET: "${{ matrix.config.test_shinyappsio && secrets.DEPLOY_SHINYAPPS_SECRET }}" EXPRESS_PAGE_SIDEBAR_NAME: "${{ matrix.config.app_name }}" DEPLOY_GITHUB_REQUIREMENTS_TXT: "${{ !matrix.config.pypi_shiny }}" timeout-minutes: 30 From 5f20afdfbfde0a136571e06b3c316b79bfc76a88 Mon Sep 17 00:00:00 2001 From: Karan Gathani Date: Tue, 3 Sep 2024 12:40:01 -0700 Subject: [PATCH 2/4] add app name for the deploy job --- .github/workflows/deploy-tests.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/deploy-tests.yaml b/.github/workflows/deploy-tests.yaml index d96644b99..24fdfa358 100644 --- a/.github/workflows/deploy-tests.yaml +++ b/.github/workflows/deploy-tests.yaml @@ -64,6 +64,7 @@ jobs: pypi_shiny: false pypi_rsconnect: false base_test_dir: "./tests/playwright/deploys" + app_name: "express_page_sidebar" test_shinyappsio: true fail-fast: false From fdb03226bb6b14ebf3c07c542f090b8b6c53f9f4 Mon Sep 17 00:00:00 2001 From: Karan Gathani Date: Tue, 3 Sep 2024 12:41:50 -0700 Subject: [PATCH 3/4] use explicit OR condition instead --- .../express-page_sidebar/test_deploys_express_page_sidebar.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py b/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py index 2658512d0..500de0605 100644 --- a/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py +++ b/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py @@ -13,7 +13,7 @@ app_url = local_deploys_app_url_fixture( # Possibly use a different app name given by an GHA env var - os.getenv("EXPRESS_PAGE_SIDEBAR_NAME", "express_page_sidebar") + os.getenv("EXPRESS_PAGE_SIDEBAR_NAME") or "express_page_sidebar" ) From 534248bac1dfc7bdc8df3574230a3525344a853f Mon Sep 17 00:00:00 2001 From: Karan Gathani Date: Tue, 3 Sep 2024 12:49:05 -0700 Subject: [PATCH 4/4] address linting issues --- .../express-page_sidebar/test_deploys_express_page_sidebar.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py b/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py index 500de0605..defdf65c3 100644 --- a/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py +++ b/tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py @@ -13,7 +13,8 @@ app_url = local_deploys_app_url_fixture( # Possibly use a different app name given by an GHA env var - os.getenv("EXPRESS_PAGE_SIDEBAR_NAME") or "express_page_sidebar" + os.getenv("EXPRESS_PAGE_SIDEBAR_NAME") + or "express_page_sidebar" )