yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixes #U4-2068 and #U4-2125

Browse Source 
Creating test for verifying path is correctly updated when moving items to the recycle bin.
This commit is contained in:
Morten Christensen
2013-04-19 06:07:25 -02:00
parent 35a698cdc9
commit 7ed5a6f706
3 changed files with 34 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Umbraco.Core/Services/ContentService.cs
View File

@@ -683,7 +683,7 @@ namespace Umbraco.Core.Services
}
//Unpublish descendents of the content item that is being moved to trash
var descendants = GetDescendants(content).ToList();
var descendants = GetDescendants(content).OrderBy(x => x.Level).ToList();
foreach (var descendant in descendants)
{
UnPublish(descendant, userId);
@@ -819,8 +819,8 @@ namespace Umbraco.Core.Services
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateContentRepository(uow))
{
var query = Query<IContent>.Builder.Where(x => x.Path.Contains("-20"));
var contents = repository.GetByQuery(query).OrderByDescending(x => x.ParentId);
var query = Query<IContent>.Builder.Where(x => x.Trashed == true);
var contents = repository.GetByQuery(query).OrderByDescending(x => x.Level);
foreach (var content in contents)
{

6
src/Umbraco.Core/Services/MediaService.cs
View File

@@ -393,7 +393,7 @@ namespace Umbraco.Core.Services
return;
//Find Descendants, which will be moved to the recycle bin along with the parent/grandparent.
var descendants = GetDescendants(media).ToList();
var descendants = GetDescendants(media).OrderBy(x => x.Level).ToList();
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateMediaRepository(uow))
@@ -426,8 +426,8 @@ namespace Umbraco.Core.Services
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateMediaRepository(uow))
{
var query = Query<IMedia>.Builder.Where(x => x.Path.Contains("-21"));
var contents = repository.GetByQuery(query).OrderByDescending(x => x.ParentId);
var query = Query<IMedia>.Builder.Where(x => x.Trashed == true);
var contents = repository.GetByQuery(query).OrderByDescending(x => x.Level);
foreach (var content in contents)
{

28
src/Umbraco.Tests/Services/ContentServiceTests.cs
View File

@@ -567,6 +567,34 @@ namespace Umbraco.Tests.Services
Assert.That(content.Trashed, Is.True);
}
[Test]
public void Can_Move_Content_Structure_To_RecycleBin_And_Empty_RecycleBin()
{
// Arrange
var contentService = ServiceContext.ContentService;
var contentType = ServiceContext.ContentTypeService.GetContentType("umbTextpage");
Content subsubpage = MockedContent.CreateSimpleContent(contentType, "Text Page 3", 1047);
contentService.Save(subsubpage, 0);
var content = contentService.GetById(1046);
// Act
contentService.MoveToRecycleBin(content, 0);
var descendants = contentService.GetDescendants(content);
// Assert
Assert.That(content.ParentId, Is.EqualTo(-20));
Assert.That(content.Trashed, Is.True);
Assert.That(descendants.Count(), Is.EqualTo(3));
Assert.That(descendants.Any(x => x.Path.Contains("-20") == false), Is.False);
//Empty Recycle Bin
contentService.EmptyRecycleBin();
var trashed = contentService.GetContentInRecycleBin();
Assert.That(trashed.Any(), Is.False);
}
[Test]
public void Can_Empty_RecycleBin()
{