From 078fab86c26daa38c937998089f1168019b070d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Mon, 12 Feb 2018 09:28:25 +0300 Subject: [PATCH] Enhance unit tests for permission and remove unnecessary todo. --- .../Volo/Abp/Permissions/PermissionManager.cs | 3 --- .../Volo/Abp/Permissions/PermissionManager_User_Tests.cs | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Volo.Abp.Permissions/Volo/Abp/Permissions/PermissionManager.cs b/src/Volo.Abp.Permissions/Volo/Abp/Permissions/PermissionManager.cs index 7edc6a5648..4a03836d67 100644 --- a/src/Volo.Abp.Permissions/Volo/Abp/Permissions/PermissionManager.cs +++ b/src/Volo.Abp.Permissions/Volo/Abp/Permissions/PermissionManager.cs @@ -81,9 +81,6 @@ namespace Volo.Abp.Permissions return false; } - //TODO: Should also return for non-granted permissions! - //TODO: Create a method for getting only granted permissions! - public virtual Task> GetAllAsync() { return GetAllFromProvidersAsync(Providers.Value, null); diff --git a/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionManager_User_Tests.cs b/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionManager_User_Tests.cs index e8ef2efc24..cd46d50746 100644 --- a/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionManager_User_Tests.cs +++ b/test/Volo.Abp.Permissions.Tests/Volo/Abp/Permissions/PermissionManager_User_Tests.cs @@ -78,7 +78,7 @@ namespace Volo.Abp.Permissions //User1 var permission = await _permissionManager.GetAllForUserAsync(PermissionTestDataBuilder.User1Id); permission.Count.ShouldBeGreaterThan(0); - permission.ShouldContain(p => p.Name == "MyPermission1" && p.IsGranted); + permission.ShouldContain(p => p.Name == "MyPermission1" && p.IsGranted && p.ProviderName == UserPermissionValueProvider.ProviderName); //User2 permission = await _permissionManager.GetAllForUserAsync(PermissionTestDataBuilder.User2Id); @@ -93,7 +93,7 @@ namespace Volo.Abp.Permissions _currentUserId = PermissionTestDataBuilder.User1Id; var permission = await _permissionManager.GetAllForCurrentUserAsync(); permission.Count.ShouldBeGreaterThan(0); - permission.ShouldContain(p => p.Name == "MyPermission1" && p.IsGranted); + permission.ShouldContain(p => p.Name == "MyPermission1" && p.IsGranted && p.ProviderName == UserPermissionValueProvider.ProviderName); //User2 _currentUserId = PermissionTestDataBuilder.User2Id;