diff --git a/tests/app/main/views/test_manage_users.py b/tests/app/main/views/test_manage_users.py index 0540eda03..69502ece8 100644 --- a/tests/app/main/views/test_manage_users.py +++ b/tests/app/main/views/test_manage_users.py @@ -1101,9 +1101,11 @@ def test_user_cant_invite_themselves( service_id=SERVICE_ONE_ID, _data={ 'email_address': active_user_with_permissions['email_address'], - 'send_messages': 'y', - 'manage_service': 'y', - 'manage_api_keys': 'y', + 'permissions_field': [ + 'send_messages', + 'manage_service', + 'manage_api_keys' + ] }, _follow_redirects=True, _expected_status=200, diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index 39475af5c..d7a1b3da3 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -2299,8 +2299,8 @@ def test_incorrect_sms_sender_input( @pytest.mark.parametrize('reply_to_addresses, data, api_default_args', [ ([], {}, True), - (create_multiple_email_reply_to_addresses(), {"is_default": []}, False), - (create_multiple_email_reply_to_addresses(), {"is_default": ["y"]}, True) + (create_multiple_email_reply_to_addresses(), {}, False), + (create_multiple_email_reply_to_addresses(), {"is_default": "y"}, True) ]) def test_add_reply_to_email_address_sends_test_notification( 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', [ ([], {}, True), # no existing letter contact blocks - (create_multiple_letter_contact_blocks(), {"is_default": []}, False), - (create_multiple_letter_contact_blocks(), {"is_default": ["y"]}, True) + (create_multiple_letter_contact_blocks(), {}, False), + (create_multiple_letter_contact_blocks(), {"is_default": "y"}, True) ]) def test_add_letter_contact( 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', [ ([], {}, True), - (create_multiple_sms_senders(), {"is_default": []}, False), - (create_multiple_sms_senders(), {"is_default": ["y"]}, True) + (create_multiple_sms_senders(), {}, False), + (create_multiple_sms_senders(), {"is_default": "y"}, True) ]) def test_add_sms_sender( 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', [ - (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=False), {"is_default": []}, False), - (create_reply_to_email_address(is_default=False), {"is_default": ["y"]}, True) + (create_reply_to_email_address(is_default=True), {"is_default": "y"}, True), + (create_reply_to_email_address(is_default=True), {}, True), + (create_reply_to_email_address(is_default=False), {}, False), + (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( 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', [ - (create_reply_to_email_address(), {"is_default": ["y"]}, True), - (create_reply_to_email_address(), {"is_default": []}, True), - (create_reply_to_email_address(is_default=False), {"is_default": []}, False), - (create_reply_to_email_address(is_default=False), {"is_default": ["y"]}, True) + (create_reply_to_email_address(), {"is_default": "y"}, True), + (create_reply_to_email_address(), {}, True), + (create_reply_to_email_address(is_default=False), {}, False), + (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( 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 )] ) - data = {"is_default": ["y"], 'email_address': "reply_to@example.com"} + data = {"is_default": "y", 'email_address': "reply_to@example.com"} page = client_request.post( url, 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', [ - (create_letter_contact_block(), {"is_default": ["y"]}, True), - (create_letter_contact_block(), {"is_default": []}, True), - (create_letter_contact_block(is_default=False), {"is_default": []}, False), - (create_letter_contact_block(is_default=False), {"is_default": ["y"]}, True) + (create_letter_contact_block(), {"is_default": "y"}, True), + (create_letter_contact_block(), {}, True), + (create_letter_contact_block(is_default=False), {}, False), + (create_letter_contact_block(is_default=False), {"is_default": "y"}, True) ]) def test_edit_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', [ - (create_sms_sender(), {"is_default": ["y"], "sms_sender": "test"}, True), - (create_sms_sender(), {"is_default": [], "sms_sender": "test"}, True), - (create_sms_sender(is_default=False), {"is_default": [], "sms_sender": "test"}, False), - (create_sms_sender(is_default=False), {"is_default": ["y"], "sms_sender": "test"}, True) + (create_sms_sender(), {"is_default": "y", "sms_sender": "test"}, True), + (create_sms_sender(), {"sms_sender": "test"}, True), + (create_sms_sender(is_default=False), {"sms_sender": "test"}, False), + (create_sms_sender(is_default=False), {"is_default": "y", "sms_sender": "test"}, True) ]) def test_edit_sms_sender( sms_sender,