From dec1f686cdd1bdd2b1b9a2fe0925369624f46aba Mon Sep 17 00:00:00 2001
From: Syndamia <kamen.d.mladenov@protonmail.com>
Date: Sun, 14 Mar 2021 11:54:47 +0200
Subject: Made all Returns(Task.FromResult) into ReturnsAsync in Web layer
 tests

---
 src/Web/DevHive.Web.Tests/UserController.Tests.cs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

(limited to 'src/Web/DevHive.Web.Tests/UserController.Tests.cs')

diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
index ad7bdd9..10d3c6b 100644
--- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Common.Jwt.Interfaces;
 using DevHive.Common.Models.Identity;
@@ -13,7 +12,7 @@ using NUnit.Framework;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class UserControllerTests
 	{
 		const string USERNAME = "Gosho Trapov";
@@ -55,7 +54,7 @@ namespace DevHive.Web.Tests
 				.Returns(tokenWebModel);
 			this._userServiceMock
 				.Setup(p => p.LoginUser(It.IsAny<LoginServiceModel>()))
-				.Returns(Task.FromResult(tokenModel));
+				.ReturnsAsync(tokenModel);
 
 			IActionResult result = this._userController.Login(loginWebModel).Result;
 
@@ -89,7 +88,7 @@ namespace DevHive.Web.Tests
 				.Returns(tokenWebModel);
 			this._userServiceMock
 				.Setup(p => p.RegisterUser(It.IsAny<RegisterServiceModel>()))
-				.Returns(Task.FromResult(tokenModel));
+				.ReturnsAsync(tokenModel);
 
 			IActionResult result = this._userController.Register(registerWebModel).Result;
 
@@ -119,7 +118,7 @@ namespace DevHive.Web.Tests
 
 			this._userServiceMock
 				.Setup(p => p.GetUserById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(userServiceModel));
+				.ReturnsAsync(userServiceModel);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
@@ -163,7 +162,7 @@ namespace DevHive.Web.Tests
 
 			this._userServiceMock
 				.Setup(p => p.GetUserByUsername(It.IsAny<string>()))
-				.Returns(Task.FromResult(userServiceModel));
+				.ReturnsAsync(userServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<UserWebModel>(It.IsAny<UserServiceModel>()))
 				.Returns(userWebModel);
@@ -199,7 +198,7 @@ namespace DevHive.Web.Tests
 
 			this._userServiceMock
 				.Setup(p => p.UpdateUser(It.IsAny<UpdateUserServiceModel>()))
-				.Returns(Task.FromResult(userServiceModel));
+				.ReturnsAsync(userServiceModel);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
@@ -224,7 +223,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._userServiceMock
 				.Setup(p => p.DeleteUser(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._userController.Delete(id, null).Result;
 
@@ -242,7 +241,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._userServiceMock
 				.Setup(p => p.DeleteUser(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._userController.Delete(id, null).Result;
 
-- 
cgit v1.2.3