Made all Returns(Task.FromResult) into ReturnsAsync in Web layer tests

7 files changed, 67 insertions, 73 deletions

diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs
index 4e1715c..830677e 100644
--- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Common.Jwt.Interfaces;
 using DevHive.Services.Interfaces;
@@ -52,13 +51,13 @@ namespace DevHive.Web.Tests
 				.Returns(createCommentServiceModel);
 			this._commentServiceMock
 				.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
 
@@ -94,13 +93,13 @@ namespace DevHive.Web.Tests
 				.Returns(createCommentServiceModel);
 			this._commentServiceMock
 				.Setup(p => p.AddComment(It.IsAny<CreateCommentServiceModel>()))
-				.Returns(Task.FromResult(Guid.Empty));
+				.ReturnsAsync(Guid.Empty);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
 
@@ -125,7 +124,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._commentController.AddComment(Guid.NewGuid(), createCommentWebModel, null).Result;
 
@@ -152,7 +151,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.GetCommentById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(readCommentServiceModel));
+				.ReturnsAsync(readCommentServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<ReadCommentWebModel>(It.IsAny<ReadCommentServiceModel>()))
 				.Returns(readCommentWebModel);
@@ -184,13 +183,13 @@ namespace DevHive.Web.Tests
 
 			this._commentServiceMock
 				.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>()))
 				.Returns(updateCommentServiceModel);
@@ -221,13 +220,13 @@ namespace DevHive.Web.Tests
 
 			this._commentServiceMock
 				.Setup(p => p.UpdateComment(It.IsAny<UpdateCommentServiceModel>()))
-				.Returns(Task.FromResult(Guid.Empty));
+				.ReturnsAsync(Guid.Empty);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateCommentServiceModel>(It.IsAny<UpdateCommentWebModel>()))
 				.Returns(updateCommentServiceModel);
@@ -252,7 +251,7 @@ namespace DevHive.Web.Tests
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(false);
-			// this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).Returns(Task.FromResult(false));
+			// this.CommentServiceMock.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>())).ReturnsAsync(false));
 
 			IActionResult result = this._commentController.UpdateComment(Guid.Empty, updateCommentWebModel, null).Result;
 
@@ -268,13 +267,13 @@ namespace DevHive.Web.Tests
 
 			this._commentServiceMock
 				.Setup(p => p.DeleteComment(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._commentController.DeleteComment(id, null).Result;
 
@@ -289,13 +288,13 @@ namespace DevHive.Web.Tests
 
 			this._commentServiceMock
 				.Setup(p => p.DeleteComment(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._commentController.DeleteComment(id, null).Result;
 
@@ -315,7 +314,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._commentServiceMock
 				.Setup(p => p.ValidateJwtForComment(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._commentController.DeleteComment(Guid.Empty, null).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs
index 7a7fd8d..3af2b48 100644
--- a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs
@@ -50,7 +50,7 @@ namespace DevHive.Web.Tests
 
 			this._feedServiceMock
 				.Setup(p => p.GetPage(It.IsAny<GetPageServiceModel>()))
-				.Returns(Task.FromResult(readPageServiceModel));
+				.ReturnsAsync(readPageServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>()))
 				.Returns(getPageServiceModel);
@@ -88,7 +88,7 @@ namespace DevHive.Web.Tests
 
 			this._feedServiceMock
 				.Setup(p => p.GetUserPage(It.IsAny<GetPageServiceModel>()))
-				.Returns(Task.FromResult(readPageServiceModel));
+				.ReturnsAsync(readPageServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<GetPageServiceModel>(It.IsAny<GetPageWebModel>()))
 				.Returns(getPageServiceModel);
diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
index de882fc..34f1fc5 100644
--- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Services.Interfaces;
 using DevHive.Services.Models.Language;
@@ -12,7 +11,7 @@ using NUnit.Framework;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class LanguageControllerTests
 	{
 		const string NAME = "Gosho Trapov";
@@ -47,7 +46,7 @@ namespace DevHive.Web.Tests
 				.Returns(createLanguageServiceModel);
 			this._languageServiceMock
 				.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._languageController.Create(createLanguageWebModel).Result;
 
@@ -83,7 +82,7 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._languageServiceMock
 				.Setup(p => p.CreateLanguage(It.IsAny<CreateLanguageServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._languageController.Create(createTechnologyWebModel).Result;
 
@@ -113,7 +112,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.GetLanguageById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(readLanguageServiceModel));
+				.ReturnsAsync(readLanguageServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<ReadLanguageWebModel>(It.IsAny<ReadLanguageServiceModel>()))
 				.Returns(readLanguageWebModel);
@@ -145,7 +144,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>()))
 				.Returns(updateLanguageServiceModel);
@@ -171,7 +170,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.UpdateLanguage(It.IsAny<UpdateLanguageServiceModel>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateLanguageServiceModel>(It.IsAny<UpdateLanguageWebModel>()))
 				.Returns(updateLanguageServiceModel);
@@ -194,7 +193,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.DeleteLanguage(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._languageController.Delete(id).Result;
 
@@ -209,7 +208,7 @@ namespace DevHive.Web.Tests
 
 			this._languageServiceMock
 				.Setup(p => p.DeleteLanguage(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._languageController.Delete(id).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs
index 384a92a..93cce1d 100644
--- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Common.Jwt.Interfaces;
 using DevHive.Services.Interfaces;
@@ -13,7 +12,7 @@ using NUnit.Framework;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class PostControllerTests
 	{
 		const string MESSAGE = "Gosho Trapov";
@@ -50,13 +49,13 @@ namespace DevHive.Web.Tests
 				.Returns(createPostServiceModel);
 			this._postServiceMock
 				.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Create(Guid.Empty, createPostWebModel, null).Result;
 
@@ -92,13 +91,13 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._postServiceMock
 				.Setup(p => p.CreatePost(It.IsAny<CreatePostServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Create(Guid.Empty, createTechnologyWebModel, null).Result;
 
@@ -120,7 +119,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForCreating(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._postController.Create(Guid.NewGuid(), createPostWebModel, null).Result;
 
@@ -145,7 +144,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.GetPostById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(readPostServiceModel));
+				.ReturnsAsync(readPostServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<ReadPostWebModel>(It.IsAny<ReadPostServiceModel>()))
 				.Returns(readPostWebModel);
@@ -177,7 +176,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 			this._mapperMock
 				.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>()))
 				.Returns(updatePostServiceModel);
@@ -186,7 +185,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result;
 
@@ -209,7 +208,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.UpdatePost(It.IsAny<UpdatePostServiceModel>()))
-				.Returns(Task.FromResult(Guid.Empty));
+				.ReturnsAsync(Guid.Empty);
 			this._mapperMock
 				.Setup(p => p.Map<UpdatePostServiceModel>(It.IsAny<UpdatePostWebModel>()))
 				.Returns(updatePostServiceModel);
@@ -218,7 +217,7 @@ namespace DevHive.Web.Tests
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Update(id, updatePostWebModel, null).Result;
 			Assert.IsInstanceOf<BadRequestObjectResult>(result);
@@ -239,7 +238,7 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._postController.Update(Guid.Empty, updatePostWebModel, null).Result;
 
@@ -255,13 +254,13 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.DeletePost(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Delete(id, null).Result;
 
@@ -276,13 +275,13 @@ namespace DevHive.Web.Tests
 
 			this._postServiceMock
 				.Setup(p => p.DeletePost(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._jwtServiceMock
 				.Setup(p => p.ValidateToken(It.IsAny<Guid>(), It.IsAny<string>()))
 				.Returns(true);
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._postController.Delete(id, null).Result;
 
@@ -299,7 +298,7 @@ namespace DevHive.Web.Tests
 		{
 			this._postServiceMock
 				.Setup(p => p.ValidateJwtForPost(It.IsAny<Guid>(), It.IsAny<string>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._postController.Delete(Guid.Empty, null).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
index 0f835c1..0e19221 100644
--- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs
@@ -1,6 +1,5 @@
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 using AutoMapper;
 using DevHive.Services.Interfaces;
 using DevHive.Services.Models.Role;
@@ -12,7 +11,7 @@ using NUnit.Framework;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class RoleControllerTests
 	{
 		const string NAME = "Gosho Trapov";
@@ -47,7 +46,7 @@ namespace DevHive.Web.Tests
 				.Returns(createRoleServiceModel);
 			this._roleServiceMock
 				.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._roleController.Create(createRoleWebModel).Result;
 
@@ -83,7 +82,7 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._roleServiceMock
 				.Setup(p => p.CreateRole(It.IsAny<CreateRoleServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._roleController.Create(createTechnologyWebModel).Result;
 
@@ -113,7 +112,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.GetRoleById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(roleServiceModel));
+				.ReturnsAsync(roleServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<RoleWebModel>(It.IsAny<RoleServiceModel>()))
 				.Returns(roleWebModel);
@@ -145,7 +144,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>()))
 				.Returns(updateRoleServiceModel);
@@ -171,7 +170,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.UpdateRole(It.IsAny<UpdateRoleServiceModel>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateRoleServiceModel>(It.IsAny<UpdateRoleWebModel>()))
 				.Returns(updateRoleServiceModel);
@@ -194,7 +193,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.DeleteRole(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._roleController.Delete(id).Result;
 
@@ -209,7 +208,7 @@ namespace DevHive.Web.Tests
 
 			this._roleServiceMock
 				.Setup(p => p.DeleteRole(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._roleController.Delete(id).Result;
 
diff --git a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs
index 76d291d..06e1ea2 100644
--- a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs
+++ b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs
@@ -8,11 +8,10 @@ using Moq;
 using NUnit.Framework;
 using System;
 using System.Linq;
-using System.Threading.Tasks;
 
 namespace DevHive.Web.Tests
 {
-	[TestFixture]
+    [TestFixture]
 	public class TechnologyControllerTests
 	{
 		const string NAME = "Gosho Trapov";
@@ -49,7 +48,7 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._technologyServiceMock
 				.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result;
 
@@ -85,7 +84,7 @@ namespace DevHive.Web.Tests
 				.Returns(createTechnologyServiceModel);
 			this._technologyServiceMock
 				.Setup(p => p.CreateTechnology(It.IsAny<CreateTechnologyServiceModel>()))
-				.Returns(Task.FromResult(id));
+				.ReturnsAsync(id);
 
 			IActionResult result = this._technologyController.Create(createTechnologyWebModel).Result;
 
@@ -115,7 +114,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.GetTechnologyById(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(readTechnologyServiceModel));
+				.ReturnsAsync(readTechnologyServiceModel);
 			this._mapperMock
 				.Setup(p => p.Map<ReadTechnologyWebModel>(It.IsAny<ReadTechnologyServiceModel>()))
 				.Returns(readTechnologyWebModel);
@@ -147,7 +146,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>()))
 				.Returns(updateTechnologyServiceModel);
@@ -173,7 +172,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.UpdateTechnology(It.IsAny<UpdateTechnologyServiceModel>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 			this._mapperMock
 				.Setup(p => p.Map<UpdateTechnologyServiceModel>(It.IsAny<UpdateTechnologyWebModel>()))
 				.Returns(updateTechnologyServiceModel);
@@ -196,7 +195,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.DeleteTechnology(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(true));
+				.ReturnsAsync(true);
 
 			IActionResult result = this._technologyController.Delete(id).Result;
 
@@ -211,7 +210,7 @@ namespace DevHive.Web.Tests
 
 			this._technologyServiceMock
 				.Setup(p => p.DeleteTechnology(It.IsAny<Guid>()))
-				.Returns(Task.FromResult(false));
+				.ReturnsAsync(false);
 
 			IActionResult result = this._technologyController.Delete(id).Result;
 
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;