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

Merge branch 'contrib' into v15/dev

Browse Source
This commit is contained in:
Sebastiaan Janssen
2025-01-15 16:54:02 +01:00
parent aaa025f85e fd9c1a0e9c
commit 37343b24bb
10 changed files with 58 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/Umbraco.Tests.Common/Builders/ContentTypeEditingBuilder.cs
View File

@@ -192,7 +192,7 @@ public class ContentTypeEditingBuilder : ContentTypeEditingBaseBuilder<ContentTy
.Build();
}
public static ContentTypeCreateModel CreateContentTypeWithTwoPropertiesOneVariantAndOneInvariant(string alias = "test", string name = "TestName", string variantPropertyAlias = "variant", string variantPropertyName = "Variant", string invariantAlias = "invariant", string invariantName = "Invariant")
public static ContentTypeCreateModel CreateContentTypeWithTwoPropertiesOneVariantAndOneInvariant(string alias = "test", string name = "TestName", string variantPropertyAlias = "variant", string variantPropertyName = "Variant", string invariantAlias = "invariant", string invariantName = "Invariant")
{
var containerKey = Guid.NewGuid();
var builder = new ContentTypeEditingBuilder();

5
tests/Umbraco.Tests.Common/TestHelperBase.cs
View File

@@ -96,8 +96,7 @@ public abstract class TestHelperBase
Mock.Of<IMediaPathScheme>(),
loggerFactory.CreateLogger<MediaFileManager>(),
Mock.Of<IShortStringHelper>(),
Mock.Of<IServiceProvider>(),
Options.Create(new ContentSettings()));
Mock.Of<IServiceProvider>());
var databaseFactory = new Mock<IUmbracoDatabaseFactory>();
var database = new Mock<IUmbracoDatabase>();
var sqlContext = new Mock<ISqlContext>();
@@ -207,7 +206,7 @@ public abstract class TestHelperBase
throw new ArgumentException("relativePath must start with '~/'", nameof(relativePath));
}
var codeBase = typeof(TestHelperBase).Assembly.CodeBase;
var codeBase = typeof(TestHelperBase).Assembly.Location;
var uri = new Uri(codeBase);
var path = uri.LocalPath;
var bin = Path.GetDirectoryName(path);

2
tests/Umbraco.Tests.Common/TestLastChanceFinder.cs
View File

@@ -8,5 +8,5 @@ namespace Umbraco.Cms.Tests.Common;
public class TestLastChanceFinder : IContentLastChanceFinder
{
public async Task<bool> TryFindContent(IPublishedRequestBuilder frequest) => false;
public Task<bool> TryFindContent(IPublishedRequestBuilder frequest) => Task.FromResult(false);
}