darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 08:51:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

create, edit and use email branding instead of organisation

Browse Source 
notable things that have been kept until migration is complete:

* passing in `organisation` to update_service will update email branding
* both `/email-branding` and `/organisation` hit the same code
* service endpoints still return organisation as well as email branding
This commit is contained in:
Leo Hemsted
2018-02-05 12:02:35 +00:00
parent cea52929d3
commit 2f79da8702
18 changed files with 281 additions and 279 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
tests/app/organisation/test_rest.py
View File

@@ -1,109 +0,0 @@
import pytest
from app.models import Organisation
def test_get_organisations(admin_request, notify_db, notify_db_session):
org1 = Organisation(colour='#FFFFFF', logo='/path/image.png', name='Org1')
org2 = Organisation(colour='#000000', logo='/path/other.png', name='Org2')
notify_db.session.add_all([org1, org2])
notify_db.session.commit()
organisations = admin_request.get(
'organisation.get_organisations'
)['organisations']
assert len(organisations) == 2
assert {org['id'] for org in organisations} == {str(org1.id), str(org2.id)}
def test_get_organisation_by_id(admin_request, notify_db, notify_db_session):
org = Organisation(colour='#FFFFFF', logo='/path/image.png', name='My Org')
notify_db.session.add(org)
notify_db.session.commit()
response = admin_request.get(
'organisation.get_organisation_by_id',
_expected_status=200,
org_id=org.id
)
assert set(response['organisation'].keys()) == {'colour', 'logo', 'name', 'id'}
assert response['organisation']['colour'] == '#FFFFFF'
assert response['organisation']['logo'] == '/path/image.png'
assert response['organisation']['name'] == 'My Org'
assert response['organisation']['id'] == str(org.id)
def test_post_create_organisation(admin_request, notify_db_session):
data = {
'name': 'test organisation',
'colour': '#0000ff',
'logo': '/images/test_x2.png'
}
response = admin_request.post(
'organisation.create_organisation',
_data=data,
_expected_status=201
)
assert data['name'] == response['data']['name']
assert data['colour'] == response['data']['colour']
assert data['logo'] == response['data']['logo']
def test_post_create_organisation_without_logo_is_ok(admin_request, notify_db_session):
data = {
'name': 'test organisation',
'colour': '#0000ff',
}
admin_request.post(
'organisation.create_organisation',
_data=data,
_expected_status=201,
)
def test_post_create_organisation_without_name_or_colour_is_valid(admin_request, notify_db_session):
data = {
'logo': 'images/text_x2.png'
}
response = admin_request.post(
'organisation.create_organisation',
_data=data,
_expected_status=201
)
assert response['data']['logo'] == data['logo']
assert response['data']['name'] is None
assert response['data']['colour'] is None
@pytest.mark.parametrize('data_update', [
({'name': 'test organisation 1'}),
({'logo': 'images/text_x3.png', 'colour': '#ffffff'}),
])
def test_post_update_organisation_updates_field(admin_request, notify_db_session, data_update):
data = {
'name': 'test organisation',
'logo': 'images/text_x2.png'
}
response = admin_request.post(
'organisation.create_organisation',
_data=data,
_expected_status=201
)
org_id = response['data']['id']
response = admin_request.post(
'organisation.update_organisation',
_data=data_update,
organisation_id=org_id
)
organisations = Organisation.query.all()
assert len(organisations) == 1
assert str(organisations[0].id) == org_id
for key in data_update.keys():
assert getattr(organisations[0], key) == data_update[key]