Deploy app to consistent locations

tests/playwright/deploys/plotly/test_plotly_app.py

@@ -1,9 +1,12 @@
 import os
 
 import pytest
-from conftest import ShinyAppProc
 from playwright.sync_api import Page, expect
-from utils.deploy_utils import prepare_deploy_and_open_url, skip_if_not_python_310
+from utils.deploy_utils import (
+    deploy_locations,
+    prepare_deploy_and_open_url,
+    skip_if_not_python_310,
+)
 
 COUNTRY = "Afghanistan"
 APP_NAME = "example_deploy_app_A"
@@ -13,12 +16,9 @@
 
 @skip_if_not_python_310
 @pytest.mark.only_browser("chromium")
-@pytest.mark.parametrize("location", ["connect", "shinyapps", "local"])
-def test_deploys(page: Page, location: str, local_app: ShinyAppProc) -> None:
-    if location == "local":
-        page.goto(local_app.url)
-    else:
-        prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+@pytest.mark.parametrize("location", deploy_locations)
+def test_deploys(page: Page, location: str) -> None:
+    prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
 
     expect(page.get_by_text(COUNTRY)).to_have_count(1, timeout=EXPECT_TIMEOUT)
     page.get_by_role("cell", name=COUNTRY).click(timeout=EXPECT_TIMEOUT)

tests/playwright/deploys/shiny-express-accordion/test_accordion.py

@@ -1,23 +1,24 @@
 import os
 
 import pytest
-from conftest import ShinyAppProc
 from controls import Accordion
 from playwright.sync_api import Page
-from utils.deploy_utils import prepare_deploy_and_open_url, skip_if_not_python_310
+from utils.deploy_utils import (
+    deploy_locations,
+    prepare_deploy_and_open_url,
+    skip_if_not_python_310,
+)
 
 APP_NAME = "shiny_express_accordion"
 app_file_path = os.path.dirname(os.path.abspath(__file__))
 
 
 @skip_if_not_python_310
 @pytest.mark.only_browser("chromium")
-@pytest.mark.parametrize("location", ["connect", "shinyapps", "local"])
-def test_express_accordion(page: Page, location: str, local_app: ShinyAppProc) -> None:
-    if location == "local":
-        page.goto(local_app.url)
-    else:
-        prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+@pytest.mark.parametrize("location", deploy_locations)
+def test_express_accordion(page: Page, location: str) -> None:
+    prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+
     acc = Accordion(page, "express_accordion")
     acc_panel_2 = acc.accordion_panel("Panel 2")
     acc_panel_2.expect_open(True)

tests/playwright/deploys/shiny-express-dataframe/test_dataframe.py

@@ -1,24 +1,23 @@
 import os
 
 import pytest
-from conftest import ShinyAppProc
 from controls import OutputDataFrame
 from playwright.sync_api import Page
-from utils.deploy_utils import prepare_deploy_and_open_url, skip_if_not_python_310
+from utils.deploy_utils import (
+    deploy_locations,
+    prepare_deploy_and_open_url,
+    skip_if_not_python_310,
+)
 
 APP_NAME = "shiny-express-dataframe"
 app_file_path = os.path.dirname(os.path.abspath(__file__))
 
 
 @skip_if_not_python_310
 @pytest.mark.only_browser("chromium")
-@pytest.mark.parametrize("location", ["connect", "shinyapps", "local"])
-def test_express_dataframe_deploys(
-    page: Page, location: str, local_app: ShinyAppProc
-) -> None:
-    if location == "local":
-        page.goto(local_app.url)
-    else:
-        prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+@pytest.mark.parametrize("location", deploy_locations)
+def test_express_dataframe_deploys(page: Page, location: str) -> None:
+    prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+
     dataframe = OutputDataFrame(page, "sample_data_frame")
     dataframe.expect_n_row(6)

tests/playwright/deploys/shiny-express-folium/test_folium.py

@@ -1,22 +1,23 @@
 import os
 
 import pytest
-from conftest import ShinyAppProc
 from playwright.sync_api import Page, expect
-from utils.deploy_utils import prepare_deploy_and_open_url, skip_if_not_python_310
+from utils.deploy_utils import (
+    deploy_locations,
+    prepare_deploy_and_open_url,
+    skip_if_not_python_310,
+)
 
 APP_NAME = "shiny-express-folium"
 app_file_path = os.path.dirname(os.path.abspath(__file__))
 
 
 @skip_if_not_python_310
 @pytest.mark.only_browser("chromium")
-@pytest.mark.parametrize("location", ["connect", "shinyapps", "local"])
-def test_folium_map(page: Page, location: str, local_app: ShinyAppProc) -> None:
-    if location == "local":
-        page.goto(local_app.url)
-    else:
-        prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+@pytest.mark.parametrize("location", deploy_locations)
+def test_folium_map(page: Page, location: str) -> None:
+    prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+
     expect(page.get_by_text("Static Map")).to_have_count(1)
     expect(page.get_by_text("Map inside of render express call")).to_have_count(1)
     # map inside the @render.express

tests/playwright/deploys/shiny-express-page_default/test_page_default.py

@@ -1,23 +1,23 @@
 import os
 
 import pytest
-from conftest import ShinyAppProc
 from controls import LayoutNavsetTab
 from playwright.sync_api import Page
-from utils.deploy_utils import prepare_deploy_and_open_url, skip_if_not_python_310
+from utils.deploy_utils import (
+    deploy_locations,
+    prepare_deploy_and_open_url,
+    skip_if_not_python_310,
+)
 
 APP_NAME = "shiny-express-folium"
 app_file_path = os.path.dirname(os.path.abspath(__file__))
 
 
 @skip_if_not_python_310
 @pytest.mark.only_browser("chromium")
-@pytest.mark.parametrize("location", ["connect", "shinyapps", "local"])
-def test_page_default(page: Page, location: str, local_app: ShinyAppProc) -> None:
-    if location == "local":
-        page.goto(local_app.url)
-    else:
-        prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+@pytest.mark.parametrize("location", deploy_locations)
+def test_page_default(page: Page, location: str) -> None:
+    prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
     nav_html = LayoutNavsetTab(page, "express_navset_tab")
     nav_html.expect_content("pre 0pre 1pre 2")
     nav_html.set("div")

tests/playwright/deploys/shiny-express-page_fillable/test_page_fillable.py

@@ -1,25 +1,24 @@
 import os
 
 import pytest
-from conftest import ShinyAppProc
 from controls import Card, OutputTextVerbatim
 from playwright.sync_api import Page
-from utils.deploy_utils import prepare_deploy_and_open_url, skip_if_not_python_310
+from utils.deploy_utils import (
+    deploy_locations,
+    prepare_deploy_and_open_url,
+    skip_if_not_python_310,
+)
 
 APP_NAME = "express_page_fillable"
 app_file_path = os.path.dirname(os.path.abspath(__file__))
 
 
 @skip_if_not_python_310
 @pytest.mark.only_browser("chromium")
-@pytest.mark.parametrize("location", ["connect", "shinyapps", "local"])
-def test_express_page_fillable(
-    page: Page, location: str, local_app: ShinyAppProc
-) -> None:
-    if location == "local":
-        page.goto(local_app.url)
-    else:
-        prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+@pytest.mark.parametrize("location", deploy_locations)
+def test_express_page_fillable(page: Page, location: str) -> None:
+    prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+
     card = Card(page, "card")
     output_txt = OutputTextVerbatim(page, "txt")
     output_txt.expect_value("50")

tests/playwright/deploys/shiny-express-page_fluid/test_page_fluid.py

@@ -1,23 +1,24 @@
 import os
 
 import pytest
-from conftest import ShinyAppProc
 from controls import Card, OutputTextVerbatim
 from playwright.sync_api import Page
-from utils.deploy_utils import prepare_deploy_and_open_url, skip_if_not_python_310
+from utils.deploy_utils import (
+    deploy_locations,
+    prepare_deploy_and_open_url,
+    skip_if_not_python_310,
+)
 
 APP_NAME = "express_page_fluid"
 app_file_path = os.path.dirname(os.path.abspath(__file__))
 
 
 @skip_if_not_python_310
 @pytest.mark.only_browser("chromium")
-@pytest.mark.parametrize("location", ["connect", "shinyapps", "local"])
-def test_express_page_fluid(page: Page, location: str, local_app: ShinyAppProc) -> None:
-    if location == "local":
-        page.goto(local_app.url)
-    else:
-        prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+@pytest.mark.parametrize("location", deploy_locations)
+def test_express_page_fluid(page: Page, location: str) -> None:
+    prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+
     card = Card(page, "card")
     output_txt = OutputTextVerbatim(page, "txt")
     output_txt.expect_value("50")

tests/playwright/deploys/shiny-express-page_sidebar/test_page_sidebar.py

@@ -1,10 +1,13 @@
 import os
 
 import pytest
-from conftest import ShinyAppProc
 from controls import OutputTextVerbatim, Sidebar
 from playwright.sync_api import Page
-from utils.deploy_utils import prepare_deploy_and_open_url, skip_if_not_python_310
+from utils.deploy_utils import (
+    deploy_locations,
+    prepare_deploy_and_open_url,
+    skip_if_not_python_310,
+)
 from utils.express_utils import compare_annotations
 
 from shiny import ui
@@ -16,14 +19,10 @@
 
 @skip_if_not_python_310
 @pytest.mark.only_browser("chromium")
-@pytest.mark.parametrize("location", ["connect", "shinyapps", "local"])
-def test_express_page_sidebar(
-    page: Page, location: str, local_app: ShinyAppProc
-) -> None:
-    if location == "local":
-        page.goto(local_app.url)
-    else:
-        prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+@pytest.mark.parametrize("location", deploy_locations)
+def test_express_page_sidebar(page: Page, location: str) -> None:
+    prepare_deploy_and_open_url(page, app_file_path, location, APP_NAME)
+
     sidebar = Sidebar(page, "sidebar")
     sidebar.expect_text("SidebarTitle Sidebar Content")
     output_txt = OutputTextVerbatim(page, "txt")

tests/playwright/utils/deploy_utils.py

@@ -24,6 +24,8 @@
     reason="Test requires Python 3.10",
 )
 
+deploy_locations = ["connect", "shinyapps"]
+
 
 def exception_swallower(
     function: typing.Callable[[str, str], str]