Skip to content

Commit ebd0d95

Browse files
author
nikolajlauridsen
committed
Merge branch 'v9/feature/add-notifcation-for-url-collision' of https://github.com/umbraco/Umbraco-CMS into v9/feature/add-notifcation-for-url-collision
2 parents 28c9b9b + e0cac5e commit ebd0d95

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

src/Umbraco.Tests.Common/Builders/ContentCultureInfosCollectionBuilder.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Umbraco.Cms.Tests.Common.Builders
77
{
88
public class ContentCultureInfosCollectionBuilder : ChildBuilderBase<ContentBuilder, ContentCultureInfosCollection>, IBuildContentCultureInfosCollection
99
{
10-
private List<ContentCultureInfosBuilder> _cultureInfosBuilders;
10+
private readonly List<ContentCultureInfosBuilder> _cultureInfosBuilders;
1111
public ContentCultureInfosCollectionBuilder(ContentBuilder parentBuilder) : base(parentBuilder) => _cultureInfosBuilders = new List<ContentCultureInfosBuilder>();
1212

1313
public ContentCultureInfosBuilder AddCultureInfos()

src/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Umbraco.
22
// See LICENSE for more details.
33

4-
using System.Globalization;
54
using System.Linq;
65
using System.Net;
76
using System.Net.Http;
@@ -443,12 +442,11 @@ public async Task PostSave_Validates_Domains_Exist()
443442
{
444443
{ new StringContent(JsonConvert.SerializeObject(model)), "contentItem" }
445444
});
445+
446446
var body = await response.Content.ReadAsStringAsync();
447447
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
448448
ContentItemDisplay display = JsonConvert.DeserializeObject<ContentItemDisplay>(body);
449449

450-
var currentThreadCulture = Thread.CurrentThread.CurrentCulture.TwoLetterISOLanguageName;
451-
var currentUICulture = Thread.CurrentThread.CurrentUICulture.TwoLetterISOLanguageName;
452450
ILocalizedTextService localizedTextService = GetRequiredService<ILocalizedTextService>();
453451
var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithNoDomains");
454452

0 commit comments

Comments
 (0)