Skip to content
This repository has been archived by the owner on Apr 19, 2023. It is now read-only.

Commit

Permalink
reformat
Browse files Browse the repository at this point in the history
  • Loading branch information
Rohan Sharma committed Jun 2, 2021
1 parent dfce48a commit 94ef5b5
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 60 deletions.
4 changes: 1 addition & 3 deletions grouper/usecases/factory.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@
from grouper.usecases.convert_user_to_service_account import ConvertUserToServiceAccountUI
from grouper.usecases.disable_permission import DisablePermissionUI
from grouper.usecases.dump_schema import DumpSchemaUI
from grouper.usecases.grant_permission_to_group import (
GrantPermissionToGroupUI,
)
from grouper.usecases.grant_permission_to_group import GrantPermissionToGroupUI
from grouper.usecases.grant_permission_to_service_account import (
GrantPermissionToServiceAccountUI,
)
Expand Down
8 changes: 2 additions & 6 deletions grouper/usecases/grant_permission_to_group.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,11 @@ def grant_permission_to_group(self, permission, argument, group):

with self.transaction_service.transaction():
try:
self.group_service.grant_permission_to_group(
permission, argument, group
)
self.group_service.grant_permission_to_group(permission, argument, group)
except PermissionNotFoundException:
# It should be impossible to hit this exception. In order to get this far, the
# perm must be on the list of perms the actor can grant, and thus must exist.
# Leaving the logic here however in case that changes in the future.
self.ui.grant_permission_to_group_failed_permission_not_found(
permission, group
)
self.ui.grant_permission_to_group_failed_permission_not_found(permission, group)
return
self.ui.granted_permission_to_group(permission, argument, group)
70 changes: 19 additions & 51 deletions tests/usecases/grant_permission_to_group_test.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,7 @@ def test_permissions_grantable(setup):

mock_ui = MagicMock()

usecase = setup.usecase_factory.create_grant_permission_to_group_usecase(
"[email protected]", mock_ui
)
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase("[email protected]", mock_ui)
expected = [
("some-permission", "*"),
]
Expand All @@ -50,11 +48,10 @@ def test_permissions_grantable(setup):
expected = sorted([(perm, "*") for perm in all_permissions])
assert usecase.permissions_grantable() == expected

usecase = setup.usecase_factory.create_grant_permission_to_group_usecase(
"[email protected]", mock_ui
)
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase("[email protected]", mock_ui)
assert usecase.permissions_grantable() == []


def test_success(setup):
# type: (SetupTest) -> None
with setup.transaction():
Expand All @@ -67,9 +64,7 @@ def test_success(setup):
setup.create_service_account("[email protected]", "admins")
setup.grant_permission_to_group(PERMISSION_ADMIN, "", "[email protected]")
setup.create_service_account("[email protected]", "other-group")
setup.grant_permission_to_group(
PERMISSION_GRANT, "some-permission/arg*", "some-group"
)
setup.grant_permission_to_group(PERMISSION_GRANT, "some-permission/arg*", "some-group")

service = setup.service_factory.create_group_service()
assert len(service.permission_grants_for_group("some-group")) == 2
Expand All @@ -79,13 +74,9 @@ def test_success(setup):
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase(
"[email protected]", mock_ui
)
usecase.grant_permission_to_group(
"some-permission", "different_argument", "some-group"
)
usecase.grant_permission_to_group("some-permission", "different_argument", "some-group")
assert mock_ui.mock_calls == [
call.granted_permission_to_group(
"some-permission", "different_argument", "some-group"
)
call.granted_permission_to_group("some-permission", "different_argument", "some-group")
]
expected = GroupPermissionGrant(
group="some-group",
Expand All @@ -100,22 +91,17 @@ def test_success(setup):
assert len(grants) == 3
assert expected in grants


def test_duplicate_grant(setup):
# type: (SetupTest) -> None
with setup.transaction():
setup.add_user_to_group("[email protected]", "some-group")
setup.grant_permission_to_group("some-permission", "argument", "some-group")
setup.grant_permission_to_group(
PERMISSION_GRANT, "some-permission/arg*", "some-group"
)
setup.grant_permission_to_group(PERMISSION_GRANT, "some-permission/arg*", "some-group")

mock_ui = MagicMock()
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase(
"[email protected]", mock_ui
)
usecase.grant_permission_to_group(
"some-permission", "argument", "some-group"
)
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase("[email protected]", mock_ui)
usecase.grant_permission_to_group("some-permission", "argument", "some-group")
assert mock_ui.mock_calls == [
call.grant_permission_to_group_failed_permission_already_exists("some-group")
]
Expand All @@ -130,9 +116,7 @@ def test_invalid_argument(setup):
setup.create_permission("some-permission")

mock_ui = MagicMock()
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase(
"[email protected]", mock_ui
)
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase("[email protected]", mock_ui)
usecase.grant_permission_to_group("some-permission", "@@@@", "some-group")
assert mock_ui.mock_calls == [
call.grant_permission_to_group_failed_invalid_argument(
Expand Down Expand Up @@ -161,12 +145,8 @@ def test_permission_denied(setup):

# User with no special permissions.
mock_ui = MagicMock()
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase(
"[email protected]", mock_ui
)
usecase.grant_permission_to_group(
"some-permission", "argument", "some-group"
)
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase("[email protected]", mock_ui)
usecase.grant_permission_to_group("some-permission", "argument", "some-group")
assert mock_ui.mock_calls == [
call.grant_permission_to_group_failed_permission_denied(
"some-permission", "argument", "some-group", ANY
Expand All @@ -179,9 +159,7 @@ def test_permission_denied(setup):
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase(
"[email protected]", mock_ui
)
usecase.grant_permission_to_group(
"some-permission", "argument", "some-group"
)
usecase.grant_permission_to_group("some-permission", "argument", "some-group")
assert mock_ui.mock_calls == [
call.grant_permission_to_group_failed_permission_denied(
"some-permission", "argument", "some-group", ANY
Expand All @@ -195,12 +173,8 @@ def test_permission_denied(setup):
setup.add_user_to_group("[email protected]", "some-group")

mock_ui.reset_mock()
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase(
"[email protected]", mock_ui
)
usecase.grant_permission_to_group(
"some-permission", "argument", "some-group"
)
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase("[email protected]", mock_ui)
usecase.grant_permission_to_group("some-permission", "argument", "some-group")
assert mock_ui.mock_calls == [
call.grant_permission_to_group_failed_permission_denied(
"some-permission", "argument", "some-group", ANY
Expand All @@ -217,14 +191,8 @@ def test_unknown_group(setup):
setup.create_permission("some-permission")

mock_ui = MagicMock()
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase(
"[email protected]", mock_ui
)
usecase.grant_permission_to_group(
"some-permission", "argument", "another-group"
)
usecase = setup.usecase_factory.create_grant_permission_to_group_usecase("[email protected]", mock_ui)
usecase.grant_permission_to_group("some-permission", "argument", "another-group")
assert mock_ui.mock_calls == [
call.grant_permission_to_group_failed_group_not_found(
"another-group"
)
call.grant_permission_to_group_failed_group_not_found("another-group")
]

0 comments on commit 94ef5b5

Please sign in to comment.