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

Merge remote-tracking branch 'origin/v13/dev' into v14/dev

Browse Source 
# Conflicts:
#	Directory.Build.props
#	src/Umbraco.Web.BackOffice/Controllers/MediaController.cs
This commit is contained in:
Bjarke Berg
2023-07-07 08:56:17 +02:00
parent c7a38cdac4 fe6cdb0f17
commit d991285466
38 changed files with 1252 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Components/ComponentTests.cs
View File

@@ -153,11 +153,20 @@ public class ComponentTests
return new ProfilingLogger(Mock.Of<ILogger<ProfilingLogger>>(), Mock.Of<IProfiler>());
}
if (type == typeof(ILogger<ComponentCollection>))
{
return Mock.Of<ILogger<ComponentCollection>>();
}
if (type == typeof(ILogger<ComponentCollection>))
{
return Mock.Of<ILogger<ComponentCollection>>();
}
if (type == typeof(IServiceProviderIsService))
{
return Mock.Of<IServiceProviderIsService>();
}
throw new NotSupportedException(type.FullName);
});
});
@@ -315,6 +324,11 @@ public class ComponentTests
{
return Mock.Of<ILogger<ComponentCollection>>();
}
if (type == typeof(IServiceProviderIsService))
{
return Mock.Of<IServiceProviderIsService>();
}
throw new NotSupportedException(type.FullName);
});