@@ -22,7 +22,7 @@ async def test__read_execs(db_session: DBSession):
2222 assert (await get_active_officer_terms (db_session , "abc22" )) != []
2323
2424 abc11_officer_terms = await get_active_officer_terms (db_session , "abc11" )
25- assert len (abc11_officer_terms ) == 2
25+ assert len (abc11_officer_terms ) == 1
2626 assert abc11_officer_terms [0 ].computing_id == "abc11"
2727 assert abc11_officer_terms [0 ].position == OfficerPositionEnum .EXECUTIVE_AT_LARGE
2828 assert abc11_officer_terms [0 ].start_date is not None
@@ -32,7 +32,7 @@ async def test__read_execs(db_session: DBSession):
3232
3333 current_exec_team = await current_officers (db_session )
3434 assert current_exec_team is not None
35- assert len (current_exec_team ) == 6
35+ assert len (current_exec_team ) == 5
3636 # assert next(iter(current_exec_team)) == OfficerPositionEnum.EXECUTIVE_AT_LARGE
3737 # assert next(iter(current_exec_team))["favourite_course_0"] == "CMPT 361"
3838 # assert next(iter(current_exec_team.values()))[0].csss_email == OfficerPosition.to_email(OfficerPositionEnum.EXECUTIVE_AT_LARGE)
@@ -52,7 +52,7 @@ async def test__get_officers(client: AsyncClient):
5252 response = await client .get ("/officers/current" )
5353 assert response .status_code == 200
5454 officers = response .json ()
55- assert len (officers ) == 6
55+ assert len (officers ) == 5
5656 officer = next (o for o in officers if o ["position" ] == OfficerPositionEnum .EXECUTIVE_AT_LARGE )
5757 assert "computing_id" not in officer
5858 assert "discord_id" not in officer
@@ -167,7 +167,7 @@ async def test__get_current_officers_admin(admin_client: AsyncClient):
167167 response = await admin_client .get ("/officers/current" )
168168 assert response .status_code == 200
169169 curr_officers = response .json ()
170- assert len (curr_officers ) == 6
170+ assert len (curr_officers ) == 5
171171 officer = next (o for o in curr_officers if o ["position" ] == OfficerPositionEnum .EXECUTIVE_AT_LARGE )
172172 assert "computing_id" in officer
173173 assert "discord_id" in officer
@@ -243,15 +243,13 @@ async def test__admin_create_officer_term(admin_client: AsyncClient):
243243async def test__admin_patch_officer_info (admin_client : AsyncClient ):
244244 response = await admin_client .patch (
245245 "officers/info/abc11" ,
246- content = json .dumps (
247- {
248- "legal_name" : "Person A2" ,
249- "phone_number" : "12345asdab67890" ,
250- "discord_name" : "person_a_yeah" ,
251- "github_username" : "person_a" ,
252- "google_drive_email" : "person_a@gmail.com" ,
253- }
254- ),
246+ json = {
247+ "legal_name" : "Person A2" ,
248+ "phone_number" : "12345asdab67890" ,
249+ "discord_name" : "person_a_yeah" ,
250+ "github_username" : "person_a" ,
251+ "google_drive_email" : "person_a@gmail.com" ,
252+ },
255253 )
256254 assert response .status_code == 200
257255 resJson = response .json ()
@@ -263,15 +261,13 @@ async def test__admin_patch_officer_info(admin_client: AsyncClient):
263261
264262 response = await admin_client .patch (
265263 "officers/info/aaabbbc" ,
266- content = json .dumps (
267- {
268- "legal_name" : "Person AABBCC" ,
269- "phone_number" : "1234567890" ,
270- "discord_name" : None ,
271- "github_username" : None ,
272- "google_drive_email" : "person_aaa_bbb_ccc+spam@gmail.com" ,
273- }
274- ),
264+ json = {
265+ "legal_name" : "Person AABBCC" ,
266+ "phone_number" : "1234567890" ,
267+ "discord_name" : None ,
268+ "github_username" : None ,
269+ "google_drive_email" : "person_aaa_bbb_ccc+spam@gmail.com" ,
270+ },
275271 )
276272 assert response .status_code == 404
277273
0 commit comments