tests(controls): Change API from controls to controller

docs/_quartodoc-testing.yml

@@ -11,68 +11,68 @@ quartodoc:
     show_signature_annotations: false
   sections:
     - title: UI Layouts
-      desc: Methods for interacting with Shiny app multiple UI component controls.
+      desc: Methods for interacting with Shiny app multiple UI component controller.
       contents:
-        - playwright.controls.Accordion
-        - playwright.controls.AccordionPanel
-        - playwright.controls.Card
-        - playwright.controls.Popover
-        - playwright.controls.Sidebar
-        - playwright.controls.Tooltip
+        - playwright.controller.Accordion
+        - playwright.controller.AccordionPanel
+        - playwright.controller.Card
+        - playwright.controller.Popover
+        - playwright.controller.Sidebar
+        - playwright.controller.Tooltip
     - title: UI Inputs
-      desc: Methods for interacting with Shiny app input value controls.
+      desc: Methods for interacting with Shiny app input value controller.
       contents:
-        - playwright.controls.InputActionLink
-        - playwright.controls.InputCheckbox
-        - playwright.controls.InputCheckboxGroup
-        - playwright.controls.InputDarkMode
-        - playwright.controls.InputDate
-        - playwright.controls.InputDateRange
-        - playwright.controls.InputFile
-        - playwright.controls.InputNumeric
-        - playwright.controls.InputPassword
-        - playwright.controls.InputRadioButtons
-        - playwright.controls.InputSelect
-        - playwright.controls.InputSelectize
-        - playwright.controls.InputSlider
-        - playwright.controls.InputSliderRange
-        - playwright.controls.InputSwitch
-        - playwright.controls.InputTaskButton
-        - playwright.controls.InputText
-        - playwright.controls.InputTextArea
+        - playwright.controller.InputActionLink
+        - playwright.controller.InputCheckbox
+        - playwright.controller.InputCheckboxGroup
+        - playwright.controller.InputDarkMode
+        - playwright.controller.InputDate
+        - playwright.controller.InputDateRange
+        - playwright.controller.InputFile
+        - playwright.controller.InputNumeric
+        - playwright.controller.InputPassword
+        - playwright.controller.InputRadioButtons
+        - playwright.controller.InputSelect
+        - playwright.controller.InputSelectize
+        - playwright.controller.InputSlider
+        - playwright.controller.InputSliderRange
+        - playwright.controller.InputSwitch
+        - playwright.controller.InputTaskButton
+        - playwright.controller.InputText
+        - playwright.controller.InputTextArea
     - title: Value boxes
-      desc: Methods for interacting with Shiny app valuebox controls.
+      desc: Methods for interacting with Shiny app valuebox controller.
       contents:
-        - playwright.controls.ValueBox
+        - playwright.controller.ValueBox
     - title: Navigation (tab) panels
-      desc: Methods for interacting with Shiny app UI content controls.
+      desc: Methods for interacting with Shiny app UI content controller.
       contents:
-        - playwright.controls.NavItem
-        - playwright.controls.NavsetBar
-        - playwright.controls.NavsetCardPill
-        - playwright.controls.NavsetCardTab
-        - playwright.controls.NavsetCardUnderline
-        - playwright.controls.NavsetHidden
-        - playwright.controls.NavsetPill
-        - playwright.controls.NavsetPillList
-        - playwright.controls.NavsetTab
-        - playwright.controls.NavsetUnderline
+        - playwright.controller.NavItem
+        - playwright.controller.NavsetBar
+        - playwright.controller.NavsetCardPill
+        - playwright.controller.NavsetCardTab
+        - playwright.controller.NavsetCardUnderline
+        - playwright.controller.NavsetHidden
+        - playwright.controller.NavsetPill
+        - playwright.controller.NavsetPillList
+        - playwright.controller.NavsetTab
+        - playwright.controller.NavsetUnderline
     - title: Upload and download
-      desc: Methods for interacting with Shiny app uploading and downloading controls.
+      desc: Methods for interacting with Shiny app uploading and downloading controller.
       contents:
-        - playwright.controls.DownloadButton
-        - playwright.controls.DownloadLink
+        - playwright.controller.DownloadButton
+        - playwright.controller.DownloadLink
     - title: Rendering outputs
       desc: Render output in a variety of ways.
       contents:
-        - playwright.controls.OutputCode
-        - playwright.controls.OutputDataFrame
-        - playwright.controls.OutputImage
-        - playwright.controls.OutputPlot
-        - playwright.controls.OutputTable
-        - playwright.controls.OutputText
-        - playwright.controls.OutputTextVerbatim
-        - playwright.controls.OutputUi
+        - playwright.controller.OutputCode
+        - playwright.controller.OutputDataFrame
+        - playwright.controller.OutputImage
+        - playwright.controller.OutputPlot
+        - playwright.controller.OutputTable
+        - playwright.controller.OutputText
+        - playwright.controller.OutputTextVerbatim
+        - playwright.controller.OutputUi
     - title: "Playwright Expect"
       desc: "Methods for testing the state of a locator within a Shiny app."
       contents:

shiny/_template_utils.py

@@ -399,20 +399,20 @@ def path_does_not_exist(x: Path) -> bool | str:
         f"""\
 from playwright.sync_api import Page
 
-from shiny.playwright.controls import <IMPORT REQUIRED CONTROLS>
+from shiny.playwright import controller
 from shiny.run import ShinyAppProc
 
 
 def {test_name}(page: Page, local_app: ShinyAppProc):
 
     page.goto(local_app.url)
-    # Add tests code here
+    # Add test code here
 """
         if is_same_dir
         else f"""\
 from playwright.sync_api import Page
 
-from shiny.playwright.controls import <IMPORT REQUIRED CONTROLS>
+from shiny.playwright import controller
 from shiny.pytest import create_app_fixture
 from shiny.run import ShinyAppProc
 
@@ -422,7 +422,7 @@ def {test_name}(page: Page, local_app: ShinyAppProc):
 def {test_name}(page: Page, app: ShinyAppProc):
 
     page.goto(app.url)
-    # Add tests code here
+    # Add test code here
 """
     )
     # Make sure test file directory exists

shiny/playwright/__init__.py

@@ -23,6 +23,6 @@
         )
 except ImportError:
     pass
-from . import controls, expect
+from . import controller, expect
 
-__all__ = ["expect", "controls"]
+__all__ = ["expect", "controller"]

tests/playwright/deploys/express-accordion/test_deploys_express_accordion.py

@@ -7,7 +7,7 @@
     skip_if_not_chrome,
 )
 
-from shiny.playwright.controls import Accordion
+from shiny.playwright import controller
 
 app_url = create_deploys_app_url_fixture("shiny_express_accordion")
 
@@ -17,7 +17,7 @@
 def test_express_accordion(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
-    acc = Accordion(page, "express_accordion")
+    acc = controller.Accordion(page, "express_accordion")
     acc_panel_2 = acc.accordion_panel("Panel 2")
     acc_panel_2.expect_open(True)
     acc_panel_2.expect_body("n = 50")

tests/playwright/deploys/express-dataframe/test_deploys_express_dataframe.py

@@ -7,7 +7,7 @@
     skip_if_not_chrome,
 )
 
-from shiny.playwright.controls import OutputDataFrame
+from shiny.playwright import controller
 
 app_url = create_deploys_app_url_fixture("shiny-express-dataframe")
 
@@ -17,5 +17,5 @@
 def test_express_dataframe_deploys(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
-    dataframe = OutputDataFrame(page, "sample_data_frame")
+    dataframe = controller.OutputDataFrame(page, "sample_data_frame")
     dataframe.expect_n_row(6)

tests/playwright/deploys/express-page_default/test_deploys_express_page_default.py

@@ -7,7 +7,7 @@
     skip_if_not_chrome,
 )
 
-from shiny.playwright.controls import NavsetTab
+from shiny.playwright import controller
 
 TIMEOUT = 2 * 60 * 1000
 
@@ -26,12 +26,12 @@ def test_page_default(page: Page, app_url: str) -> None:
 
     # Perform these tests second as their locators are not stable over time.
     # (They require that a locator be realized before finding the second locator)
-    nav_html = NavsetTab(page, "express_navset_tab")
+    nav_html = controller.NavsetTab(page, "express_navset_tab")
     nav_html.expect_content("pre 0pre 1pre 2")
     nav_html.set("div")
     nav_html.expect_content("div 0\ndiv 1\ndiv 2")
     nav_html.set("span")
     nav_html.expect_content("span 0span 1span 2")
 
-    navset_card_tab = NavsetTab(page, "express_navset_card_tab")
+    navset_card_tab = controller.NavsetTab(page, "express_navset_card_tab")
     navset_card_tab.expect_content("")

tests/playwright/deploys/express-page_fillable/test_deploys_express_page_fillable.py

@@ -7,7 +7,7 @@
     skip_if_not_chrome,
 )
 
-from shiny.playwright.controls import Card, OutputTextVerbatim
+from shiny.playwright import controller
 
 app_url = create_deploys_app_url_fixture("express_page_fillable")
 
@@ -17,8 +17,8 @@
 def test_express_page_fillable(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
-    card = Card(page, "card")
-    output_txt = OutputTextVerbatim(page, "txt")
+    card = controller.Card(page, "card")
+    output_txt = controller.OutputTextVerbatim(page, "txt")
     output_txt.expect_value("50")
     bounding_box = card.loc.bounding_box()
     assert bounding_box is not None

tests/playwright/deploys/express-page_fluid/test_deploys_express_page_fluid.py

@@ -7,7 +7,7 @@
     skip_if_not_chrome,
 )
 
-from shiny.playwright.controls import Card, OutputTextVerbatim
+from shiny.playwright import controller
 
 app_url = create_deploys_app_url_fixture("express_page_fluid")
 
@@ -17,8 +17,8 @@
 def test_express_page_fluid(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
-    card = Card(page, "card")
-    output_txt = OutputTextVerbatim(page, "txt")
+    card = controller.Card(page, "card")
+    output_txt = controller.OutputTextVerbatim(page, "txt")
     output_txt.expect_value("50")
     bounding_box = card.loc.bounding_box()
     assert bounding_box is not None

tests/playwright/deploys/express-page_sidebar/test_deploys_express_page_sidebar.py

@@ -7,7 +7,7 @@
     skip_if_not_chrome,
 )
 
-from shiny.playwright.controls import OutputTextVerbatim, Sidebar
+from shiny.playwright import controller
 
 app_url = create_deploys_app_url_fixture("express_page_sidebar")
 
@@ -17,7 +17,7 @@
 def test_express_page_sidebar(page: Page, app_url: str) -> None:
     page.goto(app_url)
 
-    sidebar = Sidebar(page, "sidebar")
+    sidebar = controller.Sidebar(page, "sidebar")
     sidebar.expect_text("SidebarTitle Sidebar Content")
-    output_txt = OutputTextVerbatim(page, "txt")
+    output_txt = controller.OutputTextVerbatim(page, "txt")
     output_txt.expect_value("50")

tests/playwright/shiny/async/test_async.py

@@ -3,26 +3,22 @@
 
 from playwright.sync_api import Page, expect
 
-from shiny.playwright.controls import (
-    InputActionButton,
-    InputTextArea,
-    OutputTextVerbatim,
-)
+from shiny.playwright import controller
 from shiny.run import ShinyAppProc
 
 
 def test_async_app(page: Page, local_app: ShinyAppProc) -> None:
     page.goto(local_app.url)
 
-    InputTextArea(page, "value").set("Hello\nGoodbye")
-    InputActionButton(page, "go").click()
+    controller.InputTextArea(page, "value").set("Hello\nGoodbye")
+    controller.InputActionButton(page, "go").click()
 
     # TODO-future; Make into proper class
     progress = page.locator("#shiny-notification-panel")
     expect(progress).to_be_visible()
     expect(progress).to_contain_text("Calculating...")
 
-    OutputTextVerbatim(page, "hash_output").expect_value(
+    controller.OutputTextVerbatim(page, "hash_output").expect_value(
         "2e220fb9d401bf832115305b9ae0277e7b8b1a9368c6526e450acd255e0ec0c2", timeout=2000
     )
 

tests/playwright/shiny/bugs/0648-update-slider-datetime-value/test_update_slider_datetime_value.py

@@ -4,7 +4,7 @@
 
 from playwright.sync_api import Page, expect
 
-from shiny.playwright.controls import InputActionButton, InputSlider, OutputTextVerbatim
+from shiny.playwright import controller
 from shiny.run import ShinyAppProc
 
 
@@ -16,9 +16,9 @@ def check_case(
         min: tuple[Optional[str], Optional[str]] = (None, None),
         max: tuple[Optional[str], Optional[str]] = (None, None),
     ):
-        slider_times = InputSlider(page, f"{id}-times")
-        btn_reset = InputActionButton(page, f"{id}-reset")
-        out_txt = OutputTextVerbatim(page, f"{id}-txt")
+        slider_times = controller.InputSlider(page, f"{id}-times")
+        btn_reset = controller.InputActionButton(page, f"{id}-reset")
+        out_txt = controller.OutputTextVerbatim(page, f"{id}-txt")
 
         if value[0] is not None:
             out_txt.expect_value(value[0])

tests/playwright/shiny/bugs/0666-sidebar/test_sidebar_colors.py

@@ -3,8 +3,8 @@
 from colors import bg_color, fg_color
 from playwright.sync_api import Page, expect
 
-from shiny.playwright.controls import Sidebar
-from shiny.playwright.controls._controls import _expect_class_value
+from shiny.playwright import controller
+from shiny.playwright.controller._controls import _expect_class_value
 from shiny.run import ShinyAppProc
 
 
@@ -38,7 +38,7 @@ def test_sidebar_bg_colors(page: Page, local_app: ShinyAppProc) -> None:
         expect(sidebar).to_have_css("background-color", bg_color)
         expect(sidebar).to_have_css("color", fg_color)
 
-    s1 = Sidebar(page, "s1")
+    s1 = controller.Sidebar(page, "s1")
     s1.expect_position("left")
-    s2 = Sidebar(page, "s2")
+    s2 = controller.Sidebar(page, "s2")
     s2.expect_position("right")

tests/playwright/shiny/bugs/0676-row-selection/test_0676_row_selection.py

@@ -2,7 +2,7 @@
 
 from playwright.sync_api import Page
 
-from shiny.playwright.controls import OutputCode, OutputDataFrame
+from shiny.playwright import controller
 from shiny.run import ShinyAppProc
 
 
@@ -12,9 +12,9 @@ def test_row_selection(page: Page, local_app: ShinyAppProc) -> None:
     # The purpose of this test is to make sure that the data grid can work on Pandas
     # data frames that use an index that is not simply 0-based integers.
 
-    grid = OutputDataFrame(page, "grid")
-    detail = OutputDataFrame(page, "detail")
-    selected_rows = OutputCode(page, "selected_rows")
+    grid = controller.OutputDataFrame(page, "grid")
+    detail = controller.OutputDataFrame(page, "detail")
+    selected_rows = controller.OutputCode(page, "selected_rows")
 
     grid.expect_cell("three", row=2, col=0)
     detail.expect_n_row(0)