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

Fix up after merge

Browse Source
This commit is contained in:
Nikolaj Geisle
2022-06-21 08:20:25 +02:00
parent 5b1e344092
commit 4cd7aae611
1 changed files with 36 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
tests/Umbraco.Tests.Integration/Umbraco.Web.BackOffice/Controllers/ContentControllerTests.cs
View File

@@ -74,7 +74,8 @@ public class ContentControllerTests : UmbracoTestServerTestBase
.Build();
// Act
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
// Assert
Assert.AreEqual(HttpStatusCode.NotFound, response.StatusCode);
@@ -135,7 +136,8 @@ public class ContentControllerTests : UmbracoTestServerTestBase
});
// Act
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
// Assert
var body = await response.Content.ReadAsStringAsync();
@@ -203,7 +205,8 @@ public class ContentControllerTests : UmbracoTestServerTestBase
.Build();
// Act
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
// Assert
var body = await response.Content.ReadAsStringAsync();
@@ -256,7 +259,8 @@ public class ContentControllerTests : UmbracoTestServerTestBase
.Build();
// Act
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
// Assert
var body = await response.Content.ReadAsStringAsync();
@@ -316,7 +320,8 @@ public class ContentControllerTests : UmbracoTestServerTestBase
.Build();
// Act
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
// Assert
var body = await response.Content.ReadAsStringAsync();
@@ -378,7 +383,8 @@ public class ContentControllerTests : UmbracoTestServerTestBase
.Build();
// Act
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
// Assert
var body = await response.Content.ReadAsStringAsync();
@@ -420,7 +426,8 @@ public class ContentControllerTests : UmbracoTestServerTestBase
var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
var body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
@@ -433,7 +440,9 @@ public class ContentControllerTests : UmbracoTestServerTestBase
{
Assert.IsNotNull(display);
Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
Assert.AreEqual(expectedMessage, display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
Assert.AreEqual(
expectedMessage,
display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
});
}
@@ -492,17 +501,18 @@ public class ContentControllerTests : UmbracoTestServerTestBase
var enLanguage = localizationService.GetLanguageByIsoCode(UsIso);
var domainService = GetRequiredService<IDomainService>();
var enDomain = new UmbracoDomain("/en") { RootContentId = content.Id, LanguageId = enLanguage.Id };
var enDomain = new UmbracoDomain("/en") {RootContentId = content.Id, LanguageId = enLanguage.Id};
domainService.Save(enDomain);
var dkLanguage = localizationService.GetLanguageByIsoCode(DkIso);
var dkDomain = new UmbracoDomain("/dk") { RootContentId = childContent.Id, LanguageId = dkLanguage.Id };
var dkDomain = new UmbracoDomain("/dk") {RootContentId = childContent.Id, LanguageId = dkLanguage.Id};
domainService.Save(dkDomain);
var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
var result = JsonConvert.SerializeObject(model);
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
var body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
@@ -511,13 +521,15 @@ public class ContentControllerTests : UmbracoTestServerTestBase
var localizedTextService = GetRequiredService<ILocalizedTextService>();
var expectedMessage =
localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new[] { "sv-SE" });
localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new[] {"sv-SE"});
Assert.Multiple(() =>
{
Assert.NotNull(display);
Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
Assert.AreEqual(expectedMessage, display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
Assert.AreEqual(
expectedMessage,
display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
});
}
@@ -551,12 +563,13 @@ public class ContentControllerTests : UmbracoTestServerTestBase
var dkLanguage = localizationService.GetLanguageByIsoCode(DkIso);
var domainService = GetRequiredService<IDomainService>();
var dkDomain = new UmbracoDomain("/") { RootContentId = content.Id, LanguageId = dkLanguage.Id };
var dkDomain = new UmbracoDomain("/") {RootContentId = content.Id, LanguageId = dkLanguage.Id};
domainService.Save(dkDomain);
var url = PrepareApiControllerUrl<ContentController>(x => x.PostSave(null));
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
var body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);
@@ -564,13 +577,15 @@ public class ContentControllerTests : UmbracoTestServerTestBase
var localizedTextService = GetRequiredService<ILocalizedTextService>();
var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new[] { UsIso });
var expectedMessage = localizedTextService.Localize("speechBubbles", "publishWithMissingDomain", new[] {UsIso});
Assert.Multiple(() =>
{
Assert.NotNull(display);
Assert.AreEqual(1, display.Notifications.Count(x => x.NotificationType == NotificationStyle.Warning));
Assert.AreEqual(expectedMessage, display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
Assert.AreEqual(
expectedMessage,
display.Notifications.FirstOrDefault(x => x.NotificationType == NotificationStyle.Warning)?.Message);
});
}
@@ -620,9 +635,9 @@ public class ContentControllerTests : UmbracoTestServerTestBase
var dkLanguage = localizationService.GetLanguageByIsoCode(DkIso);
var usLanguage = localizationService.GetLanguageByIsoCode(UsIso);
var domainService = GetRequiredService<IDomainService>();
var dkDomain = new UmbracoDomain("/") { RootContentId = rootNode.Id, LanguageId = dkLanguage.Id };
var dkDomain = new UmbracoDomain("/") {RootContentId = rootNode.Id, LanguageId = dkLanguage.Id};
var usDomain = new UmbracoDomain("/en") { RootContentId = childNode.Id, LanguageId = usLanguage.Id };
var usDomain = new UmbracoDomain("/en") {RootContentId = childNode.Id, LanguageId = usLanguage.Id};
domainService.Save(dkDomain);
domainService.Save(usDomain);
@@ -634,7 +649,8 @@ public class ContentControllerTests : UmbracoTestServerTestBase
.WithAction(ContentSaveAction.Publish)
.Build();
var response = await Client.PostAsync(url, new MultipartFormDataContent { { new StringContent(JsonConvert.SerializeObject(model)), "contentItem" } });
var response =
await Client.PostAsync(url, new MultipartFormDataContent {{new StringContent(JsonConvert.SerializeObject(model)), "contentItem"}});
var body = await response.Content.ReadAsStringAsync();
body = body.TrimStart(AngularJsonMediaTypeFormatter.XsrfPrefix);