[tests] Infer gql result types & use fragment types

Author: CarsonF

test/authentication.e2e-spec.ts

@@ -14,7 +14,6 @@ import {
   registerUser,
   type TestApp,
 } from './utility';
-import { type RawUser } from './utility/fragments';
 
 describe('Authentication e2e', () => {
   let app: TestApp;
@@ -105,7 +104,7 @@ describe('Authentication e2e', () => {
       },
     );
 
-    const actual: RawUser = result.user;
+    const actual = result.user;
     expect(actual).toBeTruthy();
     expect(isValidId(actual.id)).toBe(true);
     expect(actual.email.value).toBe(fakeUser.email.toLowerCase());

test/education.e2e-spec.ts

@@ -2,20 +2,18 @@ import { faker } from '@faker-js/faker';
 import { times } from 'lodash';
 import { isValidId, Role } from '~/common';
 import { graphql } from '~/graphql';
-import { type User } from '../src/components/user/dto';
-import { type Education } from '../src/components/user/education/dto';
 import {
   createEducation,
   createSession,
   createTestApp,
+  fragments,
   registerUser,
   type TestApp,
 } from './utility';
-import { fragments } from './utility/fragments';
 
 describe('Education e2e', () => {
   let app: TestApp;
-  let user: User;
+  let user: fragments.user;
 
   beforeAll(async () => {
     app = await createTestApp();
@@ -105,7 +103,7 @@ describe('Education e2e', () => {
         id: education.id,
       },
     );
-    const actual: Education | undefined = result.deleteEducation;
+    const actual = result.deleteEducation;
     expect(actual).toBeTruthy();
   });
 

test/engagement-changeset-aware.e2e-spec.ts

@@ -1,7 +1,6 @@
 import { CalendarDate, type ID, Role } from '~/common';
 import { graphql } from '~/graphql';
 import { EngagementStatus } from '../src/components/engagement/dto';
-import { type Language } from '../src/components/language/dto';
 import { ProjectChangeRequestType } from '../src/components/project-change-request/dto';
 import {
   approveProjectChangeRequest,
@@ -15,12 +14,12 @@ import {
   createSession,
   createTestApp,
   errors,
+  fragments,
   registerUser,
   runAsAdmin,
   type TestApp,
   updateProject,
 } from './utility';
-import { fragments } from './utility/fragments';
 import { forceProjectTo } from './utility/transition-project';
 
 const readEngagements = (app: TestApp, id: string, changeset?: string) =>
@@ -140,7 +139,7 @@ const activeProject = async (app: TestApp, projectId: ID) => {
 
 describe('Engagement Changeset Aware e2e', () => {
   let app: TestApp;
-  let language: Language;
+  let language: fragments.language;
 
   beforeAll(async () => {
     app = await createTestApp();

test/engagement.e2e-spec.ts

@@ -6,19 +6,10 @@ import { graphql } from '~/graphql';
 import {
   type CreateInternshipEngagement,
   EngagementStatus,
-  type InternshipEngagement,
   InternshipPosition,
-  type LanguageEngagement,
 } from '../src/components/engagement/dto';
-import { type Language } from '../src/components/language/dto';
-import { type Location } from '../src/components/location/dto';
 import { ProductMethodology } from '../src/components/product/dto';
-import {
-  type Project,
-  ProjectStep,
-  ProjectType,
-} from '../src/components/project/dto';
-import { type User } from '../src/components/user/dto';
+import { ProjectStep, ProjectType } from '../src/components/project/dto';
 import {
   createDirectProduct,
   createFundingAccount,
@@ -34,7 +25,6 @@ import {
   errors,
   fragments,
   getUserFromSession,
-  type Raw,
   registerUser,
   requestFileUpload,
   runAsAdmin,
@@ -56,13 +46,13 @@ import {
 
 describe('Engagement e2e', () => {
   let app: TestApp;
-  let project: Raw<Project>;
-  let internshipProject: Raw<Project>;
-  let language: Language;
-  let location: Location;
+  let project: fragments.project;
+  let internshipProject: fragments.project;
+  let language: fragments.language;
+  let location: fragments.location;
   let user: TestUser;
-  let intern: Partial<User>;
-  let mentor: Partial<User>;
+  let intern: { id: string };
+  let mentor: { id: string };
 
   beforeAll(async () => {
     app = await createTestApp();
@@ -139,8 +129,7 @@ describe('Engagement e2e', () => {
       },
     );
 
-    const actual: LanguageEngagement =
-      result.createLanguageEngagement.engagement;
+    const actual = result.createLanguageEngagement.engagement;
     expect(actual.id).toBeDefined();
     expect(actual.firstScripture.value).toBeNull();
     expect(actual.lukePartnership.value).toBeNull();
@@ -207,8 +196,7 @@ describe('Engagement e2e', () => {
       },
     );
 
-    const actual: InternshipEngagement =
-      result.createInternshipEngagement.engagement;
+    const actual = result.createInternshipEngagement.engagement;
     expect(actual.id).toBeDefined();
     expect(actual.countryOfOrigin.value).toBeNull();
     expect(actual.mentor.value).toBeNull();
@@ -463,7 +451,7 @@ describe('Engagement e2e', () => {
       },
     );
 
-    const actual: boolean | undefined = result.deleteEngagement;
+    const actual = result.deleteEngagement;
     expect(actual).toBeTruthy();
     await app.graphql
       .query(

test/file.e2e-spec.ts

@@ -16,32 +16,27 @@ import {
   FileNodeType,
   type RequestUploadOutput,
 } from '../src/components/file/dto';
-import { type User } from '../src/components/user/dto';
 import {
   createFileVersion,
   createSession,
   createTestApp,
   errors,
   type FakeFile,
+  type fragments,
   generateFakeFile,
   getFileNode,
   getFileNodeChildren,
   registerUser,
   requestFileUpload,
   runInIsolatedSession,
   type TestApp,
+  type TestUser,
   uploadFileContents,
 } from './utility';
 import {
   createDirectory,
   createRootDirectory,
 } from './utility/create-directory';
-import {
-  type RawDirectory,
-  type RawFile,
-  type RawFileNode,
-  type RawFileVersion,
-} from './utility/fragments';
 
 export async function uploadFile(
   app: TestApp,
@@ -122,7 +117,7 @@ describe('File e2e', () => {
   let app: TestApp;
   let bucket: LocalBucket;
   let root: Directory;
-  let me: User;
+  let me: TestUser;
 
   beforeAll(async () => {
     app = await createTestApp();
@@ -148,7 +143,8 @@ describe('File e2e', () => {
     const fakeFile = generateFakeFile();
 
     const created = await uploadFile(app, root.id, fakeFile);
-    const fetched = (await getFileNode(app, created.id)) as RawFile;
+    const fetched = await getFileNode(app, created.id);
+    if (fetched.__typename !== 'File') fail();
     for (const file of [created, fetched]) {
       expect(file.id).toBeDefined();
       expect(file.name).toEqual(fakeFile.name);
@@ -172,7 +168,8 @@ describe('File e2e', () => {
     const file = await uploadFile(app, root.id, fakeFile, upload);
 
     // Maybe get version from file.children when implemented
-    const version = (await getFileNode(app, upload.id)) as RawFileVersion;
+    const version = await getFileNode(app, upload.id);
+    if (version.__typename !== 'FileVersion') fail();
 
     expect(version.id).toBeDefined();
     expect(version.name).toEqual(fakeFile.name);
@@ -216,8 +213,8 @@ describe('File e2e', () => {
   });
 
   async function assertFileChanges(
-    updated: RawFile,
-    initial: RawFile,
+    updated: fragments.file,
+    initial: fragments.file,
     input: FakeFile,
   ) {
     expect(updated.id).toEqual(initial.id);
@@ -275,15 +272,15 @@ describe('File e2e', () => {
     const upload = await requestFileUpload(app);
     const file = await uploadFile(app, root.id, {}, upload);
     // Maybe get version from file.children when implemented
-    const version = (await getFileNode(app, upload.id)) as RawFileVersion;
+    const version = await getFileNode(app, upload.id);
     await deleteNode(app, version.id);
     await expectNodeNotFound(app, version.id);
     await expectNodeNotFound(app, file.id);
   });
 
   describe('directory children', () => {
-    let dir: RawDirectory;
-    let expectedChildren: RawFileNode[];
+    let dir: fragments.directory;
+    let expectedChildren: fragments.fileNode[];
     let expectedTotalChildren: number;
     let expectedTotalDirs: number;
     let expectedTotalFiles: number;
@@ -396,7 +393,7 @@ describe('File e2e', () => {
   });
 
   describe('file children', () => {
-    let file: RawFile;
+    let file: fragments.file;
     const expectedVersionIds: ID[] = [];
     let expectedTotalVersions: number;
 

test/film.e2e-spec.ts

@@ -2,7 +2,6 @@ import { faker } from '@faker-js/faker';
 import { times } from 'lodash';
 import { isValidId, Role } from '~/common';
 import { graphql } from '~/graphql';
-import { type Film } from '../src/components/film/dto';
 import { ScriptureRange } from '../src/components/scripture/dto';
 import {
   createFilm,
@@ -117,7 +116,7 @@ describe('Film e2e', () => {
         id: fm.id,
       },
     );
-    const actual: Film | undefined = result.deleteFilm;
+    const actual = result.deleteFilm;
     expect(actual).toBeTruthy();
   });
 

test/funding-account.e2e-spec.ts

@@ -2,7 +2,6 @@ import { faker } from '@faker-js/faker';
 import { times } from 'lodash';
 import { isValidId, Role } from '~/common';
 import { graphql } from '~/graphql';
-import { type FundingAccount } from '../src/components/funding-account/dto';
 import {
   createFundingAccount,
   createSession,
@@ -109,7 +108,7 @@ describe('FundingAccount e2e', () => {
         id: st.id,
       },
     );
-    const actual: FundingAccount | undefined = result.deleteFundingAccount;
+    const actual = result.deleteFundingAccount;
     expect(actual).toBeTruthy();
   });
 

test/language-changeset-aware.e2e-spec.ts

@@ -11,10 +11,10 @@ import {
   createRegion,
   createSession,
   createTestApp,
+  fragments,
   loginAsAdmin,
   type TestApp,
 } from './utility';
-import { fragments } from './utility/fragments';
 import { forceProjectTo } from './utility/transition-project';
 
 const readLanguage = (app: TestApp, id: string, changeset?: string) =>

test/language.e2e-spec.ts

@@ -11,10 +11,10 @@ import {
   createSession,
   createTestApp,
   errors,
+  fragments,
   loginAsAdmin,
   type TestApp,
 } from './utility';
-import { fragments } from './utility/fragments';
 
 describe('Language e2e', () => {
   let app: TestApp;

test/location.e2e-spec.ts

@@ -99,7 +99,7 @@ describe('Location e2e', () => {
         id: st.id,
       },
     );
-    const actual: Location | undefined = result.deleteLocation;
+    const actual = result.deleteLocation;
     expect(actual).toBeTruthy();
   });