From ca5bbb783a7009baeaac4e1c1a06d042b0b30741 Mon Sep 17 00:00:00 2001 From: Chris Coutinho Date: Sun, 6 Jul 2025 09:40:27 +0200 Subject: [PATCH] fix: update tests --- tests/integration/test_webdav_cleanup.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/integration/test_webdav_cleanup.py b/tests/integration/test_webdav_cleanup.py index be6c2f0..3d197d8 100644 --- a/tests/integration/test_webdav_cleanup.py +++ b/tests/integration/test_webdav_cleanup.py @@ -29,7 +29,7 @@ async def test_category_change_cleans_up_old_attachments_directory( try: # 1. Create note with initial category logger.info(f"Creating note '{note_title}' in category '{initial_category}'") - created_note = await nc_client.notes_create_note( + created_note = await nc_client.notes.create_note( title=note_title, content="Initial content", category=initial_category ) note_id = created_note["id"] @@ -41,7 +41,7 @@ async def test_category_change_cleans_up_old_attachments_directory( logger.info( f"Adding attachment '{attachment_filename}' to note {note_id} (in {initial_category})" ) - upload_response = await nc_client.add_note_attachment( + upload_response = await nc_client.webdav.add_note_attachment( note_id=note_id, filename=attachment_filename, content=attachment_content, @@ -56,7 +56,7 @@ async def test_category_change_cleans_up_old_attachments_directory( logger.info( f"Verifying attachment retrieval from initial category '{initial_category}'" ) - retrieved_content1, _ = await nc_client.get_note_attachment( + retrieved_content1, _ = await nc_client.webdav.get_note_attachment( note_id=note_id, filename=attachment_filename, category=initial_category ) assert retrieved_content1 == attachment_content @@ -72,9 +72,9 @@ async def test_category_change_cleans_up_old_attachments_directory( logger.info( f"Updating note {note_id} category from '{initial_category}' to '{new_category}'" ) - current_note_data = await nc_client.notes_get_note(note_id=note_id) + current_note_data = await nc_client.notes.get_note(note_id=note_id) current_etag = current_note_data["etag"] - updated_note = await nc_client.notes_update_note( + updated_note = await nc_client.notes.update( note_id=note_id, etag=current_etag, category=new_category, @@ -90,7 +90,7 @@ async def test_category_change_cleans_up_old_attachments_directory( logger.info( f"Verifying attachment retrieval from new category '{new_category}'" ) - retrieved_content2, _ = await nc_client.get_note_attachment( + retrieved_content2, _ = await nc_client.webdav.get_note_attachment( note_id=note_id, filename=attachment_filename, category=new_category ) assert retrieved_content2 == attachment_content @@ -101,7 +101,7 @@ async def test_category_change_cleans_up_old_attachments_directory( f"Trying to retrieve attachment from old category '{initial_category}' - should fail" ) try: - await nc_client.get_note_attachment( + await nc_client.webdav.get_note_attachment( note_id=note_id, filename=attachment_filename, category=initial_category ) # If we get here, it means the old directory still exists (a problem) @@ -165,14 +165,14 @@ async def test_category_change_cleans_up_old_attachments_directory( if note_id: logger.info(f"Cleaning up note ID: {note_id}") try: - await nc_client.notes_delete_note(note_id=note_id) + await nc_client.notes.delete_note(note_id=note_id) logger.info(f"Note {note_id} deleted.") time.sleep(1) # 9. Verify both old and new attachment paths are gone logger.info("Verifying all attachment paths are gone") with pytest.raises(HTTPStatusError) as excinfo_new: - await nc_client.get_note_attachment( + await nc_client.webdav.get_note_attachment( note_id=note_id, filename=attachment_filename, category=new_category, @@ -180,7 +180,7 @@ async def test_category_change_cleans_up_old_attachments_directory( assert excinfo_new.value.response.status_code == 404 with pytest.raises(HTTPStatusError) as excinfo_old: - await nc_client.get_note_attachment( + await nc_client.webdav.get_note_attachment( note_id=note_id, filename=attachment_filename, category=initial_category,