Fix: Memberships tests

Moderators can only be added to moderated (isLocked=True) rooms.

Author: cmlccie

tests/api/test_memberships.py

@@ -62,25 +62,20 @@ def my_group_room_membership(api, group_room, me):
 
 
 @pytest.fixture(scope="session")
-def group_room_moderator(api, my_group_room_membership):
-    if my_group_room_membership.isModerator:
-        return True
-    else:
-        updated_membership = api.memberships.update(
-            membershipId=my_group_room_membership.id,
-            isModerator=True,
-        )
+def my_moderated_group_room_membership(api, moderated_group_room, me):
+    memberships = list(
+        api.memberships.list(roomId=moderated_group_room.id, personId=me.id)
+    )
 
-        if updated_membership.isModerator:
-            return True
+    assert len(memberships) == 1
+    membership = memberships[0]
+    assert membership.isModerator
 
-    pytest.fail("Unable to make test account a Room Moderator")
+    return membership
 
 
 @pytest.fixture(scope="session")
-def membership_person_added_by_email(
-    api, group_room, test_people, group_room_moderator
-):
+def membership_person_added_by_email(api, group_room, test_people):
     person = test_people["member_added_by_email"]
     membership = api.memberships.create(
         roomId=group_room.id,
@@ -93,9 +88,7 @@ def membership_person_added_by_email(
 
 
 @pytest.fixture(scope="session")
-def membership_person_added_by_id(
-    api, group_room, test_people, group_room_moderator
-):
+def membership_person_added_by_id(api, group_room, test_people):
     person = test_people["member_added_by_id"]
     membership = api.memberships.create(
         roomId=group_room.id,
@@ -109,11 +102,11 @@ def membership_person_added_by_id(
 
 @pytest.fixture(scope="session")
 def membership_moderator_added_by_email(
-    api, group_room, test_people, group_room_moderator
+    api, moderated_group_room, test_people
 ):
     person = test_people["moderator_added_by_email"]
     membership = api.memberships.create(
-        roomId=group_room.id,
+        roomId=moderated_group_room.id,
         personEmail=person.emails[0],
         isModerator=True,
     )
@@ -124,12 +117,10 @@ def membership_moderator_added_by_email(
 
 
 @pytest.fixture(scope="session")
-def membership_moderator_added_by_id(
-    api, group_room, test_people, group_room_moderator
-):
+def membership_moderator_added_by_id(api, moderated_group_room, test_people):
     person = test_people["moderator_added_by_id"]
     membership = api.memberships.create(
-        roomId=group_room.id,
+        roomId=moderated_group_room.id,
         personId=person.id,
         isModerator=True,
     )
@@ -143,14 +134,10 @@ def membership_moderator_added_by_id(
 def additional_group_room_memberships(
     membership_person_added_by_email,
     membership_person_added_by_id,
-    membership_moderator_added_by_email,
-    membership_moderator_added_by_id,
 ):
     return [
         membership_person_added_by_email,
         membership_person_added_by_id,
-        membership_moderator_added_by_email,
-        membership_moderator_added_by_id,
     ]
 
 
@@ -179,7 +166,6 @@ def test_list_memberships_with_paging(api, add_rooms, my_memberships):
     assert are_valid_memberships(memberships_list)
 
 
-@pytest.mark.xfail  # TODO: Resolve test account issues
 def test_filter_room_memberships_by_person_email(
     api, test_people, group_room_with_members
 ):
@@ -196,7 +182,6 @@ def test_filter_room_memberships_by_person_email(
     assert membership.roomId == group_room_with_members.id
 
 
-@pytest.mark.xfail  # TODO: Resolve test account issues
 def test_filter_room_memberships_by_person_id(
     api, test_people, group_room_with_members
 ):
@@ -213,41 +198,34 @@ def test_filter_room_memberships_by_person_id(
     assert membership.roomId == group_room_with_members.id
 
 
-@pytest.mark.xfail  # TODO: Resolve test account issues
 def test_list_room_memberships(api, group_room_with_members):
     memberships = list(api.memberships.list(group_room_with_members.id))
     assert len(memberships) > 1
     assert are_valid_memberships(memberships)
 
 
-@pytest.mark.xfail  # TODO: Resolve test account issues
 def test_create_membership_by_email(membership_person_added_by_email):
     assert is_valid_membership(membership_person_added_by_email)
 
 
-@pytest.mark.xfail  # TODO: Resolve test account issues
 def test_create_membership_by_person_id(membership_person_added_by_id):
     assert is_valid_membership(membership_person_added_by_id)
 
 
-@pytest.mark.xfail  # TODO: Resolve test account issues
 def test_create_moderator_by_email(membership_moderator_added_by_email):
     assert is_valid_membership(membership_moderator_added_by_email)
 
 
-@pytest.mark.xfail  # TODO: Resolve test account issues
 def test_create_moderator_by_person_id(membership_moderator_added_by_id):
     assert is_valid_membership(membership_moderator_added_by_id)
 
 
-@pytest.mark.xfail  # TODO: Resolve test account issues
 def test_get_membership_details(api, membership_person_added_by_id):
     membership_id = membership_person_added_by_id.id
     details = api.memberships.get(membership_id)
     assert is_valid_membership(details)
 
 
-@pytest.mark.xfail  # TODO: Resolve test account issues
 def test_update_membership_make_moderator(api, membership_person_added_by_id):
     assert not membership_person_added_by_id.isModerator
     updated_membership = api.memberships.update(

tests/api/test_rooms.py

@@ -60,6 +60,18 @@ def group_room(api):
     api.rooms.delete(room.id)
 
 
+@pytest.fixture(scope="session")
+def moderated_group_room(api):
+    room = api.rooms.create(
+        title=create_string("Moderated Group Room"),
+        isLocked=True,
+    )
+
+    yield room
+
+    api.rooms.delete(room.id)
+
+
 @pytest.fixture(scope="session")
 def direct_rooms(api, direct_messages):
     return [api.rooms.get(message.roomId) for message in direct_messages]