Skip to content

Commit

Permalink
test: Update entity-mock.ts functions
Browse files Browse the repository at this point in the history
  • Loading branch information
alepefe committed Nov 8, 2024
1 parent 6175a9a commit 3caf3f8
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
4 changes: 2 additions & 2 deletions api/test/utils/test-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -118,9 +118,9 @@ export class TestManager<FixtureType> {
createSection: (additionalData: DeepPartial<Section>) =>
createSection(this.getDataSource(), additionalData),
createCustomWidget: (
additionalData?: DeepPartial<CustomWidget>,
data?: DeepPartial<CustomWidget>,
): Promise<CustomWidget> =>
createCustomWidget(this.getDataSource(), additionalData),
createCustomWidget(this.getDataSource(), data),
};
}
}
4 changes: 2 additions & 2 deletions shared/lib/e2e-test-manager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ export class E2eTestManager {
data: DeepPartial<BaseWidget> & { indicator: string },
): Promise<BaseWidget> => createBaseWidget(this.getDataSource(), data),
createCustomWidget: (
additionalData?: DeepPartial<CustomWidget>,
data?: DeepPartial<CustomWidget>,
): Promise<CustomWidget> =>
createCustomWidget(this.getDataSource(), additionalData),
createCustomWidget(this.getDataSource(), data),
ensureQuestionIndicatorMapExists: async (
dataSource: DataSource,
questionIndicatorMap: { indicator: string; question: string },
Expand Down
9 changes: 7 additions & 2 deletions shared/lib/entity-mocks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -103,15 +103,20 @@ export const createSection = async (

export const createCustomWidget = async (
dataSource: DataSource,
additionalData?: DeepPartial<CustomWidget>,
data?: DeepPartial<CustomWidget>,
) => {
const baseWidgetsRepository = dataSource.getRepository(CustomWidget);

const defaults: Partial<CustomWidget> = {
name: 'custom-widget',
defaultVisualization: WIDGET_VISUALIZATIONS.AREA_GRAPH,
filters: {},
widget: {} as BaseWidget,
};

return baseWidgetsRepository.save({ ...defaults, ...additionalData });
const customWidget = { ...defaults, ...data };
customWidget.widget!.indicator ??= new Date().toISOString();

await createBaseWidget(dataSource, customWidget.widget! as BaseWidget);
return baseWidgetsRepository.save(customWidget);
};

0 comments on commit 3caf3f8

Please sign in to comment.