dont use has_permissions to check for platform admins

platform_admin is a separate concept to permissions, so by removing the
checks for it from the current_user.has_permissions function, we can
simplify things greatly. We already record on the user whether they're
a platform admin anyway.
This commit is contained in:
Leo Hemsted
2018-02-27 16:45:20 +00:00
parent 1a4adfafa0
commit ad6e34eb43
4 changed files with 7 additions and 9 deletions

View File

@@ -3,6 +3,7 @@ import copy
import pytest
from bs4 import BeautifulSoup
from flask import url_for
from tests.conftest import service_one as create_sample_service
from tests.conftest import (
SERVICE_ONE_ID,
active_user_manage_template_permission,
@@ -11,7 +12,6 @@ from tests.conftest import (
active_user_with_permissions,
normalize_spaces,
)
from tests.conftest import service_one as create_sample_service
import app
from app.notify_client.models import InvitedUser

View File

@@ -11,6 +11,7 @@ from tests import (
template_json,
validate_route_permission,
)
from tests.conftest import service_one as create_sample_service
from tests.conftest import (
SERVICE_ONE_ID,
mock_get_service_email_template,
@@ -18,9 +19,8 @@ from tests.conftest import (
mock_get_service_template,
no_letter_contact_blocks,
normalize_spaces,
single_letter_contact_block,
)
from tests.conftest import service_one as create_sample_service
from tests.conftest import single_letter_contact_block
from app.main.views.templates import (
get_human_readable_delta,

View File

@@ -1,8 +1,7 @@
import uuid
from app.notify_client.template_statistics_api_client import (
TemplateStatisticsApiClient,
)
from app.notify_client.template_statistics_api_client import \
TemplateStatisticsApiClient
def test_template_statistics_client_calls_correct_api_endpoint_for_service(mocker, api_user_active):