From 2f537c6ec881030f8cb360082102bb9ced7b2dc3 Mon Sep 17 00:00:00 2001
From: Bjarke Berg <mail@bergmania.dk>
Date: Thu, 3 Dec 2020 11:57:03 +0100
Subject: [PATCH] Fix mocking

---
 .../Authorization/BackOfficeHandlerTests.cs           | 11 ++++-------
 .../Authorization/DenyLocalLoginHandlerTests.cs       |  1 +
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs
index 48e3ee9436..9c339c628f 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/BackOfficeHandlerTests.cs
@@ -7,6 +7,7 @@ using NUnit.Framework;
 using Umbraco.Core;
 using Umbraco.Core.Security;
 using Umbraco.Tests.Common.Builders;
+using Umbraco.Tests.Common.Builders.Extensions;
 using Umbraco.Web.BackOffice.Authorization;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
@@ -97,16 +98,12 @@ namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization
         private static Mock<IBackOfficeSecurityAccessor> CreateMockBackOfficeSecurityAccessor(bool requireApproval, bool isAuthenticated, bool isApproved)
         {
             var user = new UserBuilder()
+                .WithIsApproved(isApproved)
                 .Build();
             var mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
             var mockBackOfficeSecurity = new Mock<IBackOfficeSecurity>();
-            mockBackOfficeSecurity
-                .Setup(x => x.ValidateCurrentUser(It.Is<bool>(y => y == false), It.Is<bool>(y => y == requireApproval)))
-                .Returns(isAuthenticated
-                    ? !requireApproval || (requireApproval && isApproved)
-                        ? ValidateRequestAttempt.Success
-                        : ValidateRequestAttempt.FailedNoPrivileges
-                    : ValidateRequestAttempt.FailedNoPrivileges);
+
+            mockBackOfficeSecurity.Setup(x => x.CurrentUser).Returns(user);
             mockBackOfficeSecurityAccessor = new Mock<IBackOfficeSecurityAccessor>();
             mockBackOfficeSecurityAccessor.Setup(x => x.BackOfficeSecurity).Returns(mockBackOfficeSecurity.Object);
             return mockBackOfficeSecurityAccessor;
diff --git a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs
index 8cf091e3f6..602843b128 100644
--- a/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs
+++ b/src/Umbraco.Tests.UnitTests/Umbraco.Web.BackOffice/Authorization/DenyLocalLoginHandlerTests.cs
@@ -5,6 +5,7 @@ using Microsoft.AspNetCore.Authorization;
 using Moq;
 using NUnit.Framework;
 using Umbraco.Web.BackOffice.Authorization;
+using Umbraco.Web.BackOffice.Security;
 using Umbraco.Web.Common.Security;
 
 namespace Umbraco.Tests.UnitTests.Umbraco.Web.BackOffice.Authorization