diff --git a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs index f9637603a7..a8fdc22f84 100644 --- a/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.EntityFrameworkCore/Volo/CmsKit/Pages/EfCorePageRepository.cs @@ -26,7 +26,7 @@ public class EfCorePageRepository : EfCoreRepository - x.Title.ToLower().Contains(filter.ToLower()) || x.Slug.Contains(filter) + x.Title.ToLower().Contains(filter.ToLower()) || x.Slug.ToLower().Contains(filter.ToLower()) ).WhereIf(status.HasValue, x => x.Status == status) .CountAsync(GetCancellationToken(cancellationToken)); } @@ -42,7 +42,7 @@ public class EfCorePageRepository : EfCoreRepository - x.Title.ToLower().Contains(filter.ToLower()) || x.Slug.Contains(filter)) + x.Title.ToLower().Contains(filter.ToLower()) || x.Slug.ToLower().Contains(filter.ToLower())) .WhereIf(status.HasValue, x => x.Status == status) .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .PageBy(skipCount, maxResultCount) diff --git a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs index 7c3e690fe1..7f51c79b3d 100644 --- a/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs +++ b/modules/cms-kit/src/Volo.CmsKit.MongoDB/Volo/CmsKit/MongoDB/Pages/MongoPageRepository.cs @@ -31,7 +31,7 @@ public class MongoPageRepository : MongoDbRepository - u.Title.ToLower().Contains(filter.ToLower()) || u.Slug.Contains(filter) + u.Title.ToLower().Contains(filter.ToLower()) || u.Slug.ToLower().Contains(filter.ToLower()) ).WhereIf(status.HasValue, u => u.Status == status) .CountAsync(cancellation); } @@ -49,7 +49,7 @@ public class MongoPageRepository : MongoDbRepository u.Title.ToLower().Contains(filter) || u.Slug.Contains(filter)) + u => u.Title.ToLower().Contains(filter.ToLower()) || u.Slug.ToLower().Contains(filter.ToLower())) .WhereIf(status.HasValue, u => u.Status == status) .OrderBy(sorting.IsNullOrEmpty() ? nameof(Page.Title) : sorting) .PageBy(skipCount, maxResultCount) diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs index 452c221311..2da2365021 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitDataSeedContributor.cs @@ -358,7 +358,7 @@ public class CmsKitDataSeedContributor : IDataSeedContributor, ITransientDepende private async Task SeedPagesAsync() { - var page1 = new Page(_cmsKitTestData.Page_1_Id, _cmsKitTestData.Page_1_Title, _cmsKitTestData.Page_1_Slug, _cmsKitTestData.Content_1); + var page1 = new Page(_cmsKitTestData.Page_1_Id, _cmsKitTestData.Page_1_Title, _cmsKitTestData.Page_1_Slug, _cmsKitTestData.Content_1, status:_cmsKitTestData.Page_1_Status); await _pageRepository.InsertAsync(page1); var page2 = new Page(_cmsKitTestData.Page_2_Id, _cmsKitTestData.Page_2_Title, _cmsKitTestData.Page_2_Slug, _cmsKitTestData.Content_2); diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestBaseModule.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestBaseModule.cs index 1c2a33ccdf..131c9ac135 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestBaseModule.cs +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestBaseModule.cs @@ -1,4 +1,5 @@ -using Microsoft.Extensions.DependencyInjection; +using System.Globalization; +using Microsoft.Extensions.DependencyInjection; using NSubstitute; using Volo.Abp; using Volo.Abp.Authorization; @@ -23,6 +24,10 @@ public class CmsKitTestBaseModule : AbpModule public override void PreConfigureServices(ServiceConfigurationContext context) { + // Set culture to InvariantCulture to avoid Turkish-I problem and other culture-specific issues in tests + CultureInfo.DefaultThreadCurrentCulture = CultureInfo.InvariantCulture; + CultureInfo.DefaultThreadCurrentUICulture = CultureInfo.InvariantCulture; + OneTimeRunner.Run(() => { GlobalFeatureManager.Instance.Modules.CmsKit().EnableAll(); diff --git a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestData.cs b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestData.cs index c9837f0af9..e3a2d78cab 100644 --- a/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestData.cs +++ b/modules/cms-kit/test/Volo.CmsKit.TestBase/CmsKitTestData.cs @@ -2,6 +2,7 @@ using JetBrains.Annotations; using Volo.Abp.DependencyInjection; using Volo.CmsKit.Blogs; +using Volo.CmsKit.Pages; namespace Volo.CmsKit; @@ -47,6 +48,8 @@ public class CmsKitTestData : ISingletonDependency public string Page_1_Title { get; } = "Imagine Dragons - Believer Lyrics"; public string Page_1_Slug { get; } = "imagine-dragons-believer-lyrics"; + + public PageStatus Page_1_Status { get; } = PageStatus.Publish; public Guid Page_1_Id { get; } = Guid.NewGuid();