darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-18 21:49:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix main_nav for platform admin

Browse Source 
Renamed or_ to any_
This commit is contained in:
Rebecca Law
2016-03-30 11:30:18 +01:00
parent 953f2a2245
commit e67bb5f716
10 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/app/main/test_permissions.py
View File

@@ -5,12 +5,12 @@ from werkzeug.exceptions import Forbidden
from flask import request
def _test_permissions(app_, usr, permissions, service_id, will_succeed, or_=False, admin_override=False):
def _test_permissions(app_, usr, permissions, service_id, will_succeed, any_=False, admin_override=False):
with app_.test_request_context() as ctx:
request.view_args.update({'service_id': service_id})
with app_.test_client() as client:
client.login(usr)
decorator = user_has_permissions(*permissions, or_=or_, admin_override=admin_override)
decorator = user_has_permissions(*permissions, any_=any_, admin_override=admin_override)
decorated_index = decorator(index)
if will_succeed:
response = decorated_index()
@@ -54,7 +54,7 @@ def test_user_has_permissions_or(app_, mocker):
['something', 'manage_users'],
'',
True,
or_=True)
any_=True)
def test_user_has_permissions_multiple(app_,

2
tests/conftest.py
View File

@@ -660,7 +660,7 @@ def mock_get_notifications_with_previous_next(mocker):
@pytest.fixture(scope='function')
def mock_has_permissions(mocker):
def _has_permission(permissions=None, or_=False, admin_override=False):
def _has_permission(permissions=None, any_=False, admin_override=False):
return True
return mocker.patch(
'app.notify_client.user_api_client.User.has_permissions',