Test fixes

NuGet · Jan 8, 2018 · 0e0ad2d · 0e0ad2d
1 parent a881e1d
commit 0e0ad2d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs b/tests/NuGetGallery.Facts/Controllers/UsersControllerFacts.cs
@@ -2295,12 +2295,6 @@ public async Task Post_WhenAdminIsNotFound_ShowsError()
                     controller.ModelState["AdminUsername"].Errors.First().ErrorMessage);
             }
 
-            [Fact]
-            public void Post_WhenAdminIsNotConfirmed_ShowsError()
-            {
-                // todo - will add before merging PR
-            }
-
             [Fact]
             public async Task Post_WhenValid_CreatesRequestAndRedirects()
             {
@@ -2340,6 +2334,15 @@ private UsersController CreateController(string accountToTransform, string canTr
 
                 GetMock<IUserService>()
                     .Setup(s => s.RequestTransformToOrganizationAccount(It.IsAny<User>(), It.IsAny<User>()))
+                    .Callback<User, User>((acct, admin) => {
+                        acct.OrganizationMigrationRequest = new OrganizationMigrationRequest()
+                        {
+                            NewOrganization = acct,
+                            AdminUser = admin,
+                            ConfirmationToken = "X",
+                            RequestDate = DateTime.UtcNow
+                        };
+                    })
                     .Returns(Task.CompletedTask)
                     .Verifiable();
 

diff --git a/tests/NuGetGallery.Facts/Services/UserServiceFacts.cs b/tests/NuGetGallery.Facts/Services/UserServiceFacts.cs
@@ -503,13 +503,18 @@ private async Task VerifyCreatesRequest(bool testOverwrite)
                     // Act
                     await service.RequestTransformToOrganizationAccount(account, admin);
 
-                    if (testOverwrite && requestDate != null)
+                    if (testOverwrite)
                     {
-                        Assert.True(requestDate < account.OrganizationMigrationRequest.RequestDate);
-                        Assert.NotEqual(requestToken, account.OrganizationMigrationRequest.ConfirmationToken);
+                        if (requestDate != null)
+                        {
+                            Assert.True(requestDate < account.OrganizationMigrationRequest.RequestDate);
+                            Assert.NotEqual(requestToken, account.OrganizationMigrationRequest.ConfirmationToken);
+                        }
+
+                        requestDate = account.OrganizationMigrationRequest.RequestDate;
+                        requestToken = account.OrganizationMigrationRequest.ConfirmationToken;
+                        await Task.Delay(500); // ensure next requestDate is in future
                     }
-                    requestDate = account.OrganizationMigrationRequest.RequestDate;
-                    requestToken = account.OrganizationMigrationRequest.ConfirmationToken;
 
                     // Assert
                     service.MockUserRepository.Verify(r => r.CommitChangesAsync(), Times.Once);