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

V15: Dont create invalid media (#17534)

Browse Source 
* Don't allow create when there is validation errors

* Fix tests

* Add tests

* Fix last test

* Fix more tests

---------

Co-authored-by: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com>
This commit is contained in:
Nikolaj Geisle
2025-01-08 10:50:53 +01:00
parent 77b6e6e6d9
commit 53a5813189
4 changed files with 70 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
tests/Umbraco.Tests.Integration/Umbraco.Core/Services/MediaEditingServiceTests.cs Normal file
View File

@@ -0,0 +1,60 @@
using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Services;
using Umbraco.Cms.Core.Services.OperationStatus;
using Umbraco.Cms.Tests.Common.Testing;
using Umbraco.Cms.Tests.Integration.Testing;
namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Services;
[TestFixture]
[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
public class MediaEditingServiceTests : UmbracoIntegrationTest
{
protected IMediaTypeService MediaTypeService => GetRequiredService<IMediaTypeService>();
protected IMediaEditingService MediaEditingService => GetRequiredService<IMediaEditingService>();
protected IMediaType ImageMediaType { get; set; }
[SetUp]
public async Task Setup()
{
ImageMediaType = MediaTypeService.Get(Constants.Conventions.MediaTypes.Image);
}
[Test]
public async Task Cannot_Create_Media_With_Mandatory_Property()
{
var imageModel = CreateMediaCreateModel("Image", new Guid(), ImageMediaType.Key);
var imageCreateAttempt = await MediaEditingService.CreateAsync(imageModel, Constants.Security.SuperUserKey);
// Assert
Assert.IsFalse(imageCreateAttempt.Success);
Assert.AreEqual(ContentEditingOperationStatus.PropertyValidationError, imageCreateAttempt.Status);
}
[Test]
public async Task Can_Create_Media_Without_Mandatory_Property()
{
ImageMediaType.PropertyTypes.First(x => x.Alias == "umbracoFile").Mandatory = false;
MediaTypeService.Save(ImageMediaType);
var imageModel = CreateMediaCreateModel("Image", new Guid(), ImageMediaType.Key);
var imageCreateAttempt = await MediaEditingService.CreateAsync(imageModel, Constants.Security.SuperUserKey);
// Assert
Assert.IsTrue(imageCreateAttempt.Success);
Assert.AreEqual(ContentEditingOperationStatus.Success, imageCreateAttempt.Status);
}
private MediaCreateModel CreateMediaCreateModel(string name, Guid key, Guid mediaTypeKey)
=> new()
{
ContentTypeKey = mediaTypeKey,
ParentKey = Constants.System.RootKey,
InvariantName = name,
Key = key,
};
}

2
tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/MediaListViewServiceTests.cs
View File

@@ -202,6 +202,8 @@ public class MediaListViewServiceTests : ContentListViewServiceTestsBase
private async Task<IMedia> CreateRootMediaWithFiveChildrenAsListViewItems(Guid? listViewDataTypeKey = null)
{
var childImageMediaType = MediaTypeService.Get(Constants.Conventions.MediaTypes.Image);
childImageMediaType.PropertyTypes.First(x => x.Alias == "umbracoFile").Mandatory = false;
MediaTypeService.Save(childImageMediaType);
var mediaTypeWithListView = new MediaTypeBuilder()
.WithAlias("album")