rename logged_in_platform_admin_client to platform_admin_client

of course it's logged in, it's a platform admin

also, reduce use of the `client` fixture in test_platform_admin
(replace it with platform_admin_client)

tests/app/main/views/test_email_branding.py

@@ -15,11 +15,11 @@ from tests.conftest import (
 
 
 def test_email_branding_page_shows_full_branding_list(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mock_get_all_email_branding
 ):
 
-    response = logged_in_platform_admin_client.get(
+    response = platform_admin_client.get(
         url_for('.email_branding')
     )
 
@@ -52,11 +52,11 @@ def test_email_branding_page_shows_full_branding_list(
 
 
 def test_edit_email_branding_shows_the_correct_branding_info(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mock_get_email_branding,
     fake_uuid
 ):
-    response = logged_in_platform_admin_client.get(
+    response = platform_admin_client.get(
         url_for('.update_email_branding', branding_id=fake_uuid)
     )
 
@@ -70,11 +70,11 @@ def test_edit_email_branding_shows_the_correct_branding_info(
 
 
 def test_create_email_branding_does_not_show_any_branding_info(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mock_no_email_branding
 ):
 
-    response = logged_in_platform_admin_client.get(
+    response = platform_admin_client.get(
         url_for('.create_email_branding')
     )
 
@@ -88,7 +88,7 @@ def test_create_email_branding_does_not_show_any_branding_info(
 
 
 def test_create_new_email_branding_without_logo(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mocker,
     fake_uuid,
     mock_create_email_branding,
@@ -104,7 +104,7 @@ def test_create_new_email_branding_without_logo(
     mock_persist = mocker.patch('app.main.views.email_branding.persist_logo')
     mocker.patch('app.main.views.email_branding.delete_email_temp_files_created_by')
 
-    logged_in_platform_admin_client.post(
+    platform_admin_client.post(
         url_for('.create_email_branding'),
         content_type='multipart/form-data',
         data=data
@@ -174,12 +174,12 @@ def test_create_email_branding_does_not_require_a_name_when_uploading_a_file(
 
 
 def test_create_new_email_branding_when_branding_saved(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mocker,
     mock_create_email_branding,
     fake_uuid
 ):
-    with logged_in_platform_admin_client.session_transaction() as session:
+    with platform_admin_client.session_transaction() as session:
         user_id = session["user_id"]
 
     data = {
@@ -199,7 +199,7 @@ def test_create_new_email_branding_when_branding_saved(
     mocker.patch('app.main.views.email_branding.persist_logo')
     mocker.patch('app.main.views.email_branding.delete_email_temp_files_created_by')
 
-    logged_in_platform_admin_client.post(
+    platform_admin_client.post(
         url_for('.create_email_branding', logo=temp_filename),
         content_type='multipart/form-data',
         data={
@@ -228,7 +228,7 @@ def test_create_new_email_branding_when_branding_saved(
     ('main.update_email_branding', True),
 ])
 def test_deletes_previous_temp_logo_after_uploading_logo(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mocker,
     endpoint,
     has_data,
@@ -237,7 +237,7 @@ def test_deletes_previous_temp_logo_after_uploading_logo(
     if has_data:
         mock_get_email_branding(mocker, fake_uuid)
 
-    with logged_in_platform_admin_client.session_transaction() as session:
+    with platform_admin_client.session_transaction() as session:
         user_id = session["user_id"]
 
     temp_old_filename = EMAIL_LOGO_LOCATION_STRUCTURE.format(
@@ -259,7 +259,7 @@ def test_deletes_previous_temp_logo_after_uploading_logo(
 
     mocked_delete_email_temp_file = mocker.patch('app.main.views.email_branding.delete_email_temp_file')
 
-    logged_in_platform_admin_client.post(
+    platform_admin_client.post(
         url_for('main.create_email_branding', logo=temp_old_filename, branding_id=fake_uuid),
         data={'file': (BytesIO(''.encode('utf-8')), 'test.png')},
         content_type='multipart/form-data'
@@ -271,13 +271,13 @@ def test_deletes_previous_temp_logo_after_uploading_logo(
 
 
 def test_update_existing_branding(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mocker,
     fake_uuid,
     mock_get_email_branding,
     mock_update_email_branding
 ):
-    with logged_in_platform_admin_client.session_transaction() as session:
+    with platform_admin_client.session_transaction() as session:
         user_id = session["user_id"]
 
     data = {
@@ -297,7 +297,7 @@ def test_update_existing_branding(
     mocker.patch('app.main.views.email_branding.persist_logo')
     mocker.patch('app.main.views.email_branding.delete_email_temp_files_created_by')
 
-    logged_in_platform_admin_client.post(
+    platform_admin_client.post(
         url_for('.update_email_branding', logo=temp_filename, branding_id=fake_uuid),
         content_type='multipart/form-data',
         data={'colour': data['colour'], 'name': data['name'], 'text': data['text'],
@@ -320,11 +320,11 @@ def test_update_existing_branding(
 
 
 def test_temp_logo_is_shown_after_uploading_logo(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mocker,
     fake_uuid,
 ):
-    with logged_in_platform_admin_client.session_transaction() as session:
+    with platform_admin_client.session_transaction() as session:
         user_id = session["user_id"]
 
     temp_filename = EMAIL_LOGO_LOCATION_STRUCTURE.format(
@@ -336,7 +336,7 @@ def test_temp_logo_is_shown_after_uploading_logo(
     mocker.patch('app.main.views.email_branding.upload_email_logo', return_value=temp_filename)
     mocker.patch('app.main.views.email_branding.delete_email_temp_file')
 
-    response = logged_in_platform_admin_client.post(
+    response = platform_admin_client.post(
         url_for('main.create_email_branding'),
         data={'file': (BytesIO(''.encode('utf-8')), 'test.png')},
         content_type='multipart/form-data',
@@ -351,12 +351,12 @@ def test_temp_logo_is_shown_after_uploading_logo(
 
 
 def test_logo_persisted_when_organisation_saved(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mock_create_email_branding,
     mocker,
     fake_uuid
 ):
-    with logged_in_platform_admin_client.session_transaction() as session:
+    with platform_admin_client.session_transaction() as session:
         user_id = session["user_id"]
 
     temp_filename = EMAIL_LOGO_LOCATION_STRUCTURE.format(
@@ -366,7 +366,7 @@ def test_logo_persisted_when_organisation_saved(
     mocked_persist_logo = mocker.patch('app.main.views.email_branding.persist_logo')
     mocked_delete_email_temp_files_by = mocker.patch('app.main.views.email_branding.delete_email_temp_files_created_by')
 
-    resp = logged_in_platform_admin_client.post(
+    resp = platform_admin_client.post(
         url_for('.create_email_branding', logo=temp_filename),
         content_type='multipart/form-data'
     )
@@ -380,12 +380,12 @@ def test_logo_persisted_when_organisation_saved(
 
 
 def test_logo_does_not_get_persisted_if_updating_email_branding_client_throws_an_error(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mock_create_email_branding,
     mocker,
     fake_uuid
 ):
-    with logged_in_platform_admin_client.session_transaction() as session:
+    with platform_admin_client.session_transaction() as session:
         user_id = session["user_id"]
 
     temp_filename = EMAIL_LOGO_LOCATION_STRUCTURE.format(
@@ -395,7 +395,7 @@ def test_logo_does_not_get_persisted_if_updating_email_branding_client_throws_an
     mocked_delete_email_temp_files_by = mocker.patch('app.main.views.email_branding.delete_email_temp_files_created_by')
     mocker.patch('app.main.views.email_branding.email_branding_client.create_email_branding', side_effect=HTTPError())
 
-    logged_in_platform_admin_client.post(
+    platform_admin_client.post(
         url_for('.create_email_branding', logo=temp_filename),
         content_type='multipart/form-data'
     )
@@ -410,7 +410,7 @@ def test_logo_does_not_get_persisted_if_updating_email_branding_client_throws_an
     ('', 302),
 ])
 def test_colour_regex_validation(
-    logged_in_platform_admin_client,
+    platform_admin_client,
     mocker,
     fake_uuid,
     colour_hex,
@@ -427,7 +427,7 @@ def test_colour_regex_validation(
 
     mocker.patch('app.main.views.email_branding.delete_email_temp_files_created_by')
 
-    response = logged_in_platform_admin_client.post(
+    response = platform_admin_client.post(
         url_for('.create_email_branding'),
         content_type='multipart/form-data',
         data=data