From eb4396e65965e4900882b1e8afad82916412a59b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ram=C3=B3n=20Tom=C3=A1s?= <rtomas@plainconcepts.com>
Date: Mon, 21 Aug 2017 17:57:53 +0200
Subject: [PATCH] Fix accountcontroller signin unit test

---
 src/Web/WebMVC/Controllers/AccountController.cs |  2 +-
 .../UnitTest/Account/AccountControllerTest.cs   | 17 ++++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Web/WebMVC/Controllers/AccountController.cs b/src/Web/WebMVC/Controllers/AccountController.cs
index 9ec896e13..6650fdb9f 100644
--- a/src/Web/WebMVC/Controllers/AccountController.cs
+++ b/src/Web/WebMVC/Controllers/AccountController.cs
@@ -9,7 +9,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers
 {
     [Authorize]
     public class AccountController : Controller
-    {   
+    {
         [Authorize]
         public async Task<IActionResult> SignIn(string returnUrl)
         {
diff --git a/test/Services/UnitTest/Account/AccountControllerTest.cs b/test/Services/UnitTest/Account/AccountControllerTest.cs
index 8542cca0e..0fa4402d3 100644
--- a/test/Services/UnitTest/Account/AccountControllerTest.cs
+++ b/test/Services/UnitTest/Account/AccountControllerTest.cs
@@ -1,4 +1,6 @@
-using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Http.Authentication;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.eShopOnContainers.WebMVC.Controllers;
 using Microsoft.eShopOnContainers.WebMVC.Services;
@@ -15,12 +17,10 @@ namespace UnitTest.Account
 {
     public class AccountControllerTest
     {
-        private readonly Mock<IIdentityParser<ApplicationUser>> _identityParserMock;
         private readonly Mock<HttpContext> _httpContextMock;
 
         public AccountControllerTest()
         {
-            _identityParserMock = new Mock<IIdentityParser<ApplicationUser>>();
             _httpContextMock = new Mock<HttpContext>();
         }
 
@@ -29,20 +29,23 @@ namespace UnitTest.Account
         {
             //Arrange
             var fakeCP = GenerateFakeClaimsIdentity();
+            var mockAuth = new Mock<AuthenticationManager>();
 
             _httpContextMock.Setup(x => x.User)
                 .Returns(new ClaimsPrincipal(fakeCP));
-                       
+
+            _httpContextMock.Setup(c => c.Authentication)
+                .Returns(mockAuth.Object);
+
             //Act
-            var accountController = new AccountController(_identityParserMock.Object);
+            var accountController = new AccountController();
             accountController.ControllerContext.HttpContext = _httpContextMock.Object;
-            var actionResult = accountController.SignIn("");
+            var actionResult = accountController.SignIn("").Result;
 
             //Assert
             var redirectResult = Assert.IsType<RedirectToActionResult>(actionResult);
             Assert.Equal(redirectResult.ActionName, "Index");
             Assert.Equal(redirectResult.ControllerName, "Catalog");
-            Assert.Equal(accountController.ViewData["access_token"], "fakeToken");
         }
 
         private ClaimsIdentity GenerateFakeClaimsIdentity()