feat(tests): Add shiny.pytest, shiny.run and shiny.playwright

setup.cfg

@@ -126,7 +126,7 @@ shiny = py.typed
 
 [options.entry_points]
 pytest11 =
-    shiny-test = shiny.test._pytest
+    shiny-test = shiny.pytest._pytest
 console_scripts =
     shiny = shiny._main:main
 

shiny/playwright/__init__.py

@@ -0,0 +1,4 @@
+from ._expect import expect_to_change
+from . import controls
+
+__all__ = ["expect_to_change", "controls"]

shiny/playwright/controls/__init__.py

@@ -0,0 +1,95 @@
+from ._controls import (
+    InputActionButton,
+    InputActionLink,
+    InputCheckbox,
+    InputCheckboxGroup,
+    InputDarkMode,
+    InputDate,
+    InputDateRange,
+    InputFile,
+    InputNumeric,
+    InputPassword,
+    InputRadioButtons,
+    InputSelect,
+    InputSelectize,
+    InputSlider,
+    InputSliderRange,
+    InputSwitch,
+    InputTaskButton,
+    InputText,
+    InputTextArea,
+    OutputCode,
+    OutputDataFrame,
+    OutputImage,
+    OutputPlot,
+    OutputTable,
+    OutputText,
+    OutputTextVerbatim,
+    OutputUi,
+    ValueBox,
+    Card,
+    Accordion,
+    Sidebar,
+    Popover,
+    Tooltip,
+    LayoutNavItem,
+    LayoutNavSetBar,
+    LayoutNavSetCardPill,
+    LayoutNavSetCardTab,
+    LayoutNavSetCardUnderline,
+    LayoutNavSetHidden,
+    LayoutNavSetPill,
+    LayoutNavSetPillList,
+    LayoutNavsetTab,
+    LayoutNavSetUnderline,
+    DownloadButton,
+    DownloadLink,
+)
+
+__all__ = [
+    "InputActionButton",
+    "InputActionLink",
+    "InputCheckbox",
+    "InputCheckboxGroup",
+    "InputDarkMode",
+    "InputDate",
+    "InputDateRange",
+    "InputFile",
+    "InputNumeric",
+    "InputPassword",
+    "InputRadioButtons",
+    "InputSelect",
+    "InputSelectize",
+    "InputSlider",
+    "InputSliderRange",
+    "InputSwitch",
+    "InputTaskButton",
+    "InputText",
+    "InputTextArea",
+    "OutputCode",
+    "OutputDataFrame",
+    "OutputImage",
+    "OutputPlot",
+    "OutputTable",
+    "OutputText",
+    "OutputTextVerbatim",
+    "OutputUi",
+    "ValueBox",
+    "Card",
+    "Accordion",
+    "Sidebar",
+    "Popover",
+    "Tooltip",
+    "LayoutNavItem",
+    "LayoutNavSetBar",
+    "LayoutNavSetCardPill",
+    "LayoutNavSetCardTab",
+    "LayoutNavSetCardUnderline",
+    "LayoutNavSetHidden",
+    "LayoutNavSetPill",
+    "LayoutNavSetPillList",
+    "LayoutNavsetTab",
+    "LayoutNavSetUnderline",
+    "DownloadButton",
+    "DownloadLink",
+]

shiny/test/_controls.py → shiny/playwright/controls/_controls.py

@@ -11,15 +11,16 @@
 import typing
 from typing import Literal, Optional, Protocol
 
+from playwright.sync_api import FilePayload, FloatRect, Locator, Page, Position
+from playwright.sync_api import expect as playwright_expect
+
 # Import `shiny`'s typing extentions.
 # Since this is a private file, tell pyright to ignore the import
-from .._typing_extensions import TypeGuard  # pyright: ignore[reportPrivateImportUsage]
-from .._typing_extensions import (
+from ..._typing_extensions import TypeGuard  # pyright: ignore[reportPrivateImportUsage]
+from ..._typing_extensions import (
     assert_type,  # pyright: ignore[reportPrivateImportUsage]
 )
-from ..types import MISSING, MISSING_TYPE
-from ._playwright import FilePayload, FloatRect, Locator, Page, Position
-from ._playwright import expect as playwright_expect
+from ...types import MISSING, MISSING_TYPE
 
 """
 Questions:

shiny/pytest/__init__.py

@@ -0,0 +1,3 @@
+from ._fixture import create_app_fixture, ScopeName
+
+__all__ = ("create_app_fixture", "ScopeName")

shiny/test/fixture/_fixture.py → shiny/pytest/_fixture.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from .._conftest import shiny_app_gen
+from ..run._conftest import shiny_app_gen
 
 __all__ = (
     "create_app_fixture",

shiny/test/_pytest.py → shiny/pytest/_pytest.py

@@ -5,7 +5,7 @@
 
 import pytest
 
-from ._conftest import ShinyAppProc, shiny_app_gen
+from ..run._conftest import ShinyAppProc, shiny_app_gen
 
 
 @pytest.fixture(scope="module")

shiny/test/__init__.py → shiny/run/__init__.py

@@ -11,14 +11,11 @@
 from ._conftest import ShinyAppProc
 
 # from ._expect import expect_to_change
-from ._playwright import Locator, Page, expect
+
 
 __all__ = (
     # TODO-future: Find the proper location for these methods to be returned
     # "run_shiny_app",
     # "expect_to_change",
     "ShinyAppProc",
-    "Page",
-    "Locator",
-    "expect",
 )

tests/playwright/README.md

@@ -49,7 +49,7 @@ as the calling `test_*.py` file.
 ```python
 
 import re
-from shiny.test import Page, ShinyAppProc, expect
+from playwright.sync_api import Locator, Page, expect ShinyAppProc, expect
 
 
 def test_airmass(page: Page, local_app: ShinyAppProc):
@@ -67,7 +67,7 @@ use it from test funcs.
 ```python
 import re
 
-from shiny.test import Page, ShinyAppProc
+from playwright.sync_api import Locator, Page, expect ShinyAppProc
 from conftest import create_example_fixture
 
 airmass_app = create_example_fixture("airmass")

tests/playwright/conftest.py

@@ -6,10 +6,10 @@
 from pathlib import PurePath
 
 import pytest
+from playwright.sync_api import BrowserContext, Page
 
-from shiny.test._playwright import BrowserContext, Page
-from shiny.test.fixture import create_app_fixture
-from shiny.test.fixture._fixture import ScopeName as ScopeName
+from shiny.pytest import ScopeName as ScopeName
+from shiny.pytest import create_app_fixture
 
 __all__ = (
     "create_doc_example_fixture",

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

@@ -1,13 +1,13 @@
 import pytest
+from playwright.sync_api import Page
 from utils.deploy_utils import (
     create_deploys_app_url_fixture,
     reruns,
     reruns_delay,
     skip_if_not_chrome,
 )
 
-from shiny.test import Page
-from shiny.test._controls import Accordion
+from shiny.playwright.controls import Accordion
 
 app_url = create_deploys_app_url_fixture("shiny_express_accordion")
 

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

@@ -1,13 +1,13 @@
 import pytest
+from playwright.sync_api import Page
 from utils.deploy_utils import (
     create_deploys_app_url_fixture,
     reruns,
     reruns_delay,
     skip_if_not_chrome,
 )
 
-from shiny.test import Page
-from shiny.test._controls import OutputDataFrame
+from shiny.playwright.controls import OutputDataFrame
 
 app_url = create_deploys_app_url_fixture("shiny-express-dataframe")
 

tests/playwright/deploys/express-folium/test_deploys_express_folium.py

@@ -1,13 +1,12 @@
 import pytest
+from playwright.sync_api import Page, expect
 from utils.deploy_utils import (
     create_deploys_app_url_fixture,
     reruns,
     reruns_delay,
     skip_if_not_chrome,
 )
 
-from shiny.test import Page, expect
-
 app_url = create_deploys_app_url_fixture("shiny-express-folium")
 
 

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

@@ -1,13 +1,13 @@
 import pytest
+from playwright.sync_api import Page, expect
 from utils.deploy_utils import (
     create_deploys_app_url_fixture,
     reruns,
     reruns_delay,
     skip_if_not_chrome,
 )
 
-from shiny.test import Page, expect
-from shiny.test._controls import LayoutNavsetTab
+from shiny.playwright.controls import LayoutNavsetTab
 
 TIMEOUT = 2 * 60 * 1000
 

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

@@ -1,13 +1,13 @@
 import pytest
+from playwright.sync_api import Page
 from utils.deploy_utils import (
     create_deploys_app_url_fixture,
     reruns,
     reruns_delay,
     skip_if_not_chrome,
 )
 
-from shiny.test import Page
-from shiny.test._controls import Card, OutputTextVerbatim
+from shiny.playwright.controls import Card, OutputTextVerbatim
 
 app_url = create_deploys_app_url_fixture("express_page_fillable")
 

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

@@ -1,13 +1,13 @@
 import pytest
+from playwright.sync_api import Page
 from utils.deploy_utils import (
     create_deploys_app_url_fixture,
     reruns,
     reruns_delay,
     skip_if_not_chrome,
 )
 
-from shiny.test import Page
-from shiny.test._controls import Card, OutputTextVerbatim
+from shiny.playwright.controls import Card, OutputTextVerbatim
 
 app_url = create_deploys_app_url_fixture("express_page_fluid")
 

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

@@ -1,13 +1,13 @@
 import pytest
+from playwright.sync_api import Page
 from utils.deploy_utils import (
     create_deploys_app_url_fixture,
     reruns,
     reruns_delay,
     skip_if_not_chrome,
 )
 
-from shiny.test import Page
-from shiny.test._controls import OutputTextVerbatim, Sidebar
+from shiny.playwright.controls import OutputTextVerbatim, Sidebar
 
 app_url = create_deploys_app_url_fixture("express_page_sidebar")
 

tests/playwright/deploys/plotly/test_plotly_app.py

@@ -1,13 +1,12 @@
 import pytest
+from playwright.sync_api import Page, expect
 from utils.deploy_utils import (
     create_deploys_app_url_fixture,
     reruns,
     reruns_delay,
     skip_if_not_chrome,
 )
 
-from shiny.test import Page, expect
-
 TIMEOUT = 2 * 60 * 1000
 app_url = create_deploys_app_url_fixture("example_deploy_app_A")
 

tests/playwright/deploys/shiny-client-console-error/test_shiny_client_error.py

@@ -1,13 +1,12 @@
 import pytest
+from playwright.sync_api import Page, expect
 from utils.deploy_utils import (
     create_deploys_app_url_fixture,
     reruns,
     reruns_delay,
     skip_if_not_chrome,
 )
 
-from shiny.test import Page, expect
-
 app_url = create_deploys_app_url_fixture("shiny_client_console_error")
 
 

tests/playwright/examples/example_apps.py

@@ -6,8 +6,8 @@
 
 from playwright.sync_api import ConsoleMessage, Page
 
-from shiny.test import ShinyAppProc
-from shiny.test._conftest import run_shiny_app
+from shiny.run import ShinyAppProc
+from shiny.run._conftest import run_shiny_app
 
 here_tests_e2e_examples = PurePath(__file__).parent
 pyshiny_root = here_tests_e2e_examples.parent.parent.parent

tests/playwright/examples/test_api_examples.py

@@ -1,7 +1,6 @@
 import pytest
 from example_apps import get_apps, reruns, reruns_delay, validate_example
-
-from shiny.test import Page
+from playwright.sync_api import Page
 
 
 @pytest.mark.flaky(reruns=reruns, reruns_delay=reruns_delay)

tests/playwright/examples/test_cpuinfo.py

@@ -3,8 +3,9 @@
 import re
 
 from conftest import create_example_fixture
+from playwright.sync_api import Page, expect
 
-from shiny.test import Page, ShinyAppProc, expect
+from shiny.run import ShinyAppProc
 
 cpuinfo_app = create_example_fixture("cpuinfo")