From 55e2a2f96b227f713e42ff24aa6dcbf75172f4f4 Mon Sep 17 00:00:00 2001 From: Ben Thorner Date: Fri, 25 Mar 2022 16:36:17 +0000 Subject: [PATCH] Stop reversing the order of SMS providers This makes no functional difference but does make it easier to read. --- app/main/views/providers.py | 2 +- tests/app/main/views/test_providers.py | 28 +++++++++++++------------- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/main/views/providers.py b/app/main/views/providers.py index fcaf6aa86..606db6f8d 100644 --- a/app/main/views/providers.py +++ b/app/main/views/providers.py @@ -66,7 +66,7 @@ def edit_sms_provider_ratio(): for provider in provider_client.get_all_providers()['provider_details'] if provider['notification_type'] == 'sms' and provider['active'] - ], key=itemgetter('identifier'), reverse=True) + ], key=itemgetter('identifier')) form = AdminProviderRatioForm(ratio=providers[0]['priority']) diff --git a/tests/app/main/views/test_providers.py b/tests/app/main/views/test_providers.py index 36abc4519..0e500d262 100644 --- a/tests/app/main/views/test_providers.py +++ b/tests/app/main/views/test_providers.py @@ -445,15 +445,15 @@ def test_should_show_version_history_for_first_two_sms_providers( ) # we get only get version info for the "primary" (first) provider - # in reverse alphabetical order i.e. sms_provider_2 + # in alphabetical order i.e. sms_provider_1 mocker.patch( 'app.provider_client.get_provider_versions', return_value={'data': [ { 'id': id, 'priority': priority, - 'display_name': sms_provider_2['display_name'], - 'identifier': sms_provider_2['identifier'], + 'display_name': sms_provider_1['display_name'], + 'identifier': sms_provider_1['identifier'], 'updated_at': updated_at, 'created_by': { 'email_address': 'test@foo.bar', @@ -490,7 +490,7 @@ def test_should_show_version_history_for_first_two_sms_providers( radio['value'] for radio in page.select('input[checked]') ] == [ - str(sms_provider_2['priority']) + str(sms_provider_1['priority']) ] assert [ @@ -508,18 +508,18 @@ def test_should_show_version_history_for_first_two_sms_providers( ] == [ ( 'Test User 2:00pm ' - 'Second Domestic SMS Provider 100% ' - 'First Domestic SMS Provider 0%' + 'First Domestic SMS Provider 100% ' + 'Second Domestic SMS Provider 0%' ), ( 'Test User 5:00am ' - 'Second Domestic SMS Provider 80% ' - 'First Domestic SMS Provider 20%' + 'First Domestic SMS Provider 80% ' + 'Second Domestic SMS Provider 20%' ), ( 'Test User 3:00am ' - 'Second Domestic SMS Provider 10% ' - 'First Domestic SMS Provider 90%' + 'First Domestic SMS Provider 10% ' + 'Second Domestic SMS Provider 90%' ), ] @@ -528,15 +528,15 @@ def test_should_show_version_history_for_first_two_sms_providers( ( '10', [ - call(sms_provider_2['id'], 10), - call(sms_provider_1['id'], 90), + call(sms_provider_1['id'], 10), + call(sms_provider_2['id'], 90), ], ), ( '80', [ - call(sms_provider_2['id'], 80), - call(sms_provider_1['id'], 20), + call(sms_provider_1['id'], 80), + call(sms_provider_2['id'], 20), ], ), ])