update testing for signout and accept invite

This commit is contained in:
Beverly Nguyen
2024-01-26 11:29:03 -08:00
parent 35b38f838c
commit 1b4754386c
3 changed files with 78 additions and 162 deletions

View File

@@ -71,52 +71,34 @@ FAKE_ONE_OFF_NOTIFICATION = {
"total": 1, "total": 1,
} }
MOCK_ONE_OFF_JOB = { MOCK_JOBS = {
"data": { "data": [
"api_key": "mocked_api_key", {
"billable_units": 1, "archived": False,
"carrier": "mocked_carrier", "created_at": "2024-01-04T20:43:52+00:00",
"client_reference": "mocked_client_reference", "created_by": {
"created_at": "2024-01-04T20:43:52+00:00", "id": "mocked_user_id",
"created_by": { "name": "mocked_user",
"email_address": "mocked_email@example.com", },
"id": "mocked_user_id", "id": "mocked_notification_id",
"name": "mocked_user", "job_status": "finished",
}, "notification_count": 1,
"document_download_count": None, "original_file_name": "mocked_file.csv",
"id": "mocked_notification_id", "processing_finished": "2024-01-25T23:02:25+00:00",
"international": False, "processing_started": "2024-01-25T23:02:24+00:00",
"job": {"id": "mocked_job_id", "original_file_name": "mocked_file.txt"}, "scheduled_for": None,
"job_row_number": 0, "service": "21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3",
"key_name": "mocked_key_name", "service_name": {"name": "Mock Texting Service"},
"key_type": "normal", "statistics": [{"count": 1, "status": "sending"}],
"normalised_to": "+12133166548", "template": "6a456418-498c-4c86-b0cd-9403c14a216c",
"notification_type": "sms", "template_name": "Mock Template Name",
"personalisation": {"phonenumber": "+12133166548"},
"phone_prefix": "1",
"provider_response": "mocked_provider_response",
"rate_multiplier": 1.0,
"reference": "mocked_reference",
"reply_to_text": "mocked_reply_text",
"sent_at": "2024-01-04T20:43:53+00:00",
"sent_by": "mocked_sender",
"service": "mocked_service_id",
"status": "sending",
"template": {
"content": "((day of week)) and ((fave color))",
"id": "bd9caa7e-00ee-4c5a-839e-10ae1a7e6f73",
"name": "personalized",
"redact_personalisation": False,
"subject": None,
"template_type": "sms", "template_type": "sms",
"version": 1, "template_version": 3,
}, "updated_at": "2024-01-25T23:02:25+00:00",
"to": "+12133166548", }
"updated_at": "2024-01-04T20:43:53+00:00", ]
}
} }
@pytest.fixture() @pytest.fixture()
def _mock_no_users_for_service(mocker): def _mock_no_users_for_service(mocker):
mocker.patch("app.models.user.Users.client_method", return_value=[]) mocker.patch("app.models.user.Users.client_method", return_value=[])
@@ -309,7 +291,7 @@ def test_accepting_invite_removes_invite_from_session(
sample_invite["email_address"] = user["email_address"] sample_invite["email_address"] = user["email_address"]
client_request.login(user) client_request.login(user)
mocker.patch("app.job_api_client.get_job", return_value=MOCK_ONE_OFF_JOB) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS)
mocker.patch( mocker.patch(
"app.notification_api_client.get_notifications_for_service", "app.notification_api_client.get_notifications_for_service",
return_value=FAKE_ONE_OFF_NOTIFICATION, return_value=FAKE_ONE_OFF_NOTIFICATION,
@@ -725,7 +707,7 @@ def test_new_invited_user_verifies_and_added_to_service(
token="thisisnotarealtoken", token="thisisnotarealtoken",
_expected_redirect=url_for("main.register_from_invite"), _expected_redirect=url_for("main.register_from_invite"),
) )
mocker.patch("app.job_api_client.get_job", return_value=MOCK_ONE_OFF_JOB) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS)
mocker.patch( mocker.patch(
"app.notification_api_client.get_notifications_for_service", "app.notification_api_client.get_notifications_for_service",
return_value=FAKE_ONE_OFF_NOTIFICATION, return_value=FAKE_ONE_OFF_NOTIFICATION,

View File

@@ -85,80 +85,32 @@ FAKE_ONE_OFF_NOTIFICATION = {
"total": 1, "total": 1,
} }
MOCK_ONE_OFF_JOB = {
"data": {
"api_key": "mocked_api_key",
"billable_units": 1,
"carrier": "mocked_carrier",
"client_reference": "mocked_client_reference",
"created_at": "2024-01-04T20:43:52+00:00",
"created_by": {
"email_address": "mocked_email@example.com",
"id": "mocked_user_id",
"name": "mocked_user",
},
"document_download_count": None,
"id": "mocked_notification_id",
"international": False,
"job": {"id": "mocked_job_id", "original_file_name": "mocked_file.txt"},
"job_row_number": 0,
"key_name": "mocked_key_name",
"key_type": "normal",
"normalised_to": "+12133166548",
"notification_type": "sms",
"personalisation": {"phonenumber": "+12133166548"},
"phone_prefix": "1",
"provider_response": "mocked_provider_response",
"rate_multiplier": 1.0,
"reference": "mocked_reference",
"reply_to_text": "mocked_reply_text",
"sent_at": "2024-01-04T20:43:53+00:00",
"sent_by": "mocked_sender",
"service": "mocked_service_id",
"status": "sending",
"template": {
"content": "((day of week)) and ((fave color))",
"id": "bd9caa7e-00ee-4c5a-839e-10ae1a7e6f73",
"name": "personalized",
"redact_personalisation": False,
"subject": None,
"template_type": "sms",
"version": 1,
},
"to": "+12133166548",
"updated_at": "2024-01-04T20:43:53+00:00",
}
}
MOCK_JOBS = { MOCK_JOBS = {
"data": [{ "data": [
"archived": False, {
"created_at": "2024-01-04T20:43:52+00:00", "archived": False,
"created_by": { "created_at": "2024-01-04T20:43:52+00:00",
"id": "mocked_user_id", "created_by": {
"name": "mocked_user", "id": "mocked_user_id",
}, "name": "mocked_user",
"id": "mocked_notification_id", },
"job_status": 'finished', "id": "mocked_notification_id",
"notification_count": 1, "job_status": "finished",
"original_file_name": 'mocked_file.csv', "notification_count": 1,
'processing_finished': '2024-01-25T23:02:25+00:00', "original_file_name": "mocked_file.csv",
'processing_started': '2024-01-25T23:02:24+00:00', "processing_finished": "2024-01-25T23:02:25+00:00",
'scheduled_for': None, "processing_started": "2024-01-25T23:02:24+00:00",
'service': '21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3', "scheduled_for": None,
'service_name': { "service": "21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3",
'name': "Mock Texting Service" "service_name": {"name": "Mock Texting Service"},
}, "statistics": [{"count": 1, "status": "sending"}],
'statistics': [{ "template": "6a456418-498c-4c86-b0cd-9403c14a216c",
'count': 1, "template_name": "Mock Template Name",
'status': 'sending' "template_type": "sms",
}], "template_version": 3,
'template': '6a456418-498c-4c86-b0cd-9403c14a216c', "updated_at": "2024-01-25T23:02:25+00:00",
'template_name': 'Mock Template Name', }
'template_type': 'sms', ]
'template_version': 3,
'updated_at': '2024-01-25T23:02:25+00:00',
}]
} }
stub_template_stats = [ stub_template_stats = [

View File

@@ -57,52 +57,34 @@ FAKE_ONE_OFF_NOTIFICATION = {
"total": 1, "total": 1,
} }
MOCK_ONE_OFF_JOB = { MOCK_JOBS = {
"data": { "data": [
"api_key": "mocked_api_key", {
"billable_units": 1, "archived": False,
"carrier": "mocked_carrier", "created_at": "2024-01-04T20:43:52+00:00",
"client_reference": "mocked_client_reference", "created_by": {
"created_at": "2024-01-04T20:43:52+00:00", "id": "mocked_user_id",
"created_by": { "name": "mocked_user",
"email_address": "mocked_email@example.com", },
"id": "mocked_user_id", "id": "mocked_notification_id",
"name": "mocked_user", "job_status": "finished",
}, "notification_count": 1,
"document_download_count": None, "original_file_name": "mocked_file.csv",
"id": "mocked_notification_id", "processing_finished": "2024-01-25T23:02:25+00:00",
"international": False, "processing_started": "2024-01-25T23:02:24+00:00",
"job": {"id": "mocked_job_id", "original_file_name": "mocked_file.txt"}, "scheduled_for": None,
"job_row_number": 0, "service": "21b3ee3d-1cb0-4666-bfa0-9c5ac26d3fe3",
"key_name": "mocked_key_name", "service_name": {"name": "Mock Texting Service"},
"key_type": "normal", "statistics": [{"count": 1, "status": "sending"}],
"normalised_to": "+12133166548", "template": "6a456418-498c-4c86-b0cd-9403c14a216c",
"notification_type": "sms", "template_name": "Mock Template Name",
"personalisation": {"phonenumber": "+12133166548"},
"phone_prefix": "1",
"provider_response": "mocked_provider_response",
"rate_multiplier": 1.0,
"reference": "mocked_reference",
"reply_to_text": "mocked_reply_text",
"sent_at": "2024-01-04T20:43:53+00:00",
"sent_by": "mocked_sender",
"service": "mocked_service_id",
"status": "sending",
"template": {
"content": "((day of week)) and ((fave color))",
"id": "bd9caa7e-00ee-4c5a-839e-10ae1a7e6f73",
"name": "personalized",
"redact_personalisation": False,
"subject": None,
"template_type": "sms", "template_type": "sms",
"version": 1, "template_version": 3,
}, "updated_at": "2024-01-25T23:02:25+00:00",
"to": "+12133166548", }
"updated_at": "2024-01-04T20:43:53+00:00", ]
}
} }
def test_render_sign_out_redirects_to_sign_in(client_request): def test_render_sign_out_redirects_to_sign_in(client_request):
# TODO with the change to using login.gov, we no longer redirect directly to the sign in page. # TODO with the change to using login.gov, we no longer redirect directly to the sign in page.
# Instead we redirect to login.gov which redirects us to the sign in page. However, the # Instead we redirect to login.gov which redirects us to the sign in page. However, the
@@ -139,7 +121,7 @@ def test_sign_out_user(
with client_request.session_transaction() as session: with client_request.session_transaction() as session:
assert session.get("user_id") is not None assert session.get("user_id") is not None
# Check we are logged in # Check we are logged in
mocker.patch("app.job_api_client.get_job", return_value=MOCK_ONE_OFF_JOB) mocker.patch("app.job_api_client.get_jobs", return_value=MOCK_JOBS)
mocker.patch( mocker.patch(
"app.notification_api_client.get_notifications_for_service", "app.notification_api_client.get_notifications_for_service",