pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rename role -> permission_set everywhere

Browse Source
This commit is contained in:
dandds
2019-03-13 10:25:50 -04:00
parent 720c227c32
commit 1a122c5335
24 changed files with 130 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/domain/test_audit_log.py
View File

@@ -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,

6
tests/domain/test_authz.py
View File

@@ -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(

2
tests/domain/test_portfolio_roles.py
View File

@@ -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
tests/domain/test_portfolios.py
View File

@@ -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
)

8
tests/domain/test_roles.py
View File

@@ -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")

4
tests/domain/test_task_orders.py
View File

@@ -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(

19
tests/factories.py
View File

@@ -12,10 +12,10 @@ from atst.models.environment import Environment
from atst.models.application import Application
from atst.models.task_order import TaskOrder
from atst.models.user import User
from atst.models.role import Role
from atst.models.permission_set import PermissionSet
from atst.models.portfolio import Portfolio
from atst.domain.roles import (
Roles,
from atst.domain.permission_sets import (
PermissionSets,
PORTFOLIO_ROLES,
PORTFOLIO_PERMISSION_SETS,
_VIEW_PORTFOLIO_PERMISSION_SETS,
@@ -70,11 +70,13 @@ def _random_date(year_min, year_max, operation):
def base_portfolio_permission_sets():
return [Roles.get(prms["name"]) for prms in _VIEW_PORTFOLIO_PERMISSION_SETS]
return [
PermissionSets.get(prms["name"]) for prms in _VIEW_PORTFOLIO_PERMISSION_SETS
]
def get_all_portfolio_permission_sets():
return [Roles.get(prms["name"]) for prms in PORTFOLIO_PERMISSION_SETS]
return [PermissionSets.get(prms["name"]) for prms in PORTFOLIO_PERMISSION_SETS]
class Base(factory.alchemy.SQLAlchemyModelFactory):
@@ -91,7 +93,7 @@ class UserFactory(Base):
email = factory.Faker("email")
first_name = factory.Faker("first_name")
last_name = factory.Faker("last_name")
atat_role = factory.LazyFunction(lambda: Roles.get("default"))
atat_role = factory.LazyFunction(lambda: PermissionSets.get("default"))
dod_id = factory.LazyFunction(random_dod_id)
phone_number = factory.LazyFunction(random_phone_number)
service_branch = factory.LazyFunction(random_service_branch)
@@ -104,7 +106,7 @@ class UserFactory(Base):
@classmethod
def from_atat_role(cls, atat_role_name, **kwargs):
role = Roles.get(atat_role_name)
role = PermissionSets.get(atat_role_name)
return cls.create(atat_role=role, **kwargs)
@@ -142,7 +144,8 @@ class PortfolioFactory(Base):
perms_set = None
if member.get("permissions_sets"):
perms_set = [
Roles.get(perm_set) for perm_set in member.get("permission_sets")
PermissionSets.get(perm_set)
for perm_set in member.get("permission_sets")
]
else:
perms_set = []

7
tests/models/test_portfolio_role.py
View File

@@ -4,9 +4,8 @@ import datetime
from atst.domain.environments import Environments
from atst.domain.portfolios import Portfolios
from atst.domain.applications import Applications
from atst.domain.roles import Roles
from atst.domain.permission_sets import PermissionSets
from atst.models.portfolio_role import Status
from atst.models.role import Role
from atst.models.invitation import Status as InvitationStatus
from atst.models.audit_event import AuditEvent
from atst.models.portfolio_role import Status as PortfolioRoleStatus
@@ -286,8 +285,8 @@ def test_can_list_all_environments():
def test_can_list_all_permissions():
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])
expected_perms = role_one.permissions + role_two.permissions
assert expected_perms == expected_perms

2
tests/routes/portfolios/test_applications.py
View File

@@ -12,7 +12,7 @@ from tests.factories import (
from atst.domain.applications import Applications
from atst.domain.portfolios import Portfolios
from atst.domain.roles import Roles
from atst.domain.permission_sets import PermissionSets
from atst.models.portfolio_role import Status as PortfolioRoleStatus

4
tests/routes/portfolios/test_members.py
View File

@@ -12,7 +12,7 @@ from atst.domain.portfolio_roles import PortfolioRoles
from atst.domain.applications import Applications
from atst.domain.environments import Environments
from atst.domain.environment_roles import EnvironmentRoles
from atst.domain.roles import Roles
from atst.domain.permission_sets import PermissionSets
from atst.queue import queue
from atst.models.portfolio_role import Status as PortfolioRoleStatus
from atst.models.invitation import Status as InvitationStatus
@@ -139,7 +139,7 @@ def test_update_member_portfolio_role(client, user_session):
follow_redirects=True,
)
assert response.status_code == 200
edit_funding = Roles.get("edit_portfolio_funding")
edit_funding = PermissionSets.get("edit_portfolio_funding")
assert edit_funding in member.permission_sets

34
tests/routes/portfolios/test_task_orders.py
View File

@@ -2,7 +2,7 @@ from flask import url_for
import pytest
from datetime import timedelta, date
from atst.domain.roles import Roles
from atst.domain.permission_sets import PermissionSets
from atst.domain.task_orders import TaskOrders
from atst.models.portfolio_role import Status as PortfolioStatus
from atst.models.invitation import Status as InvitationStatus
@@ -234,8 +234,8 @@ def test_ko_can_view_task_order(client, user_session, portfolio, user):
user=user,
status=PortfolioStatus.ACTIVE,
permission_sets=[
Roles.get("view_portfolio"),
Roles.get("view_portfolio_funding"),
PermissionSets.get("view_portfolio"),
PermissionSets.get("view_portfolio_funding"),
],
)
task_order = TaskOrderFactory.create(portfolio=portfolio, contracting_officer=user)
@@ -301,8 +301,8 @@ def test_ko_can_view_ko_review_page(client, user_session):
user=ko,
status=PortfolioStatus.ACTIVE,
permission_sets=[
Roles.get("view_portfolio"),
Roles.get("view_portfolio_funding"),
PermissionSets.get("view_portfolio"),
PermissionSets.get("view_portfolio_funding"),
],
)
PortfolioRoleFactory.create(
@@ -310,8 +310,8 @@ def test_ko_can_view_ko_review_page(client, user_session):
user=cor,
status=PortfolioStatus.ACTIVE,
permission_sets=[
Roles.get("view_portfolio"),
Roles.get("view_portfolio_funding"),
PermissionSets.get("view_portfolio"),
PermissionSets.get("view_portfolio_funding"),
],
)
task_order = TaskOrderFactory.create(
@@ -378,8 +378,8 @@ def test_cor_redirected_to_build_page(client, user_session, portfolio):
user=cor,
status=PortfolioStatus.ACTIVE,
permission_sets=[
Roles.get("view_portfolio"),
Roles.get("view_portfolio_funding"),
PermissionSets.get("view_portfolio"),
PermissionSets.get("view_portfolio_funding"),
],
)
task_order = TaskOrderFactory.create(
@@ -400,8 +400,8 @@ def test_submit_completed_ko_review_page_as_cor(
user=user,
status=PortfolioStatus.ACTIVE,
permission_sets=[
Roles.get("view_portfolio"),
Roles.get("view_portfolio_funding"),
PermissionSets.get("view_portfolio"),
PermissionSets.get("view_portfolio_funding"),
],
)
@@ -448,8 +448,8 @@ def test_submit_completed_ko_review_page_as_ko(
user=ko,
status=PortfolioStatus.ACTIVE,
permission_sets=[
Roles.get("view_portfolio"),
Roles.get("view_portfolio_funding"),
PermissionSets.get("view_portfolio"),
PermissionSets.get("view_portfolio_funding"),
],
)
@@ -492,8 +492,8 @@ def test_so_review_page(app, client, user_session, portfolio):
user=so,
status=PortfolioStatus.ACTIVE,
permission_sets=[
Roles.get("view_portfolio"),
Roles.get("view_portfolio_funding"),
PermissionSets.get("view_portfolio"),
PermissionSets.get("view_portfolio_funding"),
],
)
task_order = TaskOrderFactory.create(portfolio=portfolio, security_officer=so)
@@ -533,8 +533,8 @@ def test_submit_so_review(app, client, user_session, portfolio):
user=so,
status=PortfolioStatus.ACTIVE,
permission_sets=[
Roles.get("view_portfolio"),
Roles.get("view_portfolio_funding"),
PermissionSets.get("view_portfolio"),
PermissionSets.get("view_portfolio_funding"),
],
)
task_order = TaskOrderFactory.create(portfolio=portfolio, security_officer=so)

4
tests/test_auth.py
View File

@@ -4,7 +4,7 @@ import pytest
from flask import session, url_for
from .mocks import DOD_SDN_INFO, DOD_SDN, FIXTURE_EMAIL_ADDRESS
from atst.domain.users import Users
from atst.domain.roles import Roles
from atst.domain.permission_sets import PermissionSets
from atst.domain.exceptions import NotFoundError
from atst.domain.auth import UNPROTECTED_ROUTES
from .factories import UserFactory
@@ -48,7 +48,7 @@ def test_successful_login_redirect_ccpo(client, monkeypatch):
monkeypatch.setattr(
"atst.domain.authnid.AuthenticationContext.authenticate", lambda *args: True
)
role = Roles.get("ccpo")
role = PermissionSets.get("ccpo")
monkeypatch.setattr(
"atst.domain.authnid.AuthenticationContext.get_user",
lambda *args: UserFactory.create(atat_role=role),