Fixed some of the failing tests

Author: karangattu

shiny/playwright/controller/_base.py

@@ -120,7 +120,6 @@ def set_text(
     # TODO-future; Composable set() method
     loc.fill("", timeout=timeout)  # Reset the value
     loc.type(text, delay=delay, timeout=timeout)  # Type the value
-    loc.press("Enter", timeout=timeout)
 
 
 def _expect_multiple(loc: Locator, multiple: bool, timeout: Timeout = None) -> None:

shiny/playwright/controller/_input_buttons.py

@@ -67,15 +67,14 @@ def expect_disabled(self, value: bool, *, timeout: Timeout = None):
 
 
 class InputBookmarkButton(
-    WidthLocStlyeM,
-    InputActionBase,
+    InputActionButton,
 ):
     """Controller for :func:`shiny.ui.input_bookmark_button`."""
 
     def __init__(
         self,
         page: Page,
-        id: str = "`._bookmark_`",
+        id: str = "._bookmark_",
     ) -> None:
         """
         Initializes the input bookmark button.
@@ -90,7 +89,6 @@ def __init__(
         super().__init__(
             page,
             id=id,
-            loc=f"button#{id}.action-button.shiny-bound-input",
         )
 
     def expect_disabled(self, value: bool, *, timeout: Timeout = None):
@@ -104,9 +102,7 @@ def expect_disabled(self, value: bool, *, timeout: Timeout = None):
         timeout
             The maximum time to wait for the expectation to be fulfilled. Defaults to `None`.
         """
-        _expect_attribute_to_have_value(
-            self.loc, "disabled", re.compile(".*") if value else None, timeout=timeout
-        )
+        super().expect_disabled(value, timeout=timeout)
 
 
 class InputDarkMode(UiBase):

shiny/playwright/controller/_input_fields.py

@@ -647,6 +647,20 @@ def expect_daysofweekdisabled(
             timeout=timeout,
         )
 
+    def set(self, value: str, *, timeout: Timeout = None) -> None:
+        """
+        Sets the text value
+
+        Parameters
+        ----------
+        value
+            The text to set.
+        timeout
+            The maximum time to wait for the text to be set. Defaults to `None`.
+        """
+        set_text(self.loc, value, timeout=timeout)
+        self.loc.press("Enter", timeout=timeout)
+
 
 class InputDate(_DateBase):
     def __init__(self, page: Page, id: str) -> None:

shiny/ui/_input_select.py

@@ -200,7 +200,9 @@ def input_select(
 
     resolved_id = resolve_id(id)
 
-    choices_ = restore_input(resolved_id, choices)
+    choices_ = _normalize_choices(choices)
+
+    selected = restore_input(resolved_id, selected)
     if selected is None and not multiple:
         selected = _find_first_option(choices_)
 

shiny/ui/_input_slider.py

@@ -1,5 +1,7 @@
 from __future__ import annotations
 
+from shiny.bookmark._restore_state import restore_input
+
 __all__ = (
     "input_slider",
     "SliderValueArg",
@@ -140,9 +142,10 @@ def input_slider(
     * :func:`~shiny.ui.update_slider`
     """
 
+    resolved_id = resolve_id(id)
+    value = restore_input(resolved_id, value)
     # Thanks to generic typing, max, value, etc. should be of the same type
     data_type = _slider_type(min)
-
     # Make sure min, max, value, and step are all numeric
     # (converts dates/datetimes to milliseconds since epoch...this is the value JS wants)
     min_num = _as_numeric(min)
@@ -201,7 +204,6 @@ def input_slider(
     # ionRangeSlider wants attr = 'true'/'false'
     props = {k: str(v).lower() if isinstance(v, bool) else v for k, v in props.items()}
 
-    resolved_id = resolve_id(id)
     slider_tag = div(
         shiny_input_label(resolved_id, label),
         tags.input(**props),

shiny/ui/_input_text.py

@@ -182,7 +182,7 @@ def input_text_area(
 
     resolved_id = resolve_id(id)
     area = tags.textarea(
-        value=restore_input(resolved_id, value),
+        restore_input(resolved_id, value),
         id=resolved_id,
         class_=" ".join(classes),
         style=css(width=None if width else "100%", height=height, resize=resize),

tests/playwright/ai_generated_apps/bookmark_tests/bookmark_exclusion/app-core.py

@@ -39,26 +39,10 @@ def excluded_module_text():
     async def _():
         await session.bookmark()
 
-    @session.bookmark.on_bookmark
-    async def _(state: BookmarkState):
-        # 3. Store the value directly
-        state.values["module_num"] = input.num_in()
-
-    @session.bookmark.on_restore
-    def _(state: RestoreState):
-        # 4. Fix: Correct key name and input access
-        if "module_num" in state.values:
-            ui.update_numeric("num_in", value=state.values["module_num"])
-
-        # 5. Fix: Correct input access for module
-        if "text_in" in state.input:
-            print(f"module on_restore: text: {state.input['text_in']}")
-
 
 def app_ui(request: Request):
     return ui.page_fluid(
         mod_ui("mod1"),
-        ui.input_bookmark_button(),
     )
 
 

tests/playwright/ai_generated_apps/bookmark_tests/bookmark_exclusion/test_bookmark_exclusion.py

@@ -29,9 +29,6 @@ def test_bookmark_exclusion(page: Page, app: ShinyAppProc) -> None:
     mod1_excluded.set("Hello excluded")
     mod1_excluded_txt.expect_value("Excluded text: Hello excluded")
 
-    # click bookmark button
-    page.get_by_role("button", name="🔗 Bookmark...").click()
-
     # reload page
     page.reload()
 

tests/playwright/ai_generated_apps/bookmark_tests/input_checkbox/test_input_checkbox_core_express_bookmarking.py renamed to tests/playwright/ai_generated_apps/bookmark_tests/input_checkbox/test_input_checkbox_express_bookmarking.py

@@ -33,11 +33,8 @@ def test_checkbox_demo(page: Page, app: ShinyAppProc) -> None:
     module_checkbox.expect_checked(True)
     module_text.expect_value("Checkbox value: True")
 
-    # TODO-Karan: Implement bookmark button controller
-    # bookmark_button = controller.InputBookmarkButton(page)
-    # bookmark_button.click()
-
-    page.get_by_role("button", name="🔗 Bookmark...").click()
+    bookmark_button = controller.InputBookmarkButton(page)
+    bookmark_button.click()
 
     # reload the page to test bookmark
     page.reload()

tests/playwright/ai_generated_apps/bookmark_tests/input_checkbox_group/test_input_checkbox_group_core_express_bookmarking.py renamed to tests/playwright/ai_generated_apps/bookmark_tests/input_checkbox_group/test_input_checkbox_group_express_bookmarking.py

@@ -36,7 +36,8 @@ def test_checkbox_group_demo(page: Page, app: ShinyAppProc) -> None:
     module_text.expect_value("Checkbox group values: ('Choice A', 'Choice C')")
 
     # Bookmark the state
-    page.get_by_role("button", name="🔗 Bookmark...").click()
+    bookmark_button = controller.InputBookmarkButton(page)
+    bookmark_button.click()
 
     # Reload the page to test bookmark
     page.reload()