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

Fix tests for pages using govukCheckboxField

Browse Source 
These fields used to use govukCheckboxesField and
so stored their data in a list. They were since
migrated to govukCheckboxField, which extends
BooleanField and so keeps its data as a boolean
value.
This commit is contained in:
Tom Byers
2020-07-31 10:20:44 +01:00
parent ca9b8a8ca3
commit e266b11ee2
2 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/app/main/views/test_manage_users.py
+5 -3
View File
@@ -1101,9 +1101,11 @@ def test_user_cant_invite_themselves(
service_id=SERVICE_ONE_ID, service_id=SERVICE_ONE_ID,
_data={ _data={
'email_address': active_user_with_permissions['email_address'], 'email_address': active_user_with_permissions['email_address'],
'send_messages': 'y', 'permissions_field': [
'manage_service': 'y', 'send_messages',
'manage_api_keys': 'y', 'manage_service',
'manage_api_keys'
]
}, },
_follow_redirects=True, _follow_redirects=True,
_expected_status=200, _expected_status=200,
tests/app/main/views/test_service_settings.py
+23 -23
View File
@@ -2299,8 +2299,8 @@ def test_incorrect_sms_sender_input(
@pytest.mark.parametrize('reply_to_addresses, data, api_default_args', [ @pytest.mark.parametrize('reply_to_addresses, data, api_default_args', [
([], {}, True), ([], {}, True),
(create_multiple_email_reply_to_addresses(), {"is_default": []}, False), (create_multiple_email_reply_to_addresses(), {}, False),
(create_multiple_email_reply_to_addresses(), {"is_default": ["y"]}, True) (create_multiple_email_reply_to_addresses(), {"is_default": "y"}, True)
]) ])
def test_add_reply_to_email_address_sends_test_notification( def test_add_reply_to_email_address_sends_test_notification(
mocker, client_request, reply_to_addresses, data, api_default_args mocker, client_request, reply_to_addresses, data, api_default_args
@@ -2420,8 +2420,8 @@ def test_add_reply_to_email_address_fails_if_notification_not_delivered_in_45_se
@pytest.mark.parametrize('letter_contact_blocks, data, api_default_args', [ @pytest.mark.parametrize('letter_contact_blocks, data, api_default_args', [
([], {}, True), # no existing letter contact blocks ([], {}, True), # no existing letter contact blocks
(create_multiple_letter_contact_blocks(), {"is_default": []}, False), (create_multiple_letter_contact_blocks(), {}, False),
(create_multiple_letter_contact_blocks(), {"is_default": ["y"]}, True) (create_multiple_letter_contact_blocks(), {"is_default": "y"}, True)
]) ])
def test_add_letter_contact( def test_add_letter_contact(
letter_contact_blocks, letter_contact_blocks,
@@ -2496,8 +2496,8 @@ def test_add_letter_contact_when_coming_from_template(
@pytest.mark.parametrize('sms_senders, data, api_default_args', [ @pytest.mark.parametrize('sms_senders, data, api_default_args', [
([], {}, True), ([], {}, True),
(create_multiple_sms_senders(), {"is_default": []}, False), (create_multiple_sms_senders(), {}, False),
(create_multiple_sms_senders(), {"is_default": ["y"]}, True) (create_multiple_sms_senders(), {"is_default": "y"}, True)
]) ])
def test_add_sms_sender( def test_add_sms_sender(
sms_senders, sms_senders,
@@ -2563,10 +2563,10 @@ def test_default_box_doesnt_show_on_first_letter_sender(
@pytest.mark.parametrize('reply_to_address, data, api_default_args', [ @pytest.mark.parametrize('reply_to_address, data, api_default_args', [
(create_reply_to_email_address(is_default=True), {"is_default": ["y"]}, True), (create_reply_to_email_address(is_default=True), {"is_default": "y"}, True),
(create_reply_to_email_address(is_default=True), {"is_default": []}, True), (create_reply_to_email_address(is_default=True), {}, True),
(create_reply_to_email_address(is_default=False), {"is_default": []}, False), (create_reply_to_email_address(is_default=False), {}, False),
(create_reply_to_email_address(is_default=False), {"is_default": ["y"]}, True) (create_reply_to_email_address(is_default=False), {"is_default": "y"}, True)
]) ])
def test_edit_reply_to_email_address_sends_verification_notification_if_address_is_changed( def test_edit_reply_to_email_address_sends_verification_notification_if_address_is_changed(
reply_to_address, reply_to_address,
@@ -2591,10 +2591,10 @@ def test_edit_reply_to_email_address_sends_verification_notification_if_address_
@pytest.mark.parametrize('reply_to_address, data, api_default_args', [ @pytest.mark.parametrize('reply_to_address, data, api_default_args', [
(create_reply_to_email_address(), {"is_default": ["y"]}, True), (create_reply_to_email_address(), {"is_default": "y"}, True),
(create_reply_to_email_address(), {"is_default": []}, True), (create_reply_to_email_address(), {}, True),
(create_reply_to_email_address(is_default=False), {"is_default": []}, False), (create_reply_to_email_address(is_default=False), {}, False),
(create_reply_to_email_address(is_default=False), {"is_default": ["y"]}, True) (create_reply_to_email_address(is_default=False), {"is_default": "y"}, True)
]) ])
def test_edit_reply_to_email_address_goes_straight_to_update_if_address_not_changed( def test_edit_reply_to_email_address_goes_straight_to_update_if_address_not_changed(
reply_to_address, reply_to_address,
@@ -2651,7 +2651,7 @@ def test_add_edit_reply_to_email_address_goes_straight_to_update_if_address_not_
message=error_message message=error_message
)] )]
) )
data = {"is_default": ["y"], 'email_address': "reply_to@example.com"} data = {"is_default": "y", 'email_address': "reply_to@example.com"}
page = client_request.post( page = client_request.post(
url, url,
service_id=SERVICE_ONE_ID, service_id=SERVICE_ONE_ID,
@@ -2751,10 +2751,10 @@ def test_delete_reply_to_email_address(
@pytest.mark.parametrize('letter_contact_block, data, api_default_args', [ @pytest.mark.parametrize('letter_contact_block, data, api_default_args', [
(create_letter_contact_block(), {"is_default": ["y"]}, True), (create_letter_contact_block(), {"is_default": "y"}, True),
(create_letter_contact_block(), {"is_default": []}, True), (create_letter_contact_block(), {}, True),
(create_letter_contact_block(is_default=False), {"is_default": []}, False), (create_letter_contact_block(is_default=False), {}, False),
(create_letter_contact_block(is_default=False), {"is_default": ["y"]}, True) (create_letter_contact_block(is_default=False), {"is_default": "y"}, True)
]) ])
def test_edit_letter_contact_block( def test_edit_letter_contact_block(
letter_contact_block, letter_contact_block,
@@ -2828,10 +2828,10 @@ def test_delete_letter_contact_block(
@pytest.mark.parametrize('sms_sender, data, api_default_args', [ @pytest.mark.parametrize('sms_sender, data, api_default_args', [
(create_sms_sender(), {"is_default": ["y"], "sms_sender": "test"}, True), (create_sms_sender(), {"is_default": "y", "sms_sender": "test"}, True),
(create_sms_sender(), {"is_default": [], "sms_sender": "test"}, True), (create_sms_sender(), {"sms_sender": "test"}, True),
(create_sms_sender(is_default=False), {"is_default": [], "sms_sender": "test"}, False), (create_sms_sender(is_default=False), {"sms_sender": "test"}, False),
(create_sms_sender(is_default=False), {"is_default": ["y"], "sms_sender": "test"}, True) (create_sms_sender(is_default=False), {"is_default": "y", "sms_sender": "test"}, True)
]) ])
def test_edit_sms_sender( def test_edit_sms_sender(
sms_sender, sms_sender,