From beffaeaeea82ea5ba63bb2f236c06b6ff7458780 Mon Sep 17 00:00:00 2001 From: Ken Tsang Date: Fri, 23 Jun 2017 15:29:09 +0100 Subject: [PATCH] Refactor test --- app/main/views/templates.py | 2 +- tests/app/main/views/test_service_settings.py | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/app/main/views/templates.py b/app/main/views/templates.py index d020775dd..16ffad266 100644 --- a/app/main/views/templates.py +++ b/app/main/views/templates.py @@ -98,7 +98,7 @@ def choose_template(service_id, template_type='all'): ('All', 'all'), ('Text message', 'sms'), ('Email', 'email'), - ('Letter', 'letter') if current_service['can_send_letters'] else None, + ('Letter', 'letter') if 'letter' in current_service['permissions'] else None, ]) ] diff --git a/tests/app/main/views/test_service_settings.py b/tests/app/main/views/test_service_settings.py index f4444ef80..54f5f5b22 100644 --- a/tests/app/main/views/test_service_settings.py +++ b/tests/app/main/views/test_service_settings.py @@ -62,7 +62,7 @@ def test_should_show_overview( @pytest.mark.parametrize('permissions, expected_rows', [ - (['email', 'sms', 'inbound_sms'], [ + (['email', 'sms', 'inbound_sms', 'international_sms'], [ 'Service name service one Change', 'Email reply to address test@example.com Change', 'Text message sender elevenchars', @@ -75,7 +75,7 @@ def test_should_show_overview( 'Service name service one Change', 'Email reply to address test@example.com Change', 'Text message sender elevenchars Change', - 'International text messages On Change', + 'International text messages Off Change', 'Receive text messages Off Change', 'Letters Off Change', ]), @@ -91,7 +91,7 @@ def test_should_show_overview_for_service_with_more_things_set( expected_rows ): client.login(active_user_with_permissions, mocker, service_with_reply_to_addresses) - service_with_reply_to_addresses['permissions'] = ['email', 'sms', 'inbound_sms', 'international_sms'] + service_with_reply_to_addresses['permissions'] = permissions response = client.get(url_for( 'main.service_settings', service_id=service_with_reply_to_addresses['id'] )) @@ -158,8 +158,7 @@ def test_if_can_receive_inbound_then_cant_change_sms_sender( 'main.service_settings', service_id=service_one['id'] )) page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser') - rows = page.find_all('tr') - rows_as_text = [" ".join(row.text.split()) for row in rows] + rows_as_text = [" ".join(row.text.split()) for row in page.find_all('tr')] assert 'Text message sender SomeNumber Change' not in rows_as_text assert url_for('main.service_request_to_go_live', service_id=service_one['id'], set_inbound_sms=False) not in response.get_data(as_text=True)