Make existing tests use ``client_request fixture

This commit makes the existing tests around user permissions less
verbose by using the new `client_request` fixture.

This fixture takes care of:
- setting up a service
- asserting that the response is `200`

It also tests that the page titles, some of which didn’t match with the
`<h1>`s, so this commit also fixes that mismatch.

app/templates/views/edit-user-permissions.html

@@ -3,7 +3,7 @@
 {% from "components/page-footer.html" import page_footer %}
 
 {% block service_page_title %}
-Manage users
+  {{ user.name or user.email_localpart }}
 {% endblock %}
 
 {% block maincolumn_content %}

app/templates/views/manage-users.html

@@ -12,7 +12,7 @@
 } %}
 
 {% block service_page_title %}
-Manage users
+  Team members
 {% endblock %}
 
 {% block maincolumn_content %}

tests/app/main/views/test_manage_users.py

@@ -5,32 +5,29 @@ import app
 from app.notify_client.models import InvitedUser
 from app.utils import is_gov_user
 from tests.conftest import service_one as create_sample_service
+from tests.conftest import (
+    normalize_spaces,
+    SERVICE_ONE_ID,
+)
 
 
 def test_should_show_overview_page(
-    logged_in_client,
+    client_request,
     active_user_with_permissions,
     mocker,
     mock_get_invites_for_service,
 ):
-    service = create_sample_service(active_user_with_permissions)
     mocker.patch('app.user_api_client.get_users_for_service', return_value=[active_user_with_permissions])
-    response = logged_in_client.get(url_for('main.manage_users', service_id=service['id']))
+    page = client_request.get('main.manage_users', service_id=SERVICE_ONE_ID)
 
-    assert 'Team members' in response.get_data(as_text=True)
+    assert normalize_spaces(page.select_one('h1').text) == 'Team members'
-    assert response.status_code == 200
+    app.user_api_client.get_users_for_service.assert_called_once_with(service_id=SERVICE_ONE_ID)
-    app.user_api_client.get_users_for_service.assert_called_once_with(service_id=service['id'])
 
 
 def test_should_show_page_for_one_user(
-    logged_in_client,
+    client_request,
-    active_user_with_permissions,
-    mocker,
 ):
-    service = create_sample_service(active_user_with_permissions)
+    page = client_request.get('main.edit_user_permissions', service_id=SERVICE_ONE_ID, user_id=0)
-    response = logged_in_client.get(url_for('main.edit_user_permissions', service_id=service['id'], user_id=0))
-
-    assert response.status_code == 200
 
 
 def test_edit_user_permissions(
@@ -177,21 +174,18 @@ def test_cancel_invited_user_cancels_user_invitations(
 
 
 def test_manage_users_shows_invited_user(
-    logged_in_client,
+    client_request,
     mocker,
     active_user_with_permissions,
     sample_invite,
 ):
-    service = create_sample_service(active_user_with_permissions)
     data = [InvitedUser(**sample_invite)]
 
     mocker.patch('app.invite_api_client.get_invites_for_service', return_value=data)
     mocker.patch('app.user_api_client.get_users_for_service', return_value=[active_user_with_permissions])
 
-    response = logged_in_client.get(url_for('main.manage_users', service_id=service['id']))
+    page = client_request.get('main.manage_users', service_id=SERVICE_ONE_ID)
 
-    assert response.status_code == 200
-    page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
     assert page.h1.string.strip() == 'Team members'
     invited_users_list = page.find_all('div', {'class': 'user-list'})[1]
     assert invited_users_list.find_all('h3')[0].text.strip() == 'invited_user@test.gov.uk'