Use new fixture

tests/playwright/deploys/plotly/test_plotly_app.py

@@ -1,31 +1,21 @@
-import os
-
-import pytest
 from playwright.sync_api import Page, expect
 from utils.deploy_utils import (
-    deploy_locations,
-    prepare_deploy_and_open_url,
-    skip_if_not_python_310,
+    create_deploys_app_url_fixture,
+    skip_if_not_python_310_or_chrome,
 )
 
-COUNTRY = "Afghanistan"
-APP_NAME = "example_deploy_app_A"
-app_file_path = os.path.dirname(os.path.abspath(__file__))
-EXPECT_TIMEOUT = 120 * 1000
+app_url = create_deploys_app_url_fixture(__file__, "example_deploy_app_A")
 
 
-@skip_if_not_python_310
-@pytest.mark.only_browser("chromium")
-@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)
+@skip_if_not_python_310_or_chrome
+def test_deploys(page: Page, app_url: str) -> None:
+    if "127.0.0.1" not in app_url:
+        page.set_default_timeout(120 * 1000)
+    page.goto(app_url)
 
-    expect(page.get_by_text(COUNTRY)).to_have_count(1, timeout=EXPECT_TIMEOUT)
-    page.get_by_role("cell", name=COUNTRY).click(timeout=EXPECT_TIMEOUT)
-    expect(page.locator("#country_detail_pop")).to_contain_text(
-        COUNTRY, timeout=EXPECT_TIMEOUT
-    )
-    expect(page.locator("#country_detail_percap")).to_contain_text(
-        COUNTRY, timeout=EXPECT_TIMEOUT
-    )
-    expect(page.get_by_text(COUNTRY)).to_have_count(3, timeout=EXPECT_TIMEOUT)
+    COUNTRY = "Afghanistan"
+    expect(page.get_by_text(COUNTRY)).to_have_count(1)
+    page.get_by_role("cell", name=COUNTRY).click()
+    expect(page.locator("#country_detail_pop")).to_contain_text(COUNTRY)
+    expect(page.locator("#country_detail_percap")).to_contain_text(COUNTRY)
+    expect(page.get_by_text(COUNTRY)).to_have_count(3)

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

@@ -1,23 +1,16 @@
-import os
-
-import pytest
 from controls import Accordion
 from playwright.sync_api import Page
 from utils.deploy_utils import (
-    deploy_locations,
-    prepare_deploy_and_open_url,
-    skip_if_not_python_310,
+    create_deploys_app_url_fixture,
+    skip_if_not_python_310_or_chrome,
 )
 
-APP_NAME = "shiny_express_accordion"
-app_file_path = os.path.dirname(os.path.abspath(__file__))
+app_url = create_deploys_app_url_fixture(__file__, "shiny_express_accordion")
 
 
-@skip_if_not_python_310
-@pytest.mark.only_browser("chromium")
-@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)
+@skip_if_not_python_310_or_chrome
+def test_express_accordion(page: Page, app_url: str) -> None:
+    page.goto(app_url)
 
     acc = Accordion(page, "express_accordion")
     acc_panel_2 = acc.accordion_panel("Panel 2")

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

@@ -1,23 +1,16 @@
-import os
-
-import pytest
 from controls import OutputDataFrame
 from playwright.sync_api import Page
 from utils.deploy_utils import (
-    deploy_locations,
-    prepare_deploy_and_open_url,
-    skip_if_not_python_310,
+    create_deploys_app_url_fixture,
+    skip_if_not_python_310_or_chrome,
 )
 
-APP_NAME = "shiny-express-dataframe"
-app_file_path = os.path.dirname(os.path.abspath(__file__))
+app_url = create_deploys_app_url_fixture(__file__, "shiny-express-dataframe")
 
 
-@skip_if_not_python_310
-@pytest.mark.only_browser("chromium")
-@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)
+@skip_if_not_python_310_or_chrome
+def test_express_dataframe_deploys(page: Page, app_url: str) -> None:
+    page.goto(app_url)
 
     dataframe = OutputDataFrame(page, "sample_data_frame")
     dataframe.expect_n_row(6)

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

@@ -1,22 +1,15 @@
-import os
-
-import pytest
 from playwright.sync_api import Page, expect
 from utils.deploy_utils import (
-    deploy_locations,
-    prepare_deploy_and_open_url,
-    skip_if_not_python_310,
+    create_deploys_app_url_fixture,
+    skip_if_not_python_310_or_chrome,
 )
 
-APP_NAME = "shiny-express-folium"
-app_file_path = os.path.dirname(os.path.abspath(__file__))
+app_url = create_deploys_app_url_fixture(__file__, "shiny-express-folium")
 
 
-@skip_if_not_python_310
-@pytest.mark.only_browser("chromium")
-@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)
+@skip_if_not_python_310_or_chrome
+def test_folium_map(page: Page, app_url: str) -> None:
+    page.goto(app_url)
 
     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)

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

@@ -1,23 +1,17 @@
-import os
-
-import pytest
 from controls import LayoutNavsetTab
 from playwright.sync_api import Page
 from utils.deploy_utils import (
-    deploy_locations,
-    prepare_deploy_and_open_url,
-    skip_if_not_python_310,
+    create_deploys_app_url_fixture,
+    skip_if_not_python_310_or_chrome,
 )
 
-APP_NAME = "shiny-express-folium"
-app_file_path = os.path.dirname(os.path.abspath(__file__))
+app_url = create_deploys_app_url_fixture(__file__, "shiny-express-folium")
+
 
+@skip_if_not_python_310_or_chrome
+def test_page_default(page: Page, app_url: str) -> None:
+    page.goto(app_url)
 
-@skip_if_not_python_310
-@pytest.mark.only_browser("chromium")
-@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,23 +1,16 @@
-import os
-
-import pytest
 from controls import Card, OutputTextVerbatim
 from playwright.sync_api import Page
 from utils.deploy_utils import (
-    deploy_locations,
-    prepare_deploy_and_open_url,
-    skip_if_not_python_310,
+    create_deploys_app_url_fixture,
+    skip_if_not_python_310_or_chrome,
 )
 
-APP_NAME = "express_page_fillable"
-app_file_path = os.path.dirname(os.path.abspath(__file__))
+app_url = create_deploys_app_url_fixture(__file__, "express_page_fillable")
 
 
-@skip_if_not_python_310
-@pytest.mark.only_browser("chromium")
-@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)
+@skip_if_not_python_310_or_chrome
+def test_express_page_fillable(page: Page, app_url: str) -> None:
+    page.goto(app_url)
 
     card = Card(page, "card")
     output_txt = OutputTextVerbatim(page, "txt")

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

@@ -1,23 +1,16 @@
-import os
-
-import pytest
 from controls import Card, OutputTextVerbatim
 from playwright.sync_api import Page
 from utils.deploy_utils import (
-    deploy_locations,
-    prepare_deploy_and_open_url,
-    skip_if_not_python_310,
+    create_deploys_app_url_fixture,
+    skip_if_not_python_310_or_chrome,
 )
 
-APP_NAME = "express_page_fluid"
-app_file_path = os.path.dirname(os.path.abspath(__file__))
+app_url = create_deploys_app_url_fixture(__file__, "express_page_fluid")
 
 
-@skip_if_not_python_310
-@pytest.mark.only_browser("chromium")
-@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)
+@skip_if_not_python_310_or_chrome
+def test_express_page_fluid(page: Page, app_url: str) -> None:
+    page.goto(app_url)
 
     card = Card(page, "card")
     output_txt = OutputTextVerbatim(page, "txt")

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

@@ -1,27 +1,20 @@
-import os
-
-import pytest
 from controls import OutputTextVerbatim, Sidebar
 from playwright.sync_api import Page
 from utils.deploy_utils import (
-    deploy_locations,
-    prepare_deploy_and_open_url,
-    skip_if_not_python_310,
+    create_deploys_app_url_fixture,
+    skip_if_not_python_310_or_chrome,
 )
 from utils.express_utils import compare_annotations
 
 from shiny import ui
 from shiny.express import ui as xui
 
-APP_NAME = "express_page_sidebar"
-app_file_path = os.path.dirname(os.path.abspath(__file__))
+app_url = create_deploys_app_url_fixture(__file__, "express_page_sidebar")
 
 
-@skip_if_not_python_310
-@pytest.mark.only_browser("chromium")
-@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)
+@skip_if_not_python_310_or_chrome
+def test_express_page_sidebar(page: Page, app_url: str) -> None:
+    page.goto(app_url)
 
     sidebar = Sidebar(page, "sidebar")
     sidebar.expect_text("SidebarTitle Sidebar Content")