mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-16 20:49:00 -04:00
Change organisations to email branding
This commit is contained in:
chrisw
@@ -11,7 +11,7 @@ def get_service_settings_page(
|
||||
logged_in_platform_admin_client,
|
||||
service_one,
|
||||
mock_get_inbound_number_for_service,
|
||||
mock_get_letter_organisations,
|
||||
mock_get_letter_email_branding,
|
||||
mock_get_free_sms_fragment_limit,
|
||||
no_reply_to_email_addresses,
|
||||
no_letter_contact_blocks,
|
||||
@@ -104,7 +104,7 @@ def test_normal_user_doesnt_see_any_toggle_buttons(
|
||||
no_reply_to_email_addresses,
|
||||
no_letter_contact_blocks,
|
||||
single_sms_sender,
|
||||
mock_get_letter_organisations,
|
||||
mock_get_letter_email_branding,
|
||||
mock_get_inbound_number_for_service,
|
||||
mock_get_free_sms_fragment_limit,
|
||||
):
|
||||
|
||||
313
tests/app/main/views/test_email_branding.py
Normal file
313
tests/app/main/views/test_email_branding.py
Normal file
@@ -0,0 +1,313 @@
|
||||
from io import BytesIO
|
||||
from unittest.mock import call
|
||||
|
||||
from bs4 import BeautifulSoup
|
||||
from flask import url_for
|
||||
import pytest
|
||||
|
||||
from tests.conftest import (
|
||||
mock_get_email_branding,
|
||||
normalize_spaces
|
||||
)
|
||||
|
||||
from app.main.s3_client import TEMP_TAG, LOGO_LOCATION_STRUCTURE
|
||||
|
||||
|
||||
def test_email_branding_page_shows_full_branding_list(
|
||||
logged_in_platform_admin_client,
|
||||
mock_get_all_email_branding
|
||||
):
|
||||
|
||||
response = logged_in_platform_admin_client.get(
|
||||
url_for('.email_branding')
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
|
||||
assert normalize_spaces(
|
||||
page.select_one('h1').text
|
||||
) == "Select an email branding to update or create a new email branding"
|
||||
|
||||
first_label = page.select('div.multiple-choice > label')[0]
|
||||
assert 'background: red;' in first_label.find('span')['style']
|
||||
assert normalize_spaces(first_label.text) == 'org 1'
|
||||
assert first_label.find('img')['src'].endswith('/logo1.png')
|
||||
|
||||
assert normalize_spaces((page.select('div.multiple-choice > label')[-1]).text) == 'Create a new email branding'
|
||||
|
||||
|
||||
def test_edit_email_branding_shows_the_correct_branding_info(
|
||||
logged_in_platform_admin_client,
|
||||
mock_get_email_branding,
|
||||
fake_uuid
|
||||
):
|
||||
response = logged_in_platform_admin_client.get(
|
||||
url_for('.update_email_branding', branding_id=fake_uuid)
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
|
||||
assert page.select_one('#logo-img > img')['src'].endswith('/example.png')
|
||||
assert page.select_one('#name').attrs.get('value') == 'Organisation name'
|
||||
assert page.select_one('#colour').attrs.get('value') == '#f00'
|
||||
|
||||
|
||||
def test_create_email_branding_does_not_show_any_branding_info(
|
||||
logged_in_platform_admin_client,
|
||||
mock_no_email_branding
|
||||
):
|
||||
|
||||
response = logged_in_platform_admin_client.get(
|
||||
url_for('.create_email_branding')
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
|
||||
assert page.select_one('#logo-img > img') is None
|
||||
assert page.select_one('#name').attrs.get('value') == ''
|
||||
assert page.select_one('#colour').attrs.get('value') == ''
|
||||
|
||||
|
||||
def test_create_new_email_branding_without_logo(
|
||||
logged_in_platform_admin_client,
|
||||
mocker,
|
||||
fake_uuid,
|
||||
mock_create_email_branding
|
||||
):
|
||||
data = {
|
||||
'logo': None,
|
||||
'colour': '#ff0000',
|
||||
'name': 'new name'
|
||||
}
|
||||
|
||||
mock_persist = mocker.patch('app.main.views.email_branding.persist_logo')
|
||||
mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')
|
||||
|
||||
logged_in_platform_admin_client.post(
|
||||
url_for('.create_email_branding'),
|
||||
content_type='multipart/form-data',
|
||||
data=data
|
||||
)
|
||||
|
||||
assert mock_create_email_branding.called
|
||||
assert mock_create_email_branding.call_args == call(
|
||||
logo=data['logo'],
|
||||
name=data['name'],
|
||||
colour=data['colour']
|
||||
)
|
||||
assert mock_persist.call_args_list == []
|
||||
|
||||
|
||||
def test_create_new_email_branding_when_branding_saved(
|
||||
logged_in_platform_admin_client,
|
||||
mocker,
|
||||
mock_create_email_branding,
|
||||
fake_uuid
|
||||
):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
user_id = session["user_id"]
|
||||
|
||||
data = {
|
||||
'logo': 'test.png',
|
||||
'colour': '#ff0000',
|
||||
'name': 'new name'
|
||||
}
|
||||
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id),
|
||||
unique_id=fake_uuid,
|
||||
filename=data['logo']
|
||||
)
|
||||
|
||||
mocker.patch('app.main.views.email_branding.persist_logo', return_value=data['logo'])
|
||||
mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')
|
||||
|
||||
logged_in_platform_admin_client.post(
|
||||
url_for('.create_email_branding', logo=temp_filename),
|
||||
content_type='multipart/form-data',
|
||||
data={
|
||||
'colour': data['colour'],
|
||||
'name': data['name'],
|
||||
'cdn_url': 'https://static-logos.cdn.com'
|
||||
}
|
||||
)
|
||||
|
||||
assert mock_create_email_branding.called
|
||||
assert mock_create_email_branding.call_args == call(
|
||||
logo=data['logo'],
|
||||
name=data['name'],
|
||||
colour=data['colour']
|
||||
)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('endpoint, has_data', [
|
||||
('main.create_email_branding', False),
|
||||
('main.update_email_branding', True),
|
||||
])
|
||||
def test_deletes_previous_temp_logo_after_uploading_logo(
|
||||
logged_in_platform_admin_client,
|
||||
mocker,
|
||||
endpoint,
|
||||
has_data,
|
||||
fake_uuid
|
||||
):
|
||||
if has_data:
|
||||
mock_get_email_branding(mocker, fake_uuid)
|
||||
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
user_id = session["user_id"]
|
||||
|
||||
temp_old_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id),
|
||||
unique_id=fake_uuid,
|
||||
filename='old_test.png'
|
||||
)
|
||||
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id),
|
||||
unique_id=fake_uuid,
|
||||
filename='test.png'
|
||||
)
|
||||
|
||||
mocked_upload_logo = mocker.patch(
|
||||
'app.main.views.email_branding.upload_logo',
|
||||
return_value=temp_filename
|
||||
)
|
||||
|
||||
mocked_delete_temp_file = mocker.patch('app.main.views.email_branding.delete_temp_file')
|
||||
|
||||
logged_in_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'
|
||||
)
|
||||
|
||||
assert mocked_upload_logo.called
|
||||
assert mocked_delete_temp_file.called
|
||||
assert mocked_delete_temp_file.call_args == call(temp_old_filename)
|
||||
|
||||
|
||||
def test_update_exisiting_branding(
|
||||
logged_in_platform_admin_client,
|
||||
mocker,
|
||||
fake_uuid,
|
||||
mock_get_email_branding,
|
||||
mock_update_email_branding
|
||||
):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
user_id = session["user_id"]
|
||||
|
||||
data = {
|
||||
'logo': 'test.png',
|
||||
'colour': '#0000ff',
|
||||
'name': 'new name'
|
||||
}
|
||||
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id),
|
||||
unique_id=fake_uuid,
|
||||
filename=data['logo']
|
||||
)
|
||||
|
||||
mocker.patch('app.main.views.email_branding.persist_logo', return_value=data['logo'])
|
||||
mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')
|
||||
|
||||
logged_in_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'], 'cdn_url': 'https://static-logos.cdn.com'}
|
||||
)
|
||||
|
||||
assert mock_update_email_branding.called
|
||||
assert mock_update_email_branding.call_args == call(
|
||||
branding_id=fake_uuid,
|
||||
logo=data['logo'],
|
||||
name=data['name'],
|
||||
colour=data['colour']
|
||||
)
|
||||
|
||||
|
||||
def test_temp_logo_is_shown_after_uploading_logo(
|
||||
logged_in_platform_admin_client,
|
||||
mocker,
|
||||
fake_uuid,
|
||||
):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
user_id = session["user_id"]
|
||||
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id),
|
||||
unique_id=fake_uuid,
|
||||
filename='test.png'
|
||||
)
|
||||
|
||||
mocker.patch('app.main.views.email_branding.upload_logo', return_value=temp_filename)
|
||||
mocker.patch('app.main.views.email_branding.delete_temp_file')
|
||||
|
||||
response = logged_in_platform_admin_client.post(
|
||||
url_for('main.create_email_branding'),
|
||||
data={'file': (BytesIO(''.encode('utf-8')), 'test.png')},
|
||||
content_type='multipart/form-data',
|
||||
follow_redirects=True
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
|
||||
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
|
||||
assert page.select_one('#logo-img > img').attrs['src'].endswith(temp_filename)
|
||||
|
||||
|
||||
def test_logo_persisted_when_organisation_saved(logged_in_platform_admin_client, mocker, fake_uuid):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
user_id = session["user_id"]
|
||||
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id), unique_id=fake_uuid, filename='test.png')
|
||||
|
||||
mocked_upload_logo = mocker.patch('app.main.views.email_branding.upload_logo')
|
||||
mocked_persist_logo = mocker.patch('app.main.views.email_branding.persist_logo', return_value='test.png')
|
||||
mocked_delete_temp_files_by = mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')
|
||||
|
||||
logged_in_platform_admin_client.post(
|
||||
url_for('.create_email_branding', logo=temp_filename),
|
||||
content_type='multipart/form-data'
|
||||
)
|
||||
|
||||
assert not mocked_upload_logo.called
|
||||
assert mocked_persist_logo.called
|
||||
assert mocked_delete_temp_files_by.called
|
||||
assert mocked_delete_temp_files_by.call_args == call(user_id)
|
||||
|
||||
|
||||
@pytest.mark.parametrize('colour_hex, form_validates', [
|
||||
('#FF00FF', True),
|
||||
('hello', False),
|
||||
('', True),
|
||||
])
|
||||
def test_colour_regex_validation(
|
||||
logged_in_platform_admin_client,
|
||||
mocker,
|
||||
fake_uuid,
|
||||
colour_hex,
|
||||
form_validates,
|
||||
mock_create_email_branding
|
||||
):
|
||||
data = {
|
||||
'logo': None,
|
||||
'colour': colour_hex,
|
||||
'name': 'new name'
|
||||
}
|
||||
|
||||
mocker.patch('app.main.views.email_branding.delete_temp_files_created_by')
|
||||
|
||||
response = logged_in_platform_admin_client.post(
|
||||
url_for('.create_email_branding'),
|
||||
content_type='multipart/form-data',
|
||||
data=data
|
||||
)
|
||||
|
||||
assert (response.status_code == 302) == form_validates
|
||||
@@ -1,281 +0,0 @@
|
||||
from io import BytesIO
|
||||
from unittest.mock import call
|
||||
|
||||
from bs4 import BeautifulSoup
|
||||
from flask import url_for
|
||||
import pytest
|
||||
|
||||
from app.main.s3_client import TEMP_TAG, LOGO_LOCATION_STRUCTURE
|
||||
|
||||
sample_orgs = [
|
||||
{'id': '1', 'name': 'org 1', 'colour': 'red', 'logo': 'logo1.png'},
|
||||
{'id': '2', 'name': 'org 2', 'colour': 'orange', 'logo': 'logo2.png'},
|
||||
{'id': '3', 'name': None, 'colour': None, 'logo': 'logo3.png'},
|
||||
{'id': '4', 'name': 'org 4', 'colour': None, 'logo': 'logo4.png'},
|
||||
{'id': '5', 'name': None, 'colour': 'blue', 'logo': 'logo5.png'},
|
||||
]
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def request_get_manage_org_with_org(logged_in_platform_admin_client):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
session['organisation'] = sample_orgs[0]
|
||||
|
||||
response = logged_in_platform_admin_client.get(
|
||||
url_for('.manage_org')
|
||||
)
|
||||
assert response.status_code == 200
|
||||
return BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def request_get_manage_org_without_org(logged_in_platform_admin_client):
|
||||
response = logged_in_platform_admin_client.get(
|
||||
url_for('.manage_org')
|
||||
)
|
||||
assert response.status_code == 200
|
||||
return BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
|
||||
|
||||
def test_organisations_page_shows_full_orgs_list(logged_in_platform_admin_client, mocker):
|
||||
mocker.patch('app.organisations_client.get_organisations', return_value=sample_orgs)
|
||||
|
||||
response = logged_in_platform_admin_client.get(
|
||||
url_for('.organisations')
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
assert ' '.join(page.find('h1').text.split()) == "Select an organisation to update or create a new organisation"
|
||||
for index, label in enumerate(page.select('div.multiple-choice > label')):
|
||||
if index < len(sample_orgs):
|
||||
if sample_orgs[index]['colour']:
|
||||
assert 'background: {};'.format(sample_orgs[index]['colour']) in label.find('span')['style']
|
||||
|
||||
assert ' '.join(label.text.split()) == str(sample_orgs[index]['name'])
|
||||
assert label.find('img')['src'].endswith('/' + sample_orgs[index]['logo'])
|
||||
else:
|
||||
assert ' '.join(label.text.split()) == 'Create a new organisation'
|
||||
|
||||
|
||||
@pytest.mark.parametrize("org_id", [
|
||||
'None', '1', '2'
|
||||
])
|
||||
def test_organisations_radio_default_to_just_updated_or_new_org(
|
||||
logged_in_platform_admin_client, mocker, org_id):
|
||||
mocker.patch('app.organisations_client.get_organisations', return_value=sample_orgs)
|
||||
|
||||
response = logged_in_platform_admin_client.get(
|
||||
url_for('.organisations', organisation_id=org_id)
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
|
||||
selected = [r for r in page.select('div.multiple-choice > input') if r.attrs.get('checked')][0]
|
||||
assert selected["value"] == org_id
|
||||
|
||||
|
||||
def test_organisations_post_sets_organisation_in_session_after_selecting_org(
|
||||
logged_in_platform_admin_client, mocker):
|
||||
mocker.patch('app.organisations_client.get_organisations', return_value=sample_orgs)
|
||||
response = logged_in_platform_admin_client.post(
|
||||
url_for('.organisations'),
|
||||
data={'organisation': sample_orgs[0]['id']}
|
||||
)
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
assert session['organisation'] == sample_orgs[0]
|
||||
assert response.status_code == 302
|
||||
assert response.location == url_for('.manage_org', _external=True)
|
||||
|
||||
|
||||
def test_organisations_post_deletes_organisation_session_on_new_org(
|
||||
logged_in_platform_admin_client, mocker):
|
||||
mocker.patch('app.organisations_client.get_organisations', return_value=sample_orgs)
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
session['organisation'] = sample_orgs[0]
|
||||
|
||||
response = logged_in_platform_admin_client.post(
|
||||
url_for('.organisations'),
|
||||
data={'organisation': 'None'}
|
||||
)
|
||||
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
assert session.get('organisation') is None
|
||||
assert response.status_code == 302
|
||||
assert response.location == url_for('.manage_org', _external=True)
|
||||
|
||||
|
||||
def test_manage_orgs_shows_correct_org_info(request_get_manage_org_with_org):
|
||||
assert request_get_manage_org_with_org.select_one('#logo-img > img')['src'].endswith('/' + sample_orgs[0]['logo'])
|
||||
assert request_get_manage_org_with_org.select_one('#name').attrs.get('value') == sample_orgs[0]['name']
|
||||
assert request_get_manage_org_with_org.select_one('#colour').attrs.get('value') == sample_orgs[0]['colour']
|
||||
|
||||
|
||||
def test_manage_orgs_does_not_show_data_for_new_org(request_get_manage_org_without_org):
|
||||
assert request_get_manage_org_without_org.select_one('#logo-img > img') is None
|
||||
assert request_get_manage_org_without_org.select_one('#name').attrs.get('value') == ''
|
||||
assert request_get_manage_org_without_org.select_one('#colour').attrs.get('value') == ''
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def request_post_manage_org_redirect(logged_in_platform_admin_client, mocker, fake_uuid):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
user_id = session["user_id"]
|
||||
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id), unique_id=fake_uuid, filename='test.png')
|
||||
|
||||
mocker.patch('app.main.views.organisations.upload_logo', return_value=temp_filename)
|
||||
mocker.patch('app.main.views.organisations.delete_temp_file')
|
||||
mocker.patch('app.main.views.organisations.delete_temp_files_created_by')
|
||||
|
||||
response = logged_in_platform_admin_client.post(
|
||||
url_for('.manage_org'),
|
||||
data={'file': (BytesIO(''.encode('utf-8')), 'test.png')},
|
||||
content_type='multipart/form-data',
|
||||
follow_redirects=True
|
||||
)
|
||||
|
||||
assert response.status_code == 200
|
||||
return BeautifulSoup(response.data.decode('utf-8'), 'html.parser'), temp_filename
|
||||
|
||||
|
||||
def test_shows_temp_logo_after_uploading_logo(request_post_manage_org_redirect):
|
||||
page, temp_filename = request_post_manage_org_redirect
|
||||
assert page.select_one('#logo-img > img').attrs['src'].endswith(temp_filename)
|
||||
|
||||
|
||||
def test_save_enabled_after_uploading_logo(request_post_manage_org_redirect):
|
||||
page, _ = request_post_manage_org_redirect
|
||||
assert not page.select_one('div.page-footer button.button').has_attr('disabled')
|
||||
|
||||
|
||||
def test_deletes_previous_temp_logo_after_uploading_logo(logged_in_platform_admin_client, mocker, fake_uuid):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
user_id = session["user_id"]
|
||||
|
||||
temp_old_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id), unique_id=fake_uuid, filename='old_test.png')
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id), unique_id=fake_uuid, filename='test.png')
|
||||
|
||||
mocked_upload_logo = mocker.patch(
|
||||
'app.main.views.organisations.upload_logo',
|
||||
return_value=temp_filename
|
||||
)
|
||||
mocked_delete_temp_file = mocker.patch('app.main.views.organisations.delete_temp_file')
|
||||
|
||||
logged_in_platform_admin_client.post(
|
||||
url_for('.manage_org', logo=temp_old_filename),
|
||||
data={'file': (BytesIO(''.encode('utf-8')), 'test.png')},
|
||||
content_type='multipart/form-data'
|
||||
)
|
||||
|
||||
assert mocked_upload_logo.called
|
||||
assert mocked_delete_temp_file.called
|
||||
assert mocked_delete_temp_file.call_args == call(temp_old_filename)
|
||||
|
||||
|
||||
def test_logo_persisted_when_organisation_saved(logged_in_platform_admin_client, mocker, fake_uuid):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
user_id = session["user_id"]
|
||||
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id), unique_id=fake_uuid, filename='test.png')
|
||||
|
||||
mocked_upload_logo = mocker.patch('app.main.views.organisations.upload_logo')
|
||||
mocked_persist_logo = mocker.patch('app.main.views.organisations.persist_logo', return_value='test.png')
|
||||
mocked_delete_temp_files_by = mocker.patch('app.main.views.organisations.delete_temp_files_created_by')
|
||||
|
||||
logged_in_platform_admin_client.post(
|
||||
url_for('.manage_org', logo=temp_filename),
|
||||
content_type='multipart/form-data'
|
||||
)
|
||||
|
||||
assert not mocked_upload_logo.called
|
||||
assert mocked_persist_logo.called
|
||||
assert mocked_delete_temp_files_by.called
|
||||
assert mocked_delete_temp_files_by.call_args == call(user_id)
|
||||
|
||||
|
||||
def test_existing_organisation_updated_when_organisation_saved(logged_in_platform_admin_client, mocker, fake_uuid):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
session["organisation"] = sample_orgs[0]
|
||||
user_id = session["user_id"]
|
||||
|
||||
update_org = {'logo': 'test.png', 'colour': 'blue', 'name': 'new name'}
|
||||
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id), unique_id=fake_uuid, filename=update_org['logo'])
|
||||
|
||||
mocked_update_org = mocker.patch('app.organisations_client.update_organisation')
|
||||
mocker.patch('app.main.views.organisations.persist_logo', return_value=update_org['logo'])
|
||||
mocker.patch('app.main.views.organisations.delete_temp_files_created_by')
|
||||
|
||||
logged_in_platform_admin_client.post(
|
||||
url_for('.manage_org', logo=temp_filename),
|
||||
content_type='multipart/form-data',
|
||||
data={'colour': update_org['colour'], 'name': update_org['name'], 'cdn_url': 'https://static-logos.cdn.com'}
|
||||
)
|
||||
|
||||
assert mocked_update_org.called
|
||||
assert mocked_update_org.call_args == call(
|
||||
org_id=sample_orgs[0]['id'],
|
||||
logo=update_org['logo'],
|
||||
name=update_org['name'],
|
||||
colour=update_org['colour']
|
||||
)
|
||||
|
||||
|
||||
def test_create_new_organisation_when_organisation_saved(logged_in_platform_admin_client, mocker, fake_uuid):
|
||||
with logged_in_platform_admin_client.session_transaction() as session:
|
||||
user_id = session["user_id"]
|
||||
|
||||
new_org = {'logo': 'test.png', 'colour': 'red', 'name': 'new name'}
|
||||
|
||||
temp_filename = LOGO_LOCATION_STRUCTURE.format(
|
||||
temp=TEMP_TAG.format(user_id=user_id), unique_id=fake_uuid, filename=new_org['logo'])
|
||||
|
||||
mocked_new_org = mocker.patch('app.organisations_client.create_organisation')
|
||||
mocker.patch('app.main.views.organisations.persist_logo', return_value=new_org['logo'])
|
||||
mocker.patch('app.main.views.organisations.delete_temp_files_created_by')
|
||||
|
||||
logged_in_platform_admin_client.post(
|
||||
url_for('.manage_org', logo=temp_filename),
|
||||
content_type='multipart/form-data',
|
||||
data={'colour': new_org['colour'], 'name': new_org['name'], 'cdn_url': 'https://static-logos.cdn.com'}
|
||||
)
|
||||
|
||||
assert mocked_new_org.called
|
||||
assert mocked_new_org.call_args == call(
|
||||
logo=new_org['logo'],
|
||||
name=new_org['name'],
|
||||
colour=new_org['colour']
|
||||
)
|
||||
|
||||
|
||||
def test_create_new_organisation_without_logo(logged_in_platform_admin_client, mocker, fake_uuid):
|
||||
|
||||
new_org = {'logo': None, 'colour': 'red', 'name': 'new name'}
|
||||
|
||||
mocked_new_org = mocker.patch('app.organisations_client.create_organisation')
|
||||
mock_persist = mocker.patch('app.main.views.organisations.persist_logo')
|
||||
mocker.patch('app.main.views.organisations.delete_temp_files_created_by')
|
||||
|
||||
logged_in_platform_admin_client.post(
|
||||
url_for('.manage_org'),
|
||||
content_type='multipart/form-data',
|
||||
data={
|
||||
'colour': new_org['colour'],
|
||||
'name': new_org['name'],
|
||||
}
|
||||
)
|
||||
|
||||
assert mocked_new_org.called
|
||||
assert mocked_new_org.call_args == call(
|
||||
logo=new_org['logo'],
|
||||
name=new_org['name'],
|
||||
colour=new_org['colour']
|
||||
)
|
||||
assert mock_persist.call_args_list == []
|
||||
@@ -33,7 +33,7 @@ from freezegun import freeze_time
|
||||
|
||||
@pytest.fixture
|
||||
def mock_get_service_settings_page_common(
|
||||
mock_get_letter_organisations,
|
||||
mock_get_letter_email_branding,
|
||||
mock_get_inbound_number_for_service,
|
||||
mock_get_free_sms_fragment_limit,
|
||||
):
|
||||
@@ -169,7 +169,7 @@ def test_should_show_overview_for_service_with_more_things_set(
|
||||
single_reply_to_email_address,
|
||||
single_letter_contact_block,
|
||||
single_sms_sender,
|
||||
mock_get_organisation,
|
||||
mock_get_email_branding,
|
||||
mock_get_service_settings_page_common,
|
||||
permissions,
|
||||
expected_rows
|
||||
@@ -589,7 +589,7 @@ def test_route_for_platform_admin_update_service(
|
||||
client,
|
||||
platform_admin_user,
|
||||
service_one,
|
||||
mock_get_letter_organisations,
|
||||
mock_get_letter_email_branding,
|
||||
route,
|
||||
):
|
||||
mocker.patch('app.service_api_client.archive_service')
|
||||
@@ -1342,7 +1342,7 @@ def test_set_letter_branding_platform_admin_only(
|
||||
def test_set_letter_branding_prepopulates(
|
||||
logged_in_platform_admin_client,
|
||||
service_one,
|
||||
mock_get_letter_organisations,
|
||||
mock_get_letter_email_branding,
|
||||
current_dvla_org_id,
|
||||
expected_selected,
|
||||
):
|
||||
@@ -1358,7 +1358,7 @@ def test_set_letter_branding_saves(
|
||||
logged_in_platform_admin_client,
|
||||
service_one,
|
||||
mock_update_service,
|
||||
mock_get_letter_organisations,
|
||||
mock_get_letter_email_branding,
|
||||
):
|
||||
response = logged_in_platform_admin_client.post(
|
||||
url_for('main.set_letter_branding', service_id=service_one['id']),
|
||||
@@ -1372,11 +1372,11 @@ def test_set_letter_branding_saves(
|
||||
def test_should_show_branding(
|
||||
logged_in_platform_admin_client,
|
||||
service_one,
|
||||
mock_get_organisations,
|
||||
mock_get_letter_organisations,
|
||||
mock_get_all_email_branding,
|
||||
mock_get_letter_email_branding,
|
||||
):
|
||||
response = logged_in_platform_admin_client.get(url_for(
|
||||
'main.service_set_branding_and_org', service_id=service_one['id']
|
||||
'main.service_set_email_branding', service_id=service_one['id']
|
||||
))
|
||||
assert response.status_code == 200
|
||||
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
@@ -1391,17 +1391,17 @@ def test_should_show_branding(
|
||||
assert 'checked' not in page.find('input', attrs={"id": "branding_type-2"}).attrs
|
||||
assert 'checked' not in page.find('input', attrs={"id": "branding_type-3"}).attrs
|
||||
|
||||
app.organisations_client.get_organisations.assert_called_once_with()
|
||||
app.email_branding_client.get_all_email_branding.assert_called_once_with()
|
||||
app.service_api_client.get_service.assert_called_once_with(service_one['id'])
|
||||
|
||||
|
||||
def test_should_show_organisations(
|
||||
logged_in_platform_admin_client,
|
||||
service_one,
|
||||
mock_get_organisations,
|
||||
mock_get_all_email_branding,
|
||||
):
|
||||
response = logged_in_platform_admin_client.get(url_for(
|
||||
'main.service_set_branding_and_org', service_id=service_one['id']
|
||||
'main.service_set_email_branding', service_id=service_one['id']
|
||||
))
|
||||
assert response.status_code == 200
|
||||
page = BeautifulSoup(response.data.decode('utf-8'), 'html.parser')
|
||||
@@ -1416,33 +1416,33 @@ def test_should_show_organisations(
|
||||
assert 'checked' not in page.find('input', attrs={"id": "branding_type-2"}).attrs
|
||||
assert 'checked' not in page.find('input', attrs={"id": "branding_type-3"}).attrs
|
||||
|
||||
app.organisations_client.get_organisations.assert_called_once_with()
|
||||
app.email_branding_client.get_all_email_branding.assert_called_once_with()
|
||||
app.service_api_client.get_service.assert_called_once_with(service_one['id'])
|
||||
|
||||
|
||||
def test_should_set_branding_and_organisations(
|
||||
logged_in_platform_admin_client,
|
||||
service_one,
|
||||
mock_get_organisations,
|
||||
mock_get_all_email_branding,
|
||||
mock_update_service,
|
||||
):
|
||||
response = logged_in_platform_admin_client.post(
|
||||
url_for(
|
||||
'main.service_set_branding_and_org', service_id=service_one['id']
|
||||
'main.service_set_email_branding', service_id=service_one['id']
|
||||
),
|
||||
data={
|
||||
'branding_type': 'org',
|
||||
'organisation': 'organisation-id'
|
||||
'organisation': '1'
|
||||
}
|
||||
)
|
||||
assert response.status_code == 302
|
||||
assert response.location == url_for('main.service_settings', service_id=service_one['id'], _external=True)
|
||||
|
||||
mock_get_organisations.assert_called_once_with()
|
||||
mock_get_all_email_branding.assert_called_once_with()
|
||||
mock_update_service.assert_called_once_with(
|
||||
service_one['id'],
|
||||
branding='org',
|
||||
organisation='organisation-id'
|
||||
email_branding=None
|
||||
)
|
||||
|
||||
|
||||
@@ -1873,7 +1873,7 @@ def test_service_settings_when_inbound_number_is_not_set(
|
||||
single_letter_contact_block,
|
||||
single_sms_sender,
|
||||
mocker,
|
||||
mock_get_letter_organisations,
|
||||
mock_get_letter_email_branding,
|
||||
mock_get_free_sms_fragment_limit,
|
||||
):
|
||||
mocker.patch('app.inbound_number_client.get_inbound_sms_number_for_service',
|
||||
@@ -1890,7 +1890,7 @@ def test_set_inbound_sms_when_inbound_number_is_not_set(
|
||||
single_reply_to_email_address,
|
||||
single_letter_contact_block,
|
||||
mocker,
|
||||
mock_get_letter_organisations,
|
||||
mock_get_letter_email_branding,
|
||||
):
|
||||
mocker.patch('app.inbound_number_client.get_inbound_sms_number_for_service',
|
||||
return_value={'data': {}})
|
||||
|
||||
50
tests/app/notify_client/test_email_branding_client.py
Normal file
50
tests/app/notify_client/test_email_branding_client.py
Normal file
@@ -0,0 +1,50 @@
|
||||
from app.notify_client.email_branding_client import EmailBrandingClient
|
||||
|
||||
|
||||
def test_get_email_branding(mocker, fake_uuid):
|
||||
mock_get = mocker.patch('app.notify_client.email_branding_client.EmailBrandingClient.get')
|
||||
EmailBrandingClient().get_email_branding(fake_uuid)
|
||||
mock_get.assert_called_once_with(
|
||||
url='/email-branding/{}'.format(fake_uuid)
|
||||
)
|
||||
|
||||
|
||||
def test_get_all_email_branding(mocker):
|
||||
mock_get = mocker.patch('app.notify_client.email_branding_client.EmailBrandingClient.get')
|
||||
EmailBrandingClient().get_all_email_branding()
|
||||
mock_get.assert_called_once_with(
|
||||
url='/email-branding'
|
||||
)
|
||||
|
||||
|
||||
def test_get_letter_email_branding(mocker):
|
||||
mock_get = mocker.patch('app.notify_client.email_branding_client.EmailBrandingClient.get')
|
||||
EmailBrandingClient().get_letter_email_branding()
|
||||
mock_get.assert_called_once_with(
|
||||
url='/dvla_organisations'
|
||||
)
|
||||
|
||||
|
||||
def test_create_email_branding(mocker):
|
||||
org_data = {'logo': 'test.png', 'name': 'test name', 'colour': 'red'}
|
||||
|
||||
mock_post = mocker.patch('app.notify_client.email_branding_client.EmailBrandingClient.post')
|
||||
EmailBrandingClient().create_email_branding(logo=org_data['logo'], name=org_data['name'], colour=org_data['colour'])
|
||||
|
||||
mock_post.assert_called_once_with(
|
||||
url='/email-branding',
|
||||
data=org_data
|
||||
)
|
||||
|
||||
|
||||
def test_update_email_branding(mocker, fake_uuid):
|
||||
org_data = {'logo': 'test.png', 'name': 'test name', 'colour': 'red'}
|
||||
|
||||
mock_post = mocker.patch('app.notify_client.email_branding_client.EmailBrandingClient.post')
|
||||
EmailBrandingClient().update_email_branding(
|
||||
branding_id=fake_uuid, logo=org_data['logo'], name=org_data['name'], colour=org_data['colour'])
|
||||
|
||||
mock_post.assert_called_once_with(
|
||||
url='/email-branding/{}'.format(fake_uuid),
|
||||
data=org_data
|
||||
)
|
||||
@@ -1,50 +0,0 @@
|
||||
from app.notify_client.organisations_client import OrganisationsClient
|
||||
|
||||
|
||||
def test_get_organisation(mocker, fake_uuid):
|
||||
mock_get = mocker.patch('app.notify_client.organisations_client.OrganisationsClient.get')
|
||||
OrganisationsClient().get_organisation(fake_uuid)
|
||||
mock_get.assert_called_once_with(
|
||||
url='/organisation/{}'.format(fake_uuid)
|
||||
)
|
||||
|
||||
|
||||
def test_get_organisations(mocker):
|
||||
mock_get = mocker.patch('app.notify_client.organisations_client.OrganisationsClient.get')
|
||||
OrganisationsClient().get_organisations()
|
||||
mock_get.assert_called_once_with(
|
||||
url='/organisation'
|
||||
)
|
||||
|
||||
|
||||
def test_get_letter_organisations(mocker):
|
||||
mock_get = mocker.patch('app.notify_client.organisations_client.OrganisationsClient.get')
|
||||
OrganisationsClient().get_letter_organisations()
|
||||
mock_get.assert_called_once_with(
|
||||
url='/dvla_organisations'
|
||||
)
|
||||
|
||||
|
||||
def test_create_organisations(mocker):
|
||||
org_data = {'logo': 'test.png', 'name': 'test name', 'colour': 'red'}
|
||||
|
||||
mock_post = mocker.patch('app.notify_client.organisations_client.OrganisationsClient.post')
|
||||
OrganisationsClient().create_organisation(logo=org_data['logo'], name=org_data['name'], colour=org_data['colour'])
|
||||
|
||||
mock_post.assert_called_once_with(
|
||||
url='/organisation',
|
||||
data=org_data
|
||||
)
|
||||
|
||||
|
||||
def test_update_organisations(mocker, fake_uuid):
|
||||
org_data = {'logo': 'test.png', 'name': 'test name', 'colour': 'red'}
|
||||
|
||||
mock_post = mocker.patch('app.notify_client.organisations_client.OrganisationsClient.post')
|
||||
OrganisationsClient().update_organisation(
|
||||
org_id=fake_uuid, logo=org_data['logo'], name=org_data['name'], colour=org_data['colour'])
|
||||
|
||||
mock_post.assert_called_once_with(
|
||||
url='/organisation/{}'.format(fake_uuid),
|
||||
data=org_data
|
||||
)
|
||||
Reference in New Issue
Block a user