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

fixed testing and removed recipient

Browse Source
This commit is contained in:
Beverly Nguyen
2024-02-13 16:18:50 -08:00
parent 01eac988f1
commit 843e4bb2fa
2 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/main/views/send.py
View File

@@ -502,7 +502,7 @@ def _check_messages(service_id, template_id, upload_id, preview_row):
template = get_template( template = get_template(
db_template, db_template,
current_service, current_service,
show_recipient=True, show_recipient=False,
email_reply_to=email_reply_to, email_reply_to=email_reply_to,
sms_sender=sms_sender, sms_sender=sms_sender,
) )

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

@@ -908,26 +908,22 @@ def test_upload_valid_csv_redirects_to_check_page(
( (
"extra_args", "extra_args",
"expected_link_in_first_row", "expected_link_in_first_row",
"expected_recipient",
"expected_message", "expected_message",
), ),
[ [
( (
{}, {},
None, None,
"To: 2028675301",
"Test Service: A, Template <em>content</em> with & entity", "Test Service: A, Template <em>content</em> with & entity",
), ),
( (
{"row_index": 2}, {"row_index": 2},
None, None,
"To: 2028675301",
"Test Service: A, Template <em>content</em> with & entity", "Test Service: A, Template <em>content</em> with & entity",
), ),
( (
{"row_index": 4}, {"row_index": 4},
True, True,
"To: 2028675303",
"Test Service: C, Template <em>content</em> with & entity", "Test Service: C, Template <em>content</em> with & entity",
), ),
], ],
@@ -946,7 +942,6 @@ def test_upload_valid_csv_shows_preview_and_table(
fake_uuid, fake_uuid,
extra_args, extra_args,
expected_link_in_first_row, expected_link_in_first_row,
expected_recipient,
expected_message, expected_message,
): ):
with client_request.session_transaction() as session: with client_request.session_transaction() as session:
@@ -973,7 +968,6 @@ def test_upload_valid_csv_shows_preview_and_table(
assert page.h1.text.strip() == "Preview" assert page.h1.text.strip() == "Preview"
assert page.select("h2")[1].text.strip() == "Recipients list" assert page.select("h2")[1].text.strip() == "Recipients list"
assert page.h2.text.strip() == "Message" assert page.h2.text.strip() == "Message"
assert page.select_one(".sms-message-recipient").text.strip() == expected_recipient
assert page.select_one(".sms-message-wrapper").text.strip() == expected_message assert page.select_one(".sms-message-wrapper").text.strip() == expected_message
assert not page.select_one(".table-field-index") assert not page.select_one(".table-field-index")
@@ -2895,7 +2889,6 @@ def test_send_notification_shows_email_error_in_trial_mode(
@pytest.mark.parametrize( @pytest.mark.parametrize(
("endpoint", "extra_args"), ("endpoint", "extra_args"),
[ [
("main.check_messages", {"template_id": uuid4(), "upload_id": uuid4()}),
("main.send_one_off_step", {"template_id": uuid4(), "step_index": 0}), ("main.send_one_off_step", {"template_id": uuid4(), "step_index": 0}),
], ],
) )