Tests: Refactor inline mw.click_download_button()

Author: davidfstr

src/crystal/tests/test_do_not_download_groups.py

@@ -84,7 +84,7 @@ async def test_when_browse_to_html_page_and_browser_requests_embedded_resource_t
         assert home_ti is not None
         home_ti.SelectItem()
         async with wait_for_download_task_to_start_and_finish(project):
-            await mw.click_download_button()
+            click_button(mw.download_button)
 
         # Start server
         home_ti.SelectItem()
@@ -120,9 +120,7 @@ async def test_given_embedded_resource_selected_in_entity_tree_when_press_downlo
 
         comic_image_r_ti.SelectItem()
         async with wait_for_download_task_to_start_and_finish(project):
-            await mw.click_download_button(
-                # NOTE: May "finish immediately" because has no embedded subresources
-                immediate_finish_ok=True)
+            click_button(mw.download_button)
         assert comic_image_r.has_any_revisions()
 
 
@@ -135,7 +133,7 @@ async def test_given_do_not_download_group_selected_in_entity_tree_when_press_do
         assert home_ti is not None
         home_ti.SelectItem()
         async with wait_for_download_task_to_start_and_finish(project):
-            await mw.click_download_button()
+            click_button(mw.download_button)
 
         # Expand group children in entity tree
         comic_image_rg_ti = root_ti.find_child(comic_image_rg_pattern)
@@ -149,7 +147,7 @@ async def test_given_do_not_download_group_selected_in_entity_tree_when_press_do
 
         comic_image_rg_ti.SelectItem()
         async with wait_for_download_task_to_start_and_finish(project):
-            await mw.click_download_button()
+            click_button(mw.download_button)
         assert comic_image_r.has_any_revisions()
 
 

src/crystal/tests/test_load_urls.py

@@ -182,7 +182,7 @@ async def test_given_project_database_on_ssd_given_resource_group_node_selected_
 
                     # Wait for download to start and complete
                     async with wait_for_download_task_to_start_and_finish(project):
-                        await mw.click_download_button()
+                        click_button(mw.download_button)
 
                     # Ensure did not show LoadUrlsProgressDialog
                     assert 0 == progress_listener_method.call_count

src/crystal/tests/test_new_group.py

@@ -257,7 +257,7 @@ async def test_given_resource_node_with_multiple_link_children_matching_url_patt
                 grouped_subresources_ti.SelectItem()
                 assert mw.download_button.IsEnabled()
                 async with wait_for_download_task_to_start_and_finish(project):
-                    await mw.click_download_button()
+                    click_button(mw.download_button)
 
             # Forget the group to unbundle the links
             if True:

src/crystal/tests/test_new_root_url.py

@@ -87,7 +87,7 @@ async def test_can_create_root_url(
                 # Download a revision of the root URL
                 home_ti.SelectItem()
                 async with wait_for_download_task_to_start_and_finish(project):
-                    await mw.click_download_button()
+                    click_button(mw.download_button)
                 await _assert_tree_item_icon_tooltip_contains(home_ti, 'Fresh')
 
             # Forget root URL

src/crystal/tests/test_server.py

@@ -76,7 +76,7 @@ async def test_given_default_serving_port_in_use_when_start_serving_project_then
             # Download the URL
             home_ti.SelectItem()
             async with wait_for_download_task_to_start_and_finish(project):
-                await mw.click_download_button()
+                click_button(mw.download_button)
 
             # Try to start second server, also on _DEFAULT_SERVER_PORT.
             # Expect it to actually start on (_DEFAULT_SERVER_PORT + 1).
@@ -700,7 +700,7 @@ async def test_given_nia_page_visible_when_download_button_pressed_then_download
                 # Download the home page
                 home_ti.SelectItem()
                 async with wait_for_download_task_to_start_and_finish(project):
-                    await mw.click_download_button()
+                    click_button(mw.download_button)
 
             home_url_in_archive = get_request_url(
                 home_url,
@@ -791,7 +791,7 @@ async def test_when_download_complete_and_successful_download_with_fetch_error_t
                 # Download the home page
                 home_ti.SelectItem()
                 async with wait_for_download_task_to_start_and_finish(project):
-                    await mw.click_download_button()
+                    click_button(mw.download_button)
 
             home_url_in_archive = get_request_url(
                 home_url,
@@ -2826,7 +2826,7 @@ async def _not_in_archive_page_visible_temporarily() -> AsyncIterator[tuple[str,
                 # Download the home page
                 home_ti.SelectItem()
                 async with wait_for_download_task_to_start_and_finish(project):
-                    await mw.click_download_button()
+                    click_button(mw.download_button)
 
             home_url_in_archive = get_request_url(
                 home_url,
@@ -2874,8 +2874,7 @@ async def _fetch_error_page_visible() -> AsyncIterator[tuple[WebPage, str]]:
                 with network_down():
                     home_ti.SelectItem()
                     async with wait_for_download_task_to_start_and_finish(project):
-                        await mw.click_download_button(
-                            immediate_finish_ok=True)
+                        click_button(mw.download_button)
 
             home_url_in_archive = get_request_url(
                 home_url,

src/crystal/tests/test_tasktree.py

@@ -658,7 +658,7 @@ async def test_when_top_level_task_is_interactive_priority_then_is_scheduled_bef
 
                 # Start download of comic group at non-interactive priority
                 comic_group_ti.SelectItem()
-                await mw.click_download_button(project=project)
+                click_button(mw.download_button)
 
                 if populate_download_group_task_members:
                     # Populate download tasks for the group's members
@@ -741,7 +741,7 @@ async def test_when_download_resource_at_interactive_priority_given_same_resourc
 
             # Start download of comic #1 at non-interactive priority
             comic1_ti.SelectItem()
-            await mw.click_download_button(project=project)
+            click_button(mw.download_button)
 
             # Start download of comic #2 at interactive priority
             comic2_ti.SelectItem()
@@ -789,7 +789,7 @@ async def test_when_download_resource_at_interactive_priority_given_same_resourc
             # by selecting corresponding entity tree node and pressing Download button
             () = project.root_task.children
             comic1_ti.SelectItem()
-            await mw.click_download_button(project=project)
+            click_button(mw.download_button)
             append_deferred_top_level_tasks(project)
 
             # Ensure DownloadResourceTask for comic #1 scheduled at top-level of task tree

src/crystal/tests/test_workflows.py

@@ -412,7 +412,7 @@ async def test_can_download_and_serve_a_static_site_using_main_window_ui() -> No
                 # Test can download root resource (using download button)
                 assert home_ti.IsSelected()
                 async with wait_for_download_task_to_start_and_finish(project):
-                    await mw.click_download_button()
+                    click_button(mw.download_button)
 
                 # Test can view resource (that has a downloaded revision)
                 assert False == (await is_url_not_in_archive(home_url))
@@ -546,7 +546,7 @@ async def test_can_download_and_serve_a_static_site_using_main_window_ui() -> No
 
                     feed_group_ti.SelectItem()
                     async with wait_for_download_task_to_start_and_finish(project):
-                        await mw.click_download_button()
+                        click_button(mw.download_button)
 
                     assert False == (await is_url_not_in_archive(atom_feed_url))
                     assert False == (await is_url_not_in_archive(rss_feed_url))
@@ -885,7 +885,7 @@ async def test_can_download_and_serve_a_site_requiring_dynamic_url_discovery() -
 
                 home_ti.SelectItem()
                 async with wait_for_download_task_to_start_and_finish(project):
-                    await mw.click_download_button()
+                    click_button(mw.download_button)
 
                 # Start server
                 with assert_does_open_webbrowser_to(get_request_url(home_url)):
@@ -1099,7 +1099,7 @@ async def test_can_download_and_serve_a_site_requiring_dynamic_link_rewriting()
 
                 home_ti.SelectItem()
                 async with wait_for_download_task_to_start_and_finish(project):
-                    await mw.click_download_button()
+                    click_button(mw.download_button)
 
             # Home page has JavaScript that will load sound URLs when
             # executed, but Crystal isn't smart enough to find those
@@ -1218,7 +1218,7 @@ async def test_cannot_download_anything_given_project_is_opened_as_readonly() ->
 
                     home_ti.SelectItem()
                     async with wait_for_download_task_to_start_and_finish(project):
-                        await mw.click_download_button()
+                        click_button(mw.download_button)
 
                 # Ensure home page has link to Comic #1
                 home_ti.Expand()
@@ -1344,11 +1344,11 @@ async def test_can_update_downloaded_site_with_newer_page_revisions() -> None:
 
                     home_ti.SelectItem()
                     async with wait_for_download_task_to_start_and_finish(project):
-                        await mw.click_download_button()
+                        click_button(mw.download_button)
 
                     comic1_ti.SelectItem()
                     async with wait_for_download_task_to_start_and_finish(project):
-                        await mw.click_download_button()
+                        click_button(mw.download_button)
 
                     # Ensure resource status badge says URL is fresh
                     await _assert_tree_item_icon_tooltip_contains(home_ti, 'Fresh')
@@ -1373,17 +1373,11 @@ async def test_can_update_downloaded_site_with_newer_page_revisions() -> None:
 
                 # Download: Home, Comic #1
                 if True:
-                    # NOTE: Use direct download rather than
-                    #       click_download_button(..., immediate_finish_ok=True)
-                    #       because the latter takes multiple seconds to run
                     revision_future = Resource(project, home_url).download(
                         wait_for_embedded=True, needs_result=False)
                     while not revision_future.done():
                         await bg_sleep(DEFAULT_WAIT_PERIOD)
 
-                    # NOTE: Use direct download rather than
-                    #       click_download_button(..., immediate_finish_ok=True)
-                    #       because the latter takes multiple seconds to run
                     revision_future = Resource(project, comic1_url).download(
                         wait_for_embedded=True, needs_result=False)
                     while not revision_future.done():
@@ -1411,13 +1405,11 @@ async def test_can_update_downloaded_site_with_newer_page_revisions() -> None:
                 if True:
                     home_ti.SelectItem()
                     async with wait_for_download_task_to_start_and_finish(project):
-                        await mw.click_download_button(
-                            immediate_finish_ok=True)
+                        click_button(mw.download_button)
 
                     comic1_ti.SelectItem()
                     async with wait_for_download_task_to_start_and_finish(project):
-                        await mw.click_download_button(
-                            immediate_finish_ok=True)
+                        click_button(mw.download_button)
 
                 # Ensure resource status badge says URL is fresh
                 await _assert_tree_item_icon_tooltip_contains(home_ti, 'Fresh')

src/crystal/tests/util/windows.py

@@ -397,15 +397,6 @@ def edit_button_label_type(self) -> Literal['Edit', 'Get Info']:
         else:
             raise AssertionError('Unexpected label for edit button: {label!r}')
 
-    # === Operations ===
-    
-    # TODO: Inline
-    async def click_download_button(self,
-            *, immediate_finish_ok: bool=False,
-            project: Project | None=None
-            ) -> None:
-        click_button(self.download_button)
-    
     # === Close ===
 
     CLOSE_TIMEOUT = 4.0