rename role -> permission_set everywhere
This commit is contained in:
@@ -2,7 +2,7 @@ import pytest
|
||||
|
||||
from atst.domain.audit_log import AuditLog
|
||||
from atst.domain.exceptions import UnauthorizedError
|
||||
from atst.domain.roles import Roles
|
||||
from atst.domain.permission_sets import PermissionSets
|
||||
from atst.models.portfolio_role import Status as PortfolioRoleStatus
|
||||
from tests.factories import (
|
||||
UserFactory,
|
||||
|
@@ -2,7 +2,7 @@ import pytest
|
||||
|
||||
from tests.factories import TaskOrderFactory, UserFactory, PortfolioRoleFactory
|
||||
from atst.domain.authz import Authorization
|
||||
from atst.domain.roles import Roles
|
||||
from atst.domain.permission_sets import PermissionSets
|
||||
from atst.domain.exceptions import UnauthorizedError
|
||||
from atst.models.permissions import Permissions
|
||||
|
||||
@@ -45,8 +45,8 @@ def test_check_is_ko_or_cor(task_order, invalid_user):
|
||||
|
||||
|
||||
def test_has_portfolio_permission():
|
||||
role_one = Roles.get("view_portfolio_funding")
|
||||
role_two = Roles.get("view_portfolio_reports")
|
||||
role_one = PermissionSets.get("view_portfolio_funding")
|
||||
role_two = PermissionSets.get("view_portfolio_reports")
|
||||
port_role = PortfolioRoleFactory.create(permission_sets=[role_one, role_two])
|
||||
different_user = UserFactory.create()
|
||||
assert Authorization.has_portfolio_permission(
|
||||
|
@@ -1,7 +1,7 @@
|
||||
from atst.domain.portfolio_roles import PortfolioRoles
|
||||
from atst.domain.users import Users
|
||||
from atst.models.portfolio_role import Status as PortfolioRoleStatus
|
||||
from atst.domain.roles import Roles
|
||||
from atst.domain.permission_sets import PermissionSets
|
||||
|
||||
from tests.factories import (
|
||||
PortfolioFactory,
|
||||
|
@@ -6,7 +6,7 @@ from atst.domain.portfolios import Portfolios, PortfolioError
|
||||
from atst.domain.portfolio_roles import PortfolioRoles
|
||||
from atst.domain.applications import Applications
|
||||
from atst.domain.environments import Environments
|
||||
from atst.domain.roles import Roles, PORTFOLIO_PERMISSION_SETS
|
||||
from atst.domain.permission_sets import PermissionSets, PORTFOLIO_PERMISSION_SETS
|
||||
from atst.models.portfolio_role import Status as PortfolioRoleStatus
|
||||
|
||||
from tests.factories import UserFactory, PortfolioRoleFactory, PortfolioFactory
|
||||
@@ -201,7 +201,7 @@ def test_scoped_portfolio_returns_all_applications_for_portfolio_admin(
|
||||
)
|
||||
|
||||
admin = UserFactory.from_atat_role("default")
|
||||
perm_sets = [Roles.get(prms["name"]) for prms in PORTFOLIO_PERMISSION_SETS]
|
||||
perm_sets = [PermissionSets.get(prms["name"]) for prms in PORTFOLIO_PERMISSION_SETS]
|
||||
PortfolioRoleFactory.create(
|
||||
user=admin, portfolio=portfolio, permission_sets=perm_sets
|
||||
)
|
||||
@@ -263,7 +263,7 @@ def test_get_for_update_information(portfolio, portfolio_owner):
|
||||
assert portfolio == owner_ws
|
||||
|
||||
admin = UserFactory.create()
|
||||
perm_sets = [Roles.get(prms["name"]) for prms in PORTFOLIO_PERMISSION_SETS]
|
||||
perm_sets = [PermissionSets.get(prms["name"]) for prms in PORTFOLIO_PERMISSION_SETS]
|
||||
PortfolioRoleFactory.create(
|
||||
user=admin, portfolio=portfolio, permission_sets=perm_sets
|
||||
)
|
||||
|
@@ -1,18 +1,18 @@
|
||||
import pytest
|
||||
from atst.domain.roles import Roles
|
||||
from atst.domain.permission_sets import PermissionSets
|
||||
from atst.domain.exceptions import NotFoundError
|
||||
|
||||
|
||||
def test_get_all_roles():
|
||||
roles = Roles.get_all()
|
||||
roles = PermissionSets.get_all()
|
||||
assert roles
|
||||
|
||||
|
||||
def test_get_existing_role():
|
||||
role = Roles.get("developer")
|
||||
role = PermissionSets.get("developer")
|
||||
assert role.name == "developer"
|
||||
|
||||
|
||||
def test_get_nonexistent_role():
|
||||
with pytest.raises(NotFoundError):
|
||||
Roles.get("nonexistent")
|
||||
PermissionSets.get("nonexistent")
|
||||
|
@@ -2,7 +2,7 @@ import pytest
|
||||
|
||||
from atst.domain.task_orders import TaskOrders, TaskOrderError, DD254s
|
||||
from atst.domain.exceptions import UnauthorizedError
|
||||
from atst.domain.roles import Roles, _VIEW_PORTFOLIO_PERMISSION_SETS
|
||||
from atst.domain.permission_sets import PermissionSets, _VIEW_PORTFOLIO_PERMISSION_SETS
|
||||
from atst.models.attachment import Attachment
|
||||
|
||||
from tests.factories import (
|
||||
@@ -116,7 +116,7 @@ def test_task_order_access():
|
||||
user=member,
|
||||
portfolio=task_order.portfolio,
|
||||
permission_sets=[
|
||||
Roles.get(prms["name"]) for prms in _VIEW_PORTFOLIO_PERMISSION_SETS
|
||||
PermissionSets.get(prms["name"]) for prms in _VIEW_PORTFOLIO_PERMISSION_SETS
|
||||
],
|
||||
)
|
||||
TaskOrders.add_officer(
|
||||
|
Reference in New Issue
Block a user