Merge pull request #1379 from alphagov/consistent-banners

Make banners more consistent

tests/app/main/views/test_api_keys.py

@@ -4,8 +4,10 @@ from collections import OrderedDict
 import pytest
 from flask import url_for
 from bs4 import BeautifulSoup
+from unittest.mock import call
 
 from tests import validate_route_permission
+from tests.conftest import normalize_spaces, SERVICE_ONE_ID
 
 
 def test_should_show_api_page(
@@ -196,18 +198,27 @@ def test_cant_create_normal_api_key_in_trial_mode(
 
 
 def test_should_show_confirm_revoke_api_key(
-    logged_in_client,
-    api_user_active,
-    mock_login,
+    client_request,
     mock_get_api_keys,
-    mock_get_service,
-    mock_has_permissions,
     fake_uuid,
 ):
-    response = logged_in_client.get(url_for('main.revoke_api_key', service_id=fake_uuid, key_id=fake_uuid))
-    assert response.status_code == 200
-    assert 'some key name' in response.get_data(as_text=True)
-    mock_get_api_keys.assert_called_once_with(service_id=fake_uuid, key_id=fake_uuid)
+    page = client_request.get(
+        'main.revoke_api_key', service_id=SERVICE_ONE_ID, key_id=fake_uuid,
+        _test_page_title=False,
+    )
+    assert normalize_spaces(page.select('.banner-dangerous')[0].text) == (
+        'Are you sure you want to revoke this API key? '
+        '‘some key name’ will no longer let you connect to GOV.UK Notify.'
+    )
+    assert mock_get_api_keys.call_args_list == [
+        call(
+            key_id=fake_uuid,
+            service_id='596364a0-858e-42c8-9062-a8fe822260eb',
+        ),
+        call(
+            service_id='596364a0-858e-42c8-9062-a8fe822260eb'
+        ),
+    ]
 
 
 def test_should_redirect_after_revoking_api_key(

tests/app/main/views/test_templates.py

@@ -679,16 +679,10 @@ def test_should_redirect_when_saving_a_template_email(
 
 
 def test_should_show_delete_template_page_with_time_block(
-    logged_in_client,
-    api_user_active,
-    mock_login,
-    mock_get_service,
+    client_request,
     mock_get_service_template,
-    mock_get_user,
-    mock_get_user_by_email,
-    mock_has_permissions,
-    fake_uuid,
     mocker,
+    fake_uuid
 ):
     with freeze_time('2012-01-01 12:00:00'):
         template = template_json('1234', '1234', "Test template", "sms", "Something very interesting")
@@ -698,30 +692,25 @@ def test_should_show_delete_template_page_with_time_block(
                      return_value=notification)
 
     with freeze_time('2012-01-01 12:10:00'):
-        service_id = fake_uuid
-        template_id = fake_uuid
-        response = logged_in_client.get(url_for(
+        page = client_request.get(
             '.delete_service_template',
-            service_id=service_id,
-            template_id=template_id))
-    content = response.get_data(as_text=True)
-    assert response.status_code == 200
-    assert 'Test template was last used 10 minutes ago. Are you sure you want to delete it?' in content
-    assert 'Are you sure' in content
-    assert 'Two week reminder' in content
-    assert 'Template <em>content</em> with & entity' in content
-    mock_get_service_template.assert_called_with(service_id, template_id)
+            service_id=SERVICE_ONE_ID,
+            template_id=fake_uuid,
+            _test_page_title=False,
+        )
+    assert page.h1.text == 'Are you sure you want to delete Two week reminder?'
+    assert normalize_spaces(page.select('.banner-dangerous p')[0].text) == (
+        'It was last used 10 minutes ago.'
+    )
+    assert normalize_spaces(page.select('.sms-message-wrapper')[0].text) == (
+        'service one: Template <em>content</em> with & entity'
+    )
+    mock_get_service_template.assert_called_with(SERVICE_ONE_ID, fake_uuid)
 
 
 def test_should_show_delete_template_page_with_never_used_block(
-    logged_in_client,
-    api_user_active,
-    mock_login,
-    mock_get_service,
+    client_request,
     mock_get_service_template,
-    mock_get_user,
-    mock_get_user_by_email,
-    mock_has_permissions,
     fake_uuid,
     mocker,
 ):
@@ -729,20 +718,18 @@ def test_should_show_delete_template_page_with_never_used_block(
         'app.template_statistics_client.get_template_statistics_for_template',
         side_effect=HTTPError(response=Mock(status_code=404), message="Default message")
     )
-    service_id = fake_uuid
-    template_id = fake_uuid
-    response = logged_in_client.get(url_for(
+    page = client_request.get(
         '.delete_service_template',
-        service_id=service_id,
-        template_id=template_id))
-
-    content = response.get_data(as_text=True)
-    assert response.status_code == 200
-    assert 'Two week reminder has never been used. Are you sure you want to delete it?' in content
-    assert 'Are you sure' in content
-    assert 'Two week reminder' in content
-    assert 'Template &lt;em&gt;content&lt;/em&gt; with &amp; entity' in content
-    mock_get_service_template.assert_called_with(service_id, template_id)
+        service_id=SERVICE_ONE_ID,
+        template_id=fake_uuid,
+        _test_page_title=False,
+    )
+    assert page.h1.text == 'Are you sure you want to delete Two week reminder?'
+    assert not page.select('.banner-dangerous p')
+    assert normalize_spaces(page.select('.sms-message-wrapper')[0].text) == (
+        'service one: Template <em>content</em> with & entity'
+    )
+    mock_get_service_template.assert_called_with(SERVICE_ONE_ID, fake_uuid)
 
 
 def test_should_redirect_when_deleting_a_template(
@@ -1094,6 +1081,7 @@ def test_should_show_message_before_redacting_template(
         'main.redact_template',
         service_id=SERVICE_ONE_ID,
         template_id=fake_uuid,
+        _test_page_title=False,
     )
 
     assert (