Merge branch 'v10/dev' into v10/contrib

# Conflicts: # src/Umbraco.Core/Actions/ActionAssignDomain.cs # src/Umbraco.Core/Actions/ActionCopy.cs # src/Umbraco.Core/Actions/ActionCreateBlueprintFromContent.cs # src/Umbraco.Core/Actions/ActionDelete.cs # src/Umbraco.Core/Actions/ActionMove.cs # src/Umbraco.Core/Actions/ActionNew.cs # src/Umbraco.Core/Actions/ActionNotify.cs # src/Umbraco.Core/Actions/ActionProtect.cs # src/Umbraco.Core/Actions/ActionRestore.cs # src/Umbraco.Core/Actions/ActionRights.cs # src/Umbraco.Core/Actions/ActionRollback.cs # src/Umbraco.Core/Actions/ActionSort.cs # src/Umbraco.Core/Actions/ActionToPublish.cs # src/Umbraco.Core/Actions/ActionUnpublish.cs # src/Umbraco.Core/Actions/ActionUpdate.cs # src/Umbraco.Core/Constants-Telemetry.cs # src/Umbraco.Core/DependencyInjection/ServiceCollectionExtensions.cs # src/Umbraco.Core/DependencyInjection/UmbracoBuilder.CollectionBuilders.cs # src/Umbraco.Core/DependencyInjection/UmbracoBuilder.Collections.cs # src/Umbraco.Core/Models/Trees/ActionMenuItem.cs # src/Umbraco.Core/Models/Trees/CreateChildEntity.cs # src/Umbraco.Core/Models/Trees/ExportMember.cs # src/Umbraco.Core/Models/Trees/MenuItem.cs # src/Umbraco.Core/Models/Trees/RefreshNode.cs # src/Umbraco.Core/Persistence/Repositories/IRedirectUrlRepository.cs # src/Umbraco.Core/PropertyEditors/NestedContentConfiguration.cs # src/Umbraco.Core/Routing/ContentFinderByRedirectUrl.cs # src/Umbraco.Core/Services/IFileService.cs # src/Umbraco.Core/Services/IRedirectUrlService.cs # src/Umbraco.Core/Services/RedirectUrlService.cs # src/Umbraco.Core/Trees/MenuItemList.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/MemberRepository.cs # src/Umbraco.Infrastructure/Persistence/Repositories/Implement/RedirectUrlRepository.cs # src/Umbraco.Infrastructure/Telemetry/Providers/SystemInformationTelemetryProvider.cs # src/Umbraco.Web.BackOffice/Controllers/CodeFileController.cs # src/Umbraco.Web.BackOffice/Controllers/ContentController.cs # src/Umbraco.Web.BackOffice/Controllers/DictionaryController.cs # src/Umbraco.Web.BackOffice/Controllers/EntityController.cs # src/Umbraco.Web.BackOffice/Controllers/PreviewController.cs # src/Umbraco.Web.BackOffice/Trees/ContentBlueprintTreeController.cs # src/Umbraco.Web.BackOffice/Trees/ContentTreeController.cs # src/Umbraco.Web.BackOffice/Trees/ContentTreeControllerBase.cs # src/Umbraco.Web.BackOffice/Trees/ContentTypeTreeController.cs # src/Umbraco.Web.BackOffice/Trees/DataTypeTreeController.cs # src/Umbraco.Web.BackOffice/Trees/DictionaryTreeController.cs # src/Umbraco.Web.BackOffice/Trees/FileSystemTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MacrosTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MediaTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MediaTypeTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MemberGroupTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MemberTreeController.cs # src/Umbraco.Web.BackOffice/Trees/MemberTypeAndGroupTreeControllerBase.cs # src/Umbraco.Web.BackOffice/Trees/RelationTypeTreeController.cs # src/Umbraco.Web.BackOffice/Trees/TemplatesTreeController.cs # src/Umbraco.Web.UI.Client/src/less/navs.less # templates/UmbracoProject/.gitignore # tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Services/UserDataServiceTests.cs # tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/SystemInformationTelemetryProviderTests.cs
2022-07-11 14:07:08 +02:00
parent 7c2a2996a2 4fc7f775ba
commit e626fca243
3849 changed files with 312969 additions and 300428 deletions
--- a/tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Linq;
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
@@ -11,68 +11,63 @@ using Umbraco.Cms.Core.Telemetry;
 using Umbraco.Cms.Tests.Common.Testing;
 using Umbraco.Cms.Tests.Integration.Testing;

-namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Telemetry
+namespace Umbraco.Cms.Tests.Integration.Umbraco.Core.Telemetry;
+
+[TestFixture]
+[UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
+public class TelemetryServiceTests : UmbracoIntegrationTest
 {
+    protected override void CustomTestSetup(IUmbracoBuilder builder) =>
+        builder.Services.Configure<GlobalSettings>(options => options.Id = Guid.NewGuid().ToString());

-    [TestFixture]
-    [UmbracoTest(Database = UmbracoTestOptions.Database.NewSchemaPerTest)]
-    public class TelemetryServiceTests : UmbracoIntegrationTest
+    private ITelemetryService TelemetryService => GetRequiredService<ITelemetryService>();
+    private IMetricsConsentService MetricsConsentService => GetRequiredService<IMetricsConsentService>();
+
+    [Test]
+    public void Expected_Detailed_Telemetry_Exists()
    {
-        protected override void CustomTestSetup(IUmbracoBuilder builder)
+        var expectedData = new[]
        {
-            builder.Services.Configure<GlobalSettings>(options => options.Id = Guid.NewGuid().ToString());
-        }
+            Constants.Telemetry.RootCount,
+            Constants.Telemetry.DomainCount,
+            Constants.Telemetry.ExamineIndexCount,
+            Constants.Telemetry.LanguageCount,
+            Constants.Telemetry.MacroCount,
+            Constants.Telemetry.MediaCount,
+            Constants.Telemetry.MediaCount,
+            Constants.Telemetry.TemplateCount,
+            Constants.Telemetry.ContentCount,
+            Constants.Telemetry.DocumentTypeCount,
+            Constants.Telemetry.Properties,
+            Constants.Telemetry.UserCount,
+            Constants.Telemetry.UserGroupCount,
+            Constants.Telemetry.ServerOs,
+            Constants.Telemetry.ServerFramework,
+            Constants.Telemetry.OsLanguage,
+            Constants.Telemetry.WebServer,
+            Constants.Telemetry.ModelsBuilderMode,
+            Constants.Telemetry.CustomUmbracoPath,
+            Constants.Telemetry.AspEnvironment,
+            Constants.Telemetry.IsDebug,
+            Constants.Telemetry.DatabaseProvider,
+            Constants.Telemetry.CurrentServerRole
+        };

-        private ITelemetryService TelemetryService => GetRequiredService<ITelemetryService>();
-        private IMetricsConsentService MetricsConsentService => GetRequiredService<IMetricsConsentService>();
+        MetricsConsentService.SetConsentLevel(TelemetryLevel.Detailed);
+        var success = TelemetryService.TryGetTelemetryReportData(out var telemetryReportData);
+        var detailed = telemetryReportData.Detailed.ToArray();

-        [Test]
-        public void Expected_Detailed_Telemetry_Exists()
+        Assert.IsTrue(success);
+        Assert.Multiple(() =>
        {
-            var expectedData = new string[]
+            Assert.IsNotNull(detailed);
+            Assert.AreEqual(expectedData.Length, detailed.Length);
+
+            foreach (var expectedInfo in expectedData)
            {
-                Constants.Telemetry.RootCount,
-                Constants.Telemetry.DomainCount,
-                Constants.Telemetry.ExamineIndexCount,
-                Constants.Telemetry.LanguageCount,
-                Constants.Telemetry.MacroCount,
-                Constants.Telemetry.MediaCount,
-                Constants.Telemetry.MediaCount,
-                Constants.Telemetry.TemplateCount,
-                Constants.Telemetry.ContentCount,
-                Constants.Telemetry.DocumentTypeCount,
-                Constants.Telemetry.Properties,
-                Constants.Telemetry.UserCount,
-                Constants.Telemetry.UserGroupCount,
-                Constants.Telemetry.ServerOs,
-                Constants.Telemetry.ServerFramework,
-                Constants.Telemetry.OsLanguage,
-                Constants.Telemetry.WebServer,
-                Constants.Telemetry.ModelsBuilderMode,
-                Constants.Telemetry.CustomUmbracoPath,
-                Constants.Telemetry.AspEnvironment,
-                Constants.Telemetry.IsDebug,
-                Constants.Telemetry.DatabaseProvider,
-                Constants.Telemetry.CurrentServerRole
-            };
-
-            MetricsConsentService.SetConsentLevel(TelemetryLevel.Detailed);
-            var success = TelemetryService.TryGetTelemetryReportData(out var telemetryReportData);
-            var detailed = telemetryReportData.Detailed.ToArray();
-
-            Assert.IsTrue(success);
-            Assert.Multiple(() =>
-            {
-                Assert.IsNotNull(detailed);
-                Assert.AreEqual(expectedData.Length, detailed.Length);
-
-                foreach (var expectedInfo in expectedData)
-                {
-                    var expected = detailed.FirstOrDefault(x => x.Name == expectedInfo);
-                    Assert.IsNotNull(expected, $"Expected {expectedInfo} to exists in the detailed list");
-                }
-            });
-        }
-
+                var expected = detailed.FirstOrDefault(x => x.Name == expectedInfo);
+                Assert.IsNotNull(expected, $"Expected {expectedInfo} to exists in the detailed list");
+            }
+        });
    }
 }