Skip to content

Commit

Permalink
test: add integ test for cpk support
Browse files Browse the repository at this point in the history
  • Loading branch information
@hein-j
Hein Jeong authored and hein-j committed Dec 5, 2022
1 parent f0d74e5 commit bb9f04d
Show file tree
Hide file tree
Showing 10 changed files with 1,061 additions and 40 deletions.
1 change: 1 addition & 0 deletions packages/test-generator/integration-test-templates/cypress/e2e/generate-spec.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const EXPECTED_SUCCESSFUL_CASES = new Set([
'DataStoreFormCreateAllSupportedFormFields',
'DataStoreFormUpdateAllSupportedFormFields',
'CustomFormCreateNestedJson',
'DataStoreFormUpdateCPKTeacher',
'ComponentWithDataBindingWithPredicate',
'ComponentWithDataBindingWithoutPredicate',
'ComponentWithSimplePropertyBinding',
Expand Down
66 changes: 46 additions & 20 deletions packages/test-generator/integration-test-templates/cypress/e2e/update-form-spec.cy.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
limitations under the License.
*/

import { getArrayFieldButtonByLabel, clickAddToArray, removeArrayItem } from '../utils/form';
import { getArrayFieldButtonByLabel, clickAddToArray, removeArrayItem, typeInAutocomplete } from '../utils/form';

describe('UpdateForms', () => {
before(() => {
Expand All @@ -39,49 +39,37 @@ describe('UpdateForms', () => {
// should be able to change value
removeArrayItem('John Lennon');
getArrayFieldButtonByLabel('Has one user').click();
cy.get(`.amplify-autocomplete`).within(() => {
cy.get('input').type(`Paul McCartney{downArrow}{enter}`);
});
typeInAutocomplete(`Paul McCartney{downArrow}{enter}`);
clickAddToArray();

// Belongs to update
removeArrayItem('John');
getArrayFieldButtonByLabel('Belongs to owner').click();
cy.get(`.amplify-autocomplete`).within(() => {
cy.get('input').type(`George{downArrow}{enter}`);
});
typeInAutocomplete(`George{downArrow}{enter}`);
clickAddToArray();

// Many to many update
removeArrayItem('Red');
removeArrayItem('Blue');

getArrayFieldButtonByLabel('Many to many tags').click();
cy.get(`.amplify-autocomplete`).within(() => {
cy.get('input').type(`Or{downArrow}{enter}`);
});
typeInAutocomplete(`Or{downArrow}{enter}`);
clickAddToArray();

getArrayFieldButtonByLabel('Many to many tags').click();
cy.get(`.amplify-autocomplete`).within(() => {
cy.get('input').type(`Gr{downArrow}{enter}`);
});
typeInAutocomplete(`Gr{downArrow}{enter}`);
clickAddToArray();

// Many to many update
// Has many update
removeArrayItem('David');
removeArrayItem('Jessica');

getArrayFieldButtonByLabel('Has many students').click();
cy.get(`.amplify-autocomplete`).within(() => {
cy.get('input').type(`{downArrow}{enter}`);
});
typeInAutocomplete(`{downArrow}{enter}`);
clickAddToArray();

getArrayFieldButtonByLabel('Has many students').click();
cy.get(`.amplify-autocomplete`).within(() => {
cy.get('input').type(`Sar{downArrow}{enter}`);
});
typeInAutocomplete(`Sar{downArrow}{enter}`);
clickAddToArray();

cy.contains('Submit').click();
Expand All @@ -102,4 +90,42 @@ describe('UpdateForms', () => {
});
});
});

// this model & related models all use CPK
describe('DataStoreFormUpdateCPKTeacher', () => {
it('should display current values and save to DataStore', () => {
cy.get('#dataStoreFormUpdateCPKTeacher').within(() => {
// hasOne
removeArrayItem('Harry');
getArrayFieldButtonByLabel('Cpk student').click();
typeInAutocomplete('Her{downArrow}{enter}');
clickAddToArray();

// manyToMany
removeArrayItem('Math');
getArrayFieldButtonByLabel('Cpk classes').click();
typeInAutocomplete('English{downArrow}{enter}');
clickAddToArray();

// hasMany
removeArrayItem('Figure 8');
getArrayFieldButtonByLabel('Cpk projects').click();
typeInAutocomplete('Either{downArrow}{enter}');
clickAddToArray();

cy.contains('Submit').click();

cy.contains(/mySpecialTeacherId/).then((recordElement: JQuery) => {
const record = JSON.parse(recordElement.text());

expect(record.cPKTeacherCPKStudentId).to.equal('Hermione');
expect(record.CPKStudent.specialStudentId).to.equal('Hermione');
expect(record.CPKClasses.length).to.equal(1);
expect(record.CPKClasses[0].specialClassId).to.equal('English');
expect(record.CPKProjects.length).to.equal(1);
expect(record.CPKProjects[0].specialProjectId).to.equal('Either/Or');
});
});
});
});
});
6 changes: 6 additions & 0 deletions packages/test-generator/integration-test-templates/cypress/utils/form.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,3 +38,9 @@ export const removeArrayItem = (itemLabel: string) => {
cy.get('svg').trigger('mouseover').trigger('click', { force: true });
});
};

export const typeInAutocomplete = (content: string) => {
cy.get(`.amplify-autocomplete`).within(() => {
cy.get('input').type(content);
});
};
145 changes: 125 additions & 20 deletions packages/test-generator/integration-test-templates/src/UpdateFormTests.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,10 @@
limitations under the License.
*/
import '@aws-amplify/ui-react/styles.css';
import { AmplifyProvider, View, Heading, Text } from '@aws-amplify/ui-react';
import { AmplifyProvider, View, Heading, Text, Divider } from '@aws-amplify/ui-react';
import React, { useState, useEffect, useRef, SetStateAction } from 'react';
import { AsyncItem, DataStore } from '@aws-amplify/datastore';
import { DataStoreFormUpdateAllSupportedFormFields } from './ui-components'; // eslint-disable-line import/extensions, max-len
import { DataStoreFormUpdateAllSupportedFormFields, DataStoreFormUpdateCPKTeacher } from './ui-components'; // eslint-disable-line import/extensions, max-len
import {
Owner,
User,
Expand All @@ -28,26 +28,45 @@ import {
AllSupportedFormFieldsTag,
LazyAllSupportedFormFieldsTag,
LazyStudent,
CPKStudent,
CPKClass,
CPKProject,
CPKTeacher,
LazyCPKProject,
LazyCPKTeacherCPKClass,
CPKTeacherCPKClass,
LazyCPKClass,
} from './models';
import { getModelsFromJoinTableRecords } from './test-utils';

const initializeTestData = async (): Promise<void> => {
await DataStore.save(new User({ firstName: 'John', lastName: 'Lennon', age: 29 }));
await DataStore.save(new User({ firstName: 'Paul', lastName: 'McCartney', age: 72 }));
await DataStore.save(new User({ firstName: 'George', lastName: 'Harrison', age: 50 }));
await DataStore.save(new User({ firstName: 'Ringo', lastName: 'Starr', age: 5 }));
await DataStore.save(new Owner({ name: 'John' }));
await DataStore.save(new Owner({ name: 'Paul' }));
await DataStore.save(new Owner({ name: 'George' }));
await DataStore.save(new Owner({ name: 'Ringo' }));
await DataStore.save(new Tag({ label: 'Red' }));
await DataStore.save(new Tag({ label: 'Blue' }));
await DataStore.save(new Tag({ label: 'Green' }));
await DataStore.save(new Tag({ label: 'Orange' }));
await DataStore.save(new Student({ name: 'Matthew' }));
await DataStore.save(new Student({ name: 'Sarah' }));
await DataStore.save(new Student({ name: 'David' }));
await DataStore.save(new Student({ name: 'Jessica' }));
await Promise.all<any>([
// for AllSupportedFormFields
DataStore.save(new User({ firstName: 'John', lastName: 'Lennon', age: 29 })),
DataStore.save(new User({ firstName: 'Paul', lastName: 'McCartney', age: 72 })),
DataStore.save(new User({ firstName: 'George', lastName: 'Harrison', age: 50 })),
DataStore.save(new User({ firstName: 'Ringo', lastName: 'Starr', age: 5 })),
DataStore.save(new Owner({ name: 'John' })),
DataStore.save(new Owner({ name: 'Paul' })),
DataStore.save(new Owner({ name: 'George' })),
DataStore.save(new Owner({ name: 'Ringo' })),
DataStore.save(new Tag({ label: 'Red' })),
DataStore.save(new Tag({ label: 'Blue' })),
DataStore.save(new Tag({ label: 'Green' })),
DataStore.save(new Tag({ label: 'Orange' })),
DataStore.save(new Student({ name: 'Matthew' })),
DataStore.save(new Student({ name: 'Sarah' })),
DataStore.save(new Student({ name: 'David' })),
DataStore.save(new Student({ name: 'Jessica' })),

// for CPKTeacher
DataStore.save(new CPKStudent({ specialStudentId: 'Harry' })),
DataStore.save(new CPKStudent({ specialStudentId: 'Hermione' })),
DataStore.save(new CPKClass({ specialClassId: 'Math' })),
DataStore.save(new CPKClass({ specialClassId: 'English' })),
DataStore.save(new CPKProject({ specialProjectId: 'Either/Or' })),
DataStore.save(new CPKProject({ specialProjectId: 'Figure 8' })),
]);
};

const initializeAllSupportedFormFieldsTestData = async ({
Expand Down Expand Up @@ -121,12 +140,66 @@ const initializeAllSupportedFormFieldsTestData = async ({
});
};

const initializeCPKTeacherTestData = async ({
setCPKTeacherId,
}: {
setCPKTeacherId: React.Dispatch<SetStateAction<string | undefined>>;
}): Promise<void> => {
const connectedStudent = (await DataStore.query(CPKStudent, (s) => s.specialStudentId.eq('Harry')))[0];
const connectedClasses = await DataStore.query(CPKClass, (c) => c.specialClassId.eq('Math'));
const connectedProjects = await DataStore.query(CPKProject, (p) => p.specialProjectId.eq('Figure 8'));

const createdRecord = await DataStore.save(
new CPKTeacher({
specialTeacherId: 'mySpecialTeacherId',
CPKStudent: connectedStudent,
}),
);

await Promise.all(
connectedClasses.reduce((promises: AsyncItem<LazyCPKTeacherCPKClass>[], cpkClass) => {
promises.push(
DataStore.save(
new CPKTeacherCPKClass({
cpkClass,
cpkTeacher: createdRecord,
}),
),
);
return promises;
}, []),
);

await Promise.all(
connectedProjects.reduce((promises: AsyncItem<LazyCPKProject>[], project) => {
promises.push(
DataStore.save(
CPKProject.copyOf(project, (updated) => {
Object.assign(updated, { cPKTeacherID: createdRecord.specialTeacherId });
}),
),
);
return promises;
}, []),
);

setCPKTeacherId((prevId) => {
if (!prevId) {
return createdRecord.specialTeacherId;
}
return prevId;
});
};

export default function UpdateFormTests() {
const [isInitialized, setInitialized] = useState(false);
const [allSupportedFormFieldsRecordId, setAllSupportedFormFieldsRecordId] = useState<string | undefined>(undefined);

const [dataStoreFormUpdateAllSupportedFormFieldsRecord, setDataStoreFormUpdateAllSupportedFormFieldsRecord] =
useState('');
const [cpkTeacherId, setCPKTeacherId] = useState<string | undefined>('');
const [dataStoreFormUpdateCPKTeacherRecord, setDataStoreFormUpdateCPKTeacherRecord] = useState<string>('');

const initializeStarted = useRef(false);

useEffect(() => {
Expand All @@ -137,8 +210,10 @@ export default function UpdateFormTests() {
// DataStore.clear() doesn't appear to reliably work in this scenario.
indexedDB.deleteDatabase('amplify-datastore');
await initializeTestData();
await initializeAllSupportedFormFieldsTestData({ setAllSupportedFormFieldsRecordId });

await Promise.all([
initializeAllSupportedFormFieldsTestData({ setAllSupportedFormFieldsRecordId }),
initializeCPKTeacherTestData({ setCPKTeacherId }),
]);
setInitialized(true);
};

Expand Down Expand Up @@ -180,6 +255,36 @@ export default function UpdateFormTests() {
/>
<Text>{dataStoreFormUpdateAllSupportedFormFieldsRecord}</Text>
</View>
<Divider />
<Heading>DataStore Form - UpdateCPKTeacher</Heading>
<View id="dataStoreFormUpdateCPKTeacher">
<DataStoreFormUpdateCPKTeacher
specialTeacherId={cpkTeacherId}
onSuccess={async () => {
const records = await DataStore.query(CPKTeacher);
const record = records[0];

const joinTableRecords = (await record.CPKClasses?.toArray()) as LazyCPKTeacherCPKClass[];

const CPKClasses = await Promise.all(
joinTableRecords?.reduce((promises: AsyncItem<LazyCPKClass>[], joinTableRecord) => {
promises.push(joinTableRecord.cpkClass as AsyncItem<LazyCPKClass>);
return promises;
}, []),
);

setDataStoreFormUpdateCPKTeacherRecord(
JSON.stringify({
...record,
CPKStudent: await record.CPKStudent,
CPKClasses,
CPKProjects: await record.CPKProjects?.toArray(),
}),
);
}}
/>
<Text>{dataStoreFormUpdateCPKTeacherRecord}</Text>
</View>
</AmplifyProvider>
);
}
Loading

0 comments on commit bb9f04d

Please sign in to comment.