* bump version to 15.1.0 * V15 Fixed the failing smoke tests in the pipeline v15 (#17158) * Fixed the failing tests of Member Group due to UI changes * Fixed the failing tests of Member due to UI changes * Fixed the failing tests of User due to UI changes * Fixed failing tests for Dictionary and Document Type * Updated tests due to test helper changes * Bumped version * Updated assert steps due to the response changes * Updated tests due to api helper changes * Updated tests due to UI changes * Fixed tests for delete partial view * Fixed tests * Added more waits * Updated assert steps * Fixed failing tests for Block Grid and Media * Added more waits * Added skip tests * Removed waits time * Updated assertion steps for User * Added todo * Updated tests due to api helper changes * Bumped version * Added skip tests * Fetch sortOrder for each navigationNode * Update NavigationNode to have sortOrder and change Parent and Children props to keys instead of NavigationNodes * Consider sortOrder when building the navigation structures * Renaming tests * Adding tests for items being the last in structure when added, moved, etc. * Updating names * Cleanup * Updating cache refreshers with changes due to sorting * Refactoring due to sorting changes and resolving key to NavigationNode * Removing sortOrder params from test as they are calculated automatically * Adding content and media integration tests to test sorting functionality * Adding sortOrder param for special case when adding new nodes * Adding new UpdateSortOrder to INavigationManagementService * Revert "V15 Fixed the failing smoke tests in the pipeline v15 (#17158)" This reverts commit31399c3b15. * Revert "bump version to 15.1.0" This reverts commit5e4d15be* Fix revert * Add sort order when creating media --------- Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Co-authored-by: Nhu Dinh <150406148+nhudinh0309@users.noreply.github.com> Co-authored-by: Bjarke Berg <mail@bergmania.dk>
79 lines
3.2 KiB
C#
79 lines
3.2 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
|
|
|
|
public partial class MediaNavigationServiceTests
|
|
{
|
|
[Test]
|
|
[TestCase("1CD97C02-8534-4B72-AE9E-AE52EC94CF31")] // Album
|
|
[TestCase("DBCAFF2F-BFA4-4744-A948-C290C432D564")] // Sub-album 2
|
|
[TestCase("3E489C32-9315-42DA-95CE-823D154B09C8")] // Image 2
|
|
public async Task Structure_Updates_When_Deleting_Media(Guid nodeToDelete)
|
|
{
|
|
// Arrange
|
|
MediaNavigationQueryService.TryGetDescendantsKeys(nodeToDelete, out IEnumerable<Guid> initialDescendantsKeys);
|
|
|
|
// Act
|
|
// Deletes the item whether it is in the recycle bin or not
|
|
var deleteAttempt = await MediaEditingService.DeleteAsync(nodeToDelete, Constants.Security.SuperUserKey);
|
|
Guid deletedItemKey = deleteAttempt.Result.Key;
|
|
|
|
// Assert
|
|
var nodeExists = MediaNavigationQueryService.TryGetDescendantsKeys(deletedItemKey, out _);
|
|
var nodeExistsInRecycleBin = MediaNavigationQueryService.TryGetDescendantsKeysInBin(nodeToDelete, out _);
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(nodeToDelete, deletedItemKey);
|
|
Assert.IsFalse(nodeExists);
|
|
Assert.IsFalse(nodeExistsInRecycleBin);
|
|
foreach (Guid descendant in initialDescendantsKeys)
|
|
{
|
|
var descendantExists = MediaNavigationQueryService.TryGetParentKey(descendant, out _);
|
|
Assert.IsFalse(descendantExists);
|
|
var descendantExistsInRecycleBin = MediaNavigationQueryService.TryGetParentKeyInBin(descendant, out _);
|
|
Assert.IsFalse(descendantExistsInRecycleBin);
|
|
}
|
|
});
|
|
}
|
|
|
|
// TODO: Add more test cases
|
|
[Test]
|
|
public async Task Sort_Order_Of_Siblings_Updates_When_Deleting_Media_And_Adding_New_One()
|
|
{
|
|
// Arrange
|
|
Guid nodeToDelete = SubAlbum2.Key;
|
|
Guid node = Image1.Key;
|
|
|
|
// Act
|
|
await MediaEditingService.DeleteAsync(nodeToDelete, Constants.Security.SuperUserKey);
|
|
|
|
// Assert
|
|
MediaNavigationQueryService.TryGetSiblingsKeys(node, out IEnumerable<Guid> siblingsKeysAfterDeletion);
|
|
var siblingsKeysAfterDeletionList = siblingsKeysAfterDeletion.ToList();
|
|
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(1, siblingsKeysAfterDeletionList.Count);
|
|
Assert.AreEqual(SubAlbum1.Key, siblingsKeysAfterDeletionList[0]);
|
|
});
|
|
|
|
// Create a new sibling under the same parent
|
|
var key = Guid.NewGuid();
|
|
var createModel = CreateMediaCreateModel("Child Image", key, ImageMediaType.Key, Album.Key);
|
|
await MediaEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
|
|
|
|
MediaNavigationQueryService.TryGetSiblingsKeys(node, out IEnumerable<Guid> siblingsKeysAfterCreation);
|
|
var siblingsKeysAfterCreationList = siblingsKeysAfterCreation.ToList();
|
|
|
|
// Verify sibling order after creating the new media
|
|
Assert.Multiple(() =>
|
|
{
|
|
Assert.AreEqual(2, siblingsKeysAfterCreationList.Count);
|
|
Assert.AreEqual(SubAlbum1.Key, siblingsKeysAfterCreationList[0]);
|
|
Assert.AreEqual(key, siblingsKeysAfterCreationList[1]);
|
|
});
|
|
}
|
|
}
|