Refactor tests to use admin_request

tests/app/organisation/test_rest.py

@@ -1,88 +1,113 @@
 from flask import json
+import pytest
 
 from app.models import Organisation
 
 from tests import create_authorization_header
 
 
-def test_get_organisations(notify_api, notify_db, notify_db_session):
+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()
 
-    with notify_api.test_request_context(), notify_api.test_client() as client:
-        auth_header = create_authorization_header()
-        response = client.get('/organisation', headers=[auth_header])
+    organisations = admin_request.get(
+        'organisation.get_organisations'
+    )['organisations']
 
-    assert response.status_code == 200
-    organisations = json.loads(response.get_data(as_text=True))['organisations']
     assert len(organisations) == 2
     assert {org['id'] for org in organisations} == {str(org1.id), str(org2.id)}
 
 
-def test_get_organisation_by_id(notify_api, notify_db, notify_db_session):
+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()
 
-    with notify_api.test_request_context(), notify_api.test_client() as client:
-        auth_header = create_authorization_header()
-        response = client.get('/organisation/{}'.format(org.id), headers=[auth_header])
+    response = admin_request.get(
+        'organisation.get_organisation_by_id',
+        _expected_status=200,
+        org_id=org.id
+    )
 
-    assert response.status_code == 200
-    organisation = json.loads(response.get_data(as_text=True))['organisation']
-    assert set(organisation.keys()) == {'colour', 'logo', 'name', 'id'}
-    assert organisation['colour'] == '#FFFFFF'
-    assert organisation['logo'] == '/path/image.png'
-    assert organisation['name'] == 'My Org'
-    assert organisation['id'] == str(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_create_organisation(client, notify_db, notify_db_session):
+def test_post_create_organisation(admin_request, notify_db_session):
     data = {
         'name': 'test organisation',
         'colour': '#0000ff',
         'logo': '/images/test_x2.png'
     }
-    auth_header = create_authorization_header()
-
-    response = client.post(
-        '/organisation',
-        headers=[('Content-Type', 'application/json'), auth_header],
-        data=json.dumps(data)
+    response = admin_request.post(
+        'organisation.create_organisation',
+        _data=data,
+        _expected_status=201
     )
-    assert response.status_code == 201
-    json_resp = json.loads(response.get_data(as_text=True))
-    assert data['name'] == json_resp['data']['name']
+    assert data['name'] == response['data']['name']
+    assert data['colour'] == response['data']['colour']
+    assert data['logo'] == response['data']['logo']
 
 
-def test_create_organisation_without_logo_raises_error(client, notify_db, notify_db_session):
+def test_post_create_organisation_without_logo_raises_error(admin_request, notify_db_session):
     data = {
         'name': 'test organisation',
         'colour': '#0000ff',
     }
-    auth_header = create_authorization_header()
-
-    response = client.post(
-        '/organisation',
-        headers=[('Content-Type', 'application/json'), auth_header],
-        data=json.dumps(data)
+    response = admin_request.post(
+        'organisation.create_organisation',
+        _data=data,
+        _expected_status=400
     )
-    assert response.status_code == 400
-    json_resp = json.loads(response.get_data(as_text=True))
-    assert json_resp['errors'][0]['message'] == "logo is a required property"
+    assert response['errors'][0]['message'] == "logo is a required property"
 
 
-def test_create_organisation_without_name_or_colour_is_valid(client, notify_db, notify_db_session):
+def test_post_create_organisation_without_name_or_colour_is_valid(admin_request, notify_db_session):
     data = {
         'logo': 'images/text_x2.png'
     }
-    auth_header = create_authorization_header()
-
-    response = client.post(
-        '/organisation',
-        headers=[('Content-Type', 'application/json'), auth_header],
-        data=json.dumps(data)
+    response = admin_request.post(
+        'organisation.create_organisation',
+        _data=data,
+        _expected_status=201
     )
-    assert response.status_code == 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]