Merge pull request #2928 from alphagov/serve-on-slash-guest-list

Rename API URLs for guest list to guest list

tests/app/dao/test_service_guest_list_dao.py

@@ -0,0 +1,56 @@
+import uuid
+
+from app.models import (
+    ServiceGuestList,
+    EMAIL_TYPE,
+)
+
+from app.dao.service_guest_list_dao import (
+    dao_fetch_service_guest_list,
+    dao_add_and_commit_guest_list_contacts,
+    dao_remove_service_guest_list
+)
+from tests.app.db import create_service
+
+
+def test_fetch_service_guest_list_gets_guest_lists(sample_service_guest_list):
+    guest_list = dao_fetch_service_guest_list(sample_service_guest_list.service_id)
+    assert len(guest_list) == 1
+    assert guest_list[0].id == sample_service_guest_list.id
+
+
+def test_fetch_service_guest_list_ignores_other_service(sample_service_guest_list):
+    assert len(dao_fetch_service_guest_list(uuid.uuid4())) == 0
+
+
+def test_add_and_commit_guest_list_contacts_saves_data(sample_service):
+    guest_list = ServiceGuestList.from_string(sample_service.id, EMAIL_TYPE, 'foo@example.com')
+
+    dao_add_and_commit_guest_list_contacts([guest_list])
+
+    db_contents = ServiceGuestList.query.all()
+    assert len(db_contents) == 1
+    assert db_contents[0].id == guest_list.id
+
+
+def test_remove_service_guest_list_only_removes_for_my_service(notify_db, notify_db_session):
+    service_1 = create_service(service_name="service 1")
+    service_2 = create_service(service_name="service 2")
+    dao_add_and_commit_guest_list_contacts([
+        ServiceGuestList.from_string(service_1.id, EMAIL_TYPE, 'service1@example.com'),
+        ServiceGuestList.from_string(service_2.id, EMAIL_TYPE, 'service2@example.com')
+    ])
+
+    dao_remove_service_guest_list(service_1.id)
+
+    assert service_1.guest_list == []
+    assert len(service_2.guest_list) == 1
+
+
+def test_remove_service_guest_list_does_not_commit(notify_db, sample_service_guest_list):
+    dao_remove_service_guest_list(sample_service_guest_list.service_id)
+
+    # since dao_remove_service_guest_list doesn't commit, we can still rollback its changes
+    notify_db.session.rollback()
+
+    assert ServiceGuestList.query.count() == 1

tests/app/dao/test_service_whitelist_dao.py

@@ -1,56 +0,0 @@
-import uuid
-
-from app.models import (
-    ServiceWhitelist,
-    EMAIL_TYPE,
-)
-
-from app.dao.service_whitelist_dao import (
-    dao_fetch_service_whitelist,
-    dao_add_and_commit_whitelisted_contacts,
-    dao_remove_service_whitelist
-)
-from tests.app.db import create_service
-
-
-def test_fetch_service_whitelist_gets_whitelists(sample_service_whitelist):
-    whitelist = dao_fetch_service_whitelist(sample_service_whitelist.service_id)
-    assert len(whitelist) == 1
-    assert whitelist[0].id == sample_service_whitelist.id
-
-
-def test_fetch_service_whitelist_ignores_other_service(sample_service_whitelist):
-    assert len(dao_fetch_service_whitelist(uuid.uuid4())) == 0
-
-
-def test_add_and_commit_whitelisted_contacts_saves_data(sample_service):
-    whitelist = ServiceWhitelist.from_string(sample_service.id, EMAIL_TYPE, 'foo@example.com')
-
-    dao_add_and_commit_whitelisted_contacts([whitelist])
-
-    db_contents = ServiceWhitelist.query.all()
-    assert len(db_contents) == 1
-    assert db_contents[0].id == whitelist.id
-
-
-def test_remove_service_whitelist_only_removes_for_my_service(notify_db, notify_db_session):
-    service_1 = create_service(service_name="service 1")
-    service_2 = create_service(service_name="service 2")
-    dao_add_and_commit_whitelisted_contacts([
-        ServiceWhitelist.from_string(service_1.id, EMAIL_TYPE, 'service1@example.com'),
-        ServiceWhitelist.from_string(service_2.id, EMAIL_TYPE, 'service2@example.com')
-    ])
-
-    dao_remove_service_whitelist(service_1.id)
-
-    assert service_1.whitelist == []
-    assert len(service_2.whitelist) == 1
-
-
-def test_remove_service_whitelist_does_not_commit(notify_db, sample_service_whitelist):
-    dao_remove_service_whitelist(sample_service_whitelist.service_id)
-
-    # since dao_remove_service_whitelist doesn't commit, we can still rollback its changes
-    notify_db.session.rollback()
-
-    assert ServiceWhitelist.query.count() == 1