* 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>
87 lines
4.1 KiB
C#
87 lines
4.1 KiB
C#
using NUnit.Framework;
|
|
using Umbraco.Cms.Core;
|
|
|
|
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
|
|
|
|
public partial class DocumentNavigationServiceTests
|
|
{
|
|
[Test]
|
|
[TestCase("E856AC03-C23E-4F63-9AA9-681B42A58573", "C6173927-0C59-4778-825D-D7B9F45D8DDE")] // Grandchild 1 to Child 1
|
|
[TestCase("A1B1B217-B02F-4307-862C-A5E22DB729EB", "D63C1621-C74A-4106-8587-817DEE5FB732")] // Grandchild 2 to Grandchild 3
|
|
[TestCase("B606E3FF-E070-4D46-8CB9-D31352029FDF", null)] // Child 3 to content root
|
|
public async Task Structure_Updates_When_Restoring_Content(Guid nodeToRestore, Guid? targetParentKey)
|
|
{
|
|
// Arrange
|
|
Guid nodeInRecycleBin = GreatGrandchild1.Key;
|
|
|
|
// Move nodes to recycle bin
|
|
await ContentEditingService.MoveToRecycleBinAsync(nodeInRecycleBin, Constants.Security.SuperUserKey); // Make sure we have an item already in the recycle bin to act as a sibling
|
|
await ContentEditingService.MoveToRecycleBinAsync(nodeToRestore, Constants.Security.SuperUserKey); // Make sure the item is in the recycle bin
|
|
DocumentNavigationQueryService.TryGetParentKeyInBin(nodeToRestore, out Guid? initialParentKey);
|
|
DocumentNavigationQueryService.TryGetSiblingsKeysInBin(nodeInRecycleBin, out IEnumerable<Guid> initialSiblingsKeys);
|
|
DocumentNavigationQueryService.TryGetDescendantsKeysInBin(nodeToRestore, out IEnumerable<Guid> initialDescendantsKeys);
|
|
var beforeRestoreDescendants = initialDescendantsKeys.ToList();
|
|
|
|
// Act
|
|
var restoreAttempt = await ContentEditingService.RestoreAsync(nodeToRestore, targetParentKey, Constants.Security.SuperUserKey);
|
|
Guid restoredItemKey = restoreAttempt.Result.Key;
|
|
|
|
// Assert
|
|
DocumentNavigationQueryService.TryGetParentKey(restoredItemKey, out Guid? restoredItemParentKey);
|
|
DocumentNavigationQueryService.TryGetSiblingsKeysInBin(nodeInRecycleBin, out IEnumerable<Guid> updatedSiblingsKeys);
|
|
DocumentNavigationQueryService.TryGetDescendantsKeys(restoredItemKey, out IEnumerable<Guid> afterRestoreDescendantsKeys);
|
|
var afterRestoreDescendants = afterRestoreDescendantsKeys.ToList();
|
|
Assert.Multiple(() =>
|
|
{
|
|
// Verify siblings count has decreased by one
|
|
Assert.AreEqual(initialSiblingsKeys.Count() - 1, updatedSiblingsKeys.Count());
|
|
|
|
if (targetParentKey is null)
|
|
{
|
|
Assert.IsNull(restoredItemParentKey);
|
|
}
|
|
else
|
|
{
|
|
Assert.IsNotNull(restoredItemParentKey);
|
|
Assert.AreNotEqual(initialParentKey, restoredItemParentKey);
|
|
}
|
|
|
|
Assert.AreEqual(beforeRestoreDescendants, afterRestoreDescendants);
|
|
Assert.AreEqual(targetParentKey, restoredItemParentKey);
|
|
});
|
|
}
|
|
|
|
[Test]
|
|
[TestCase(null)] // Content root
|
|
[TestCase("E48DD82A-7059-418E-9B82-CDD5205796CF")] // Root
|
|
[TestCase("C6173927-0C59-4778-825D-D7B9F45D8DDE")] // Child 1
|
|
[TestCase("E856AC03-C23E-4F63-9AA9-681B42A58573")] // Grandchild 1
|
|
[TestCase("A1B1B217-B02F-4307-862C-A5E22DB729EB")] // Grandchild 2
|
|
[TestCase("60E0E5C4-084E-4144-A560-7393BEAD2E96")] // Child 2
|
|
[TestCase("D63C1621-C74A-4106-8587-817DEE5FB732")] // Grandchild 3
|
|
[TestCase("56E29EA9-E224-4210-A59F-7C2C5C0C5CC7")] // Great-grandchild 1
|
|
public async Task Restoring_Content_Adds_It_Last(Guid? targetParentKey)
|
|
{
|
|
// Arrange
|
|
Guid nodeToRestore = Child3.Key;
|
|
|
|
// Move node to recycle bin
|
|
await ContentEditingService.MoveToRecycleBinAsync(nodeToRestore, Constants.Security.SuperUserKey);
|
|
|
|
// Act
|
|
await ContentEditingService.RestoreAsync(nodeToRestore, targetParentKey, Constants.Security.SuperUserKey);
|
|
|
|
// Assert
|
|
if (targetParentKey is null)
|
|
{
|
|
DocumentNavigationQueryService.TryGetRootKeys(out IEnumerable<Guid> rootKeys);
|
|
Assert.AreEqual(nodeToRestore, rootKeys.Last());
|
|
}
|
|
else
|
|
{
|
|
DocumentNavigationQueryService.TryGetChildrenKeys(targetParentKey.Value, out IEnumerable<Guid> childrenKeys);
|
|
Assert.AreEqual(nodeToRestore, childrenKeys.Last());
|
|
}
|
|
}
|
|
}
|