Skip to content

Privacy-first password manager with built-in email aliasing. Fully encrypted and self-hostable.

Update deleted item tests (#1404)

Leendert de Borst7b157da4f745
diff --git a/apps/server/AliasVault.Client/Main/Pages/Items/RecentlyDeleted.razor b/apps/server/AliasVault.Client/Main/Pages/Items/RecentlyDeleted.razor
index b9e83d8d9..42c54fe05 100644
--- a/apps/server/AliasVault.Client/Main/Pages/Items/RecentlyDeleted.razor
+++ b/apps/server/AliasVault.Client/Main/Pages/Items/RecentlyDeleted.razor
@@ -49,7 +49,7 @@ else
@foreach (var item in Items)
{
var daysRemaining = GetDaysRemaining(item.DeletedAt);
- <li data-testid="recently-deleted-item" class="relative">
+ <li data-item="deleted" class="relative">
<div class="bg-gray-50 dark:bg-gray-700 border border-gray-200 dark:border-gray-600 rounded-lg p-3">
<div class="flex items-start gap-3">
<div class="flex-1 min-w-0">
@@ -59,7 +59,7 @@ else
Logo="@item.Logo?.FileData"
CardNumber="@ItemService.GetFieldValue(item, FieldKey.CardNumber)"
SizeClass="w-6 h-6" />
- <span data-testid="recently-deleted-item-name" class="font-medium text-gray-900 dark:text-white truncate">
+ <span data-item-name class="font-medium text-gray-900 dark:text-white truncate">
@(item.Name ?? Localizer["Untitled"])
</span>
</div>
@@ -76,10 +76,10 @@ else
</div>
<div class="flex items-center gap-2">
- <button data-testid="restore-button" @onclick="() => RestoreItem(item.Id)" class="px-3 py-1 text-sm bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 rounded hover:bg-green-200 dark:hover:bg-green-900/50">
+ <button data-action="restore" @onclick="() => RestoreItem(item.Id)" class="px-3 py-1 text-sm bg-green-100 dark:bg-green-900/30 text-green-700 dark:text-green-400 rounded hover:bg-green-200 dark:hover:bg-green-900/50">
@Localizer["Restore"]
</button>
- <button data-testid="permanent-delete-button" @onclick="() => ShowDeleteConfirmation(item.Id)" class="px-3 py-1 text-sm bg-red-100 dark:bg-red-900/30 text-red-700 dark:text-red-400 rounded hover:bg-red-200 dark:hover:bg-red-900/50">
+ <button data-action="delete" @onclick="() => ShowDeleteConfirmation(item.Id)" class="px-3 py-1 text-sm bg-red-100 dark:bg-red-900/30 text-red-700 dark:text-red-400 rounded hover:bg-red-200 dark:hover:bg-red-900/50">
@SharedLocalizer["Delete"]
</button>
</div>
@@ -108,7 +108,7 @@ else
<button @onclick="CloseDeleteModal" class="px-4 py-2 text-sm font-medium text-gray-700 bg-gray-100 dark:bg-gray-700 dark:text-gray-300 rounded-lg hover:bg-gray-200 dark:hover:bg-gray-600">
@SharedLocalizer["Cancel"]
</button>
- <button data-testid="confirm-delete-button" @onclick="ConfirmDelete" class="px-4 py-2 text-sm font-medium text-white bg-red-600 rounded-lg hover:bg-red-700">
+ <button data-action="confirm-delete" @onclick="ConfirmDelete" class="px-4 py-2 text-sm font-medium text-white bg-red-600 rounded-lg hover:bg-red-700">
@Localizer["DeletePermanently"]
</button>
</div>
diff --git a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbCleanupTests.cs b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbCleanupTests.cs
index a6fd3e333..d3361f1a7 100644
--- a/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbCleanupTests.cs
+++ b/apps/server/Tests/AliasVault.E2ETests/Tests/Client/Shard2/DbCleanupTests.cs
@@ -18,53 +18,28 @@ namespace AliasVault.E2ETests.Tests.Client.Shard2;
public class DbCleanupTests : ClientPlaywrightTest
{
/// <summary>
- /// Test that deleted items are moved to trash (DeletedAt is set) rather than being immediately removed.
+ /// Test that items appears in recently deleted after deletion, and can also be restored again from the trash.
/// </summary>
/// <returns>Async task.</returns>
[Test]
[Order(1)]
- public async Task DeletedItemsAreMovedToTrashTest()
+ public async Task ItemsCanBeDeletedAndRestoredFromTrashTest()
{
- // Create two items. One random and one with a known name.
+ // Create two items, one placeholder to skip welcome, one testable item.
await CreateItemEntry();
- await CreateItemEntry(new Dictionary<string, string> { { "service-name", "ItemB" } });
-
- // Delete the item with the known name.
- await DeleteItemEntry("ItemB");
-
- // Navigate to recently deleted page and verify item is there.
- await NavigateUsingBlazorRouter("items/recently-deleted");
-
- // Wait for the page to load and check for the deleted item.
- await Page.WaitForSelectorAsync("[data-testid='recently-deleted-item']");
- var deletedItems = await Page.Locator("[data-testid='recently-deleted-item']").CountAsync();
- Assert.That(deletedItems, Is.EqualTo(1), "Expected 1 item in recently deleted.");
-
- // Verify the item name is displayed.
- var itemName = await Page.Locator("[data-testid='recently-deleted-item-name']").TextContentAsync();
- Assert.That(itemName, Does.Contain("ItemB"), "Expected deleted item to be ItemB.");
- }
-
- /// <summary>
- /// Test that items can be restored from the trash.
- /// </summary>
- /// <returns>Async task.</returns>
- [Test]
- [Order(2)]
- public async Task ItemsCanBeRestoredFromTrashTest()
- {
- // Create and delete an item.
await CreateItemEntry(new Dictionary<string, string> { { "service-name", "RestoreMe" } });
+
+ // Delete an item.
await DeleteItemEntry("RestoreMe");
// Navigate to recently deleted page.
await NavigateUsingBlazorRouter("items/recently-deleted");
// Wait for the page to load.
- await Page.WaitForSelectorAsync("[data-testid='recently-deleted-item']");
+ await Page.WaitForSelectorAsync("[data-item='deleted']");
// Click the restore button.
- await Page.Locator("[data-testid='restore-button']").First.ClickAsync();
+ await Page.Locator("[data-action='restore']").First.ClickAsync();
// Wait for restore to complete and navigate to items list.
await WaitForUrlAsync("**/items", 5000);
@@ -79,7 +54,7 @@ public class DbCleanupTests : ClientPlaywrightTest
/// </summary>
/// <returns>Async task.</returns>
[Test]
- [Order(3)]
+ [Order(2)]
public async Task ItemsCanBePermanentlyDeletedTest()
{
// Create and delete an item.
@@ -90,19 +65,19 @@ public class DbCleanupTests : ClientPlaywrightTest
await NavigateUsingBlazorRouter("items/recently-deleted");
// Wait for the page to load.
- await Page.WaitForSelectorAsync("[data-testid='recently-deleted-item']");
+ await Page.WaitForSelectorAsync("[data-item='deleted']");
// Click the permanently delete button.
- await Page.Locator("[data-testid='permanent-delete-button']").First.ClickAsync();
+ await Page.Locator("[data-action='delete']").First.ClickAsync();
// Confirm the deletion in the modal.
- await Page.Locator("[data-testid='confirm-delete-button']").ClickAsync();
+ await Page.Locator("[data-action='confirm-delete']").ClickAsync();
// Wait for deletion to complete.
await Page.WaitForTimeoutAsync(1000);
// Verify the item is no longer in the trash.
- var deletedItems = await Page.Locator("[data-testid='recently-deleted-item']").CountAsync();
+ var deletedItems = await Page.Locator("[data-item='deleted']").CountAsync();
Assert.That(deletedItems, Is.EqualTo(0), "Expected no items in recently deleted after permanent deletion.");
}
}