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

Merge remote-tracking branch 'origin/v11/dev' into v12/dev

Browse Source 
# Conflicts:
#	src/Umbraco.Cms.ManagementApi/ViewModels/Installer/InstallViewModel.cs
This commit is contained in:
Bjarke Berg
2023-05-15 07:57:45 +02:00
parent 1a8dc32b02 a29d63475c
commit d48a8d7c75
14 changed files with 46 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/Umbraco.Tests.UnitTests/Umbraco.Core/Telemetry/TelemetryServiceTests.cs
View File

@@ -83,7 +83,7 @@ public class TelemetryServiceTests
};
var manifestParser = CreateManifestParser(manifests);
var metricsConsentService = new Mock<IMetricsConsentService>();
metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Basic);
metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Detailed);
var sut = new TelemetryService(
manifestParser,
version,
@@ -118,7 +118,7 @@ public class TelemetryServiceTests
};
var manifestParser = CreateManifestParser(manifests);
var metricsConsentService = new Mock<IMetricsConsentService>();
metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Basic);
metricsConsentService.Setup(x => x.GetConsentLevel()).Returns(TelemetryLevel.Detailed);
var sut = new TelemetryService(
manifestParser,
version,

6
tests/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Controllers/MemberControllerUnitTests.cs
View File

@@ -358,7 +358,8 @@ public class MemberControllerUnitTests
Mock.Get(passwordChanger)
.Setup(x => x.ChangePasswordWithIdentityAsync(
It.IsAny<ChangingPasswordModel>(),
umbracoMembersUserManager))
umbracoMembersUserManager,
null))
.ReturnsAsync(() => attempt);
}
else
@@ -367,7 +368,8 @@ public class MemberControllerUnitTests
Mock.Get(passwordChanger)
.Setup(x => x.ChangePasswordWithIdentityAsync(
It.IsAny<ChangingPasswordModel>(),
umbracoMembersUserManager))
umbracoMembersUserManager,
null))
.ReturnsAsync(() => attempt);
}
}