darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-20 22:40:31 -04:00
Code Issues Packages Projects Releases Wiki Activity

merge from main

Browse Source
This commit is contained in:
Kenneth Kehl
2023-08-25 08:57:24 -07:00
parent 1463d8421b
commit c6eb007386
29 changed files with 42 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tests/app/main/views/service_settings/test_email_branding_requests.py
View File

@@ -2,9 +2,7 @@ from unittest.mock import ANY, PropertyMock
import pytest
from flask import url_for
from notifications_utils.clients.zendesk.zendesk_client import (
NotifySupportTicket,
)
from notifications_utils.clients.zendesk.zendesk_client import NotifySupportTicket
from tests import sample_uuid
from tests.conftest import ORGANISATION_ID, SERVICE_ONE_ID, normalize_spaces

4
tests/app/main/views/service_settings/test_service_settings.py
View File

@@ -8,9 +8,7 @@ import pytest
from flask import url_for
from freezegun import freeze_time
from notifications_python_client.errors import HTTPError
from notifications_utils.clients.zendesk.zendesk_client import (
NotifySupportTicket,
)
from notifications_utils.clients.zendesk.zendesk_client import NotifySupportTicket
import app
from tests import (

4
tests/app/main/views/test_feedback.py
View File

@@ -4,9 +4,7 @@ from unittest.mock import ANY, PropertyMock
import pytest
from flask import url_for
from freezegun import freeze_time
from notifications_utils.clients.zendesk.zendesk_client import (
NotifySupportTicket,
)
from notifications_utils.clients.zendesk.zendesk_client import NotifySupportTicket
from app.main.views.feedback import in_business_hours
from app.models.feedback import (

12
tests/app/main/views/test_send.py
View File

@@ -15,17 +15,9 @@ from notifications_python_client.errors import HTTPError
from notifications_utils.recipients import RecipientCSV
from notifications_utils.template import SMSPreviewTemplate
from xlrd.biffh import XLRDError
from xlrd.xldate import (
XLDateAmbiguous,
XLDateError,
XLDateNegative,
XLDateTooLarge,
)
from xlrd.xldate import XLDateAmbiguous, XLDateError, XLDateNegative, XLDateTooLarge
from tests import (
validate_route_permission,
validate_route_permission_with_client,
)
from tests import validate_route_permission, validate_route_permission_with_client
from tests.conftest import (
SERVICE_ONE_ID,
create_active_caseworking_user,

4
tests/app/notify_client/test_template_statistics_client.py
View File

@@ -1,8 +1,6 @@
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):

1
tests/app/test_navigation.py
View File

@@ -9,6 +9,7 @@ from app.navigation import (
Navigation,
OrgNavigation,
)
# from tests.conftest import ORGANISATION_ID, SERVICE_ONE_ID, normalize_spaces
from tests.conftest import SERVICE_ONE_ID, normalize_spaces

6
tests/app/test_statistics_utils.py
View File

@@ -1,11 +1,7 @@
import pytest
from app.models.job import Job
from app.statistics_utils import (
add_rates_to,
statistics_by_state,
sum_of_statistics,
)
from app.statistics_utils import add_rates_to, statistics_by_state, sum_of_statistics
@pytest.mark.parametrize('delivery_statistics', [