Fix build (#6564)

Author: xavierdecoster

tests/NuGetGallery.Facts/Controllers/AuthenticationControllerFacts.cs

@@ -834,9 +834,12 @@ public async Task WillNotSendConfirmationEmailWhenConfirmEmailAddressesIsOff()
                     .Verify(x => x.Register("theUsername", "[email protected]", It.IsAny<Credential>(), false));
 
                 GetMock<IMessageService>()
-                    .Verify(x => x.SendNewAccountEmailAsync(
-                        It.IsAny<User>(),
-                        It.IsAny<string>()), Times.Never());
+                    .Verify(
+                    x => x.SendMessageAsync(
+                        It.IsAny<NewAccountMessage>(),
+                        It.IsAny<bool>(),
+                        It.IsAny<bool>()),
+                    Times.Never());
             }
 
             [Fact]
@@ -869,6 +872,20 @@ public async Task WillNotAutoConfirmAndWillSendConfirmationEmailWhenNotExternalC
                         UserInfo = new IdentityInformation("", "", authUser.User.UnconfirmedEmailAddress, "")
                     });
 
+                var confirmationUrl = TestUtility.GallerySiteRootHttps + "account/confirm/" + authUser.User.Username + "/" + authUser.User.EmailConfirmationToken;
+                var configurationService = GetConfigurationService();
+                var messageService = GetMock<IMessageService>();
+                messageService
+                    .Setup(svc => svc.SendMessageAsync(
+                        It.Is<NewAccountMessage>(
+                            msg =>
+                            msg.User == authUser.User
+                            && msg.ConfirmationUrl == confirmationUrl),
+                        false,
+                        false))
+                    .Returns(Task.CompletedTask)
+                    .Verifiable();
+
                 // Act
                 var result = await controller.Register(
                     new LogOnViewModel()
@@ -886,10 +903,7 @@ public async Task WillNotAutoConfirmAndWillSendConfirmationEmailWhenNotExternalC
                 GetMock<AuthenticationService>()
                     .Verify(x => x.Register(authUser.User.Username, authUser.User.UnconfirmedEmailAddress, It.IsAny<Credential>(), false));
 
-                GetMock<IMessageService>()
-                    .Verify(x => x.SendNewAccountEmailAsync(
-                        authUser.User,
-                        TestUtility.GallerySiteRootHttps + "account/confirm/" + authUser.User.Username + "/" + authUser.User.EmailConfirmationToken));
+                messageService.Verify();
 
                 ResultAssert.IsSafeRedirectTo(result, "/theReturnUrl");
             }
@@ -926,6 +940,20 @@ public async Task WillNotAutoConfirmAndWillSendConfirmationEmailWhenModelRegiste
                         UserInfo = new IdentityInformation("", "", "[email protected]", "")
                     });
 
+                var confirmationUrl = TestUtility.GallerySiteRootHttps + "account/confirm/" + authUser.User.Username + "/" + authUser.User.EmailConfirmationToken;
+                var configurationService = GetConfigurationService();
+                var messageService = GetMock<IMessageService>();
+                messageService
+                    .Setup(svc => svc.SendMessageAsync(
+                        It.Is<NewAccountMessage>(
+                            msg =>
+                            msg.User == authUser.User
+                            && msg.ConfirmationUrl == confirmationUrl),
+                        false,
+                        false))
+                    .Returns(Task.CompletedTask)
+                    .Verifiable();
+
                 // Act
                 var result = await controller.Register(
                     new LogOnViewModel()
@@ -943,10 +971,7 @@ public async Task WillNotAutoConfirmAndWillSendConfirmationEmailWhenModelRegiste
                 GetMock<AuthenticationService>()
                     .Verify(x => x.Register(authUser.User.Username, "[email protected]", externalCred, false));
 
-                GetMock<IMessageService>()
-                    .Verify(x => x.SendNewAccountEmailAsync(
-                        authUser.User,
-                        TestUtility.GallerySiteRootHttps + "account/confirm/" + authUser.User.Username + "/" + authUser.User.EmailConfirmationToken));
+                messageService.Verify();
 
                 ResultAssert.IsSafeRedirectTo(result, "/theReturnUrl");
             }