Adjust tests to create directors with roles

Author: CarsonF

test/region.e2e-spec.ts

@@ -28,9 +28,9 @@ describe('Region e2e', () => {
     await loginAsAdmin(app);
 
     director = await createPerson(app, {
-      roles: [Role.FieldOperationsDirector, Role.ProjectManager],
+      roles: [Role.RegionalDirector],
     });
-    fieldZone = await createZone(app, { directorId: director.id });
+    fieldZone = await createZone(app);
   });
 
   afterAll(async () => {

test/utility/create-region.ts

@@ -5,7 +5,6 @@ import {
 } from '../../src/components/field-region/dto';
 import { type TestApp } from './create-app';
 import { createPerson } from './create-person';
-import { getUserFromSession } from './create-session';
 import { createZone } from './create-zone';
 import { fragments } from './fragments';
 import { gql } from './gql-tag';
@@ -25,9 +24,11 @@ export async function createRegion(
 
     directorId:
       input.directorId ||
-      (await getUserFromSession(app)).id ||
       (await runAsAdmin(app, async () => {
-        return (await createPerson(app)).id;
+        const director = await createPerson(app, {
+          roles: ['RegionalDirector'],
+        });
+        return director.id;
       })),
     ...input,
   };

test/utility/create-zone.ts

@@ -5,7 +5,6 @@ import {
 } from '../../src/components/field-zone/dto';
 import { type TestApp } from './create-app';
 import { createPerson } from './create-person';
-import { getUserFromSession } from './create-session';
 import { fragments } from './fragments';
 import { gql } from './gql-tag';
 import { runAsAdmin } from './login';
@@ -18,10 +17,12 @@ export async function createZone(
     name: 'Zone' + (await generateId()),
     directorId:
       input.directorId ||
-      (await getUserFromSession(app)).id ||
       // don't want to have to declare the role at the top level. The person part doesn't really matter here.
       (await runAsAdmin(app, async () => {
-        return (await createPerson(app)).id;
+        const director = await createPerson(app, {
+          roles: ['FieldOperationsDirector'],
+        });
+        return director.id;
       })),
     ...input,
   };

test/zone.e2e-spec.ts

@@ -24,8 +24,12 @@ describe('Field Zone e2e', () => {
     // Zones can only be created by admin
     await loginAsAdmin(app);
 
-    director = await createPerson(app);
-    newDirector = await createPerson(app);
+    director = await createPerson(app, {
+      roles: ['FieldOperationsDirector'],
+    });
+    newDirector = await createPerson(app, {
+      roles: ['FieldOperationsDirector'],
+    });
   });
 
   afterAll(async () => {