github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix repeated logic caused by updateOne & deleteOne overrides (#16433)

Browse Source 
* fix updateOne & deleteOne overrides repeated logic

* replace remaining jest usages

* fix notifications service env mock

* simplify mockImplementation with mockResolvedValue

* fix types in test

Co-authored-by: ian <licitdev@gmail.com>
This commit is contained in:
Azri Kahar
2022-11-30 21:51:11 +08:00
committed by GitHub
parent 1c93cc661e
commit a4de019ead
13 changed files with 1203 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
api/src/utils/apply-snapshot.test.ts
View File

@@ -103,12 +103,8 @@ describe('applySnapshot', () => {
// Stop call to db later on in apply-snapshot
vi.spyOn(getSchema, 'getSchema').mockReturnValue(Promise.resolve(snapshotApplyTestSchema));
// We are not actually testing that createOne works, just that is is called correctly
const createOneCollectionSpy = vi
.spyOn(CollectionsService.prototype, 'createOne')
.mockImplementation(vi.fn().mockReturnValue([]));
const createFieldSpy = vi
.spyOn(FieldsService.prototype, 'createField')
.mockImplementation(vi.fn().mockReturnValue([]));
const createOneCollectionSpy = vi.spyOn(CollectionsService.prototype, 'createOne').mockResolvedValue('test');
const createFieldSpy = vi.spyOn(FieldsService.prototype, 'createField').mockResolvedValue();
await applySnapshot(snapshotCreateCollectionNotNested, {
database: db,
@@ -254,12 +250,8 @@ describe('applySnapshot', () => {
// Stop call to db later on in apply-snapshot
vi.spyOn(getSchema, 'getSchema').mockReturnValue(Promise.resolve(snapshotApplyTestSchema));
// We are not actually testing that createOne works, just that is is called correctly
const createOneCollectionSpy = vi
.spyOn(CollectionsService.prototype, 'createOne')
.mockImplementation(vi.fn().mockReturnValue([]));
const createFieldSpy = vi
.spyOn(FieldsService.prototype, 'createField')
.mockImplementation(vi.fn().mockReturnValue([]));
const createOneCollectionSpy = vi.spyOn(CollectionsService.prototype, 'createOne').mockResolvedValue('test');
const createFieldSpy = vi.spyOn(FieldsService.prototype, 'createField').mockResolvedValue();
await applySnapshot(snapshotCreateCollection, {
database: db,
@@ -290,9 +282,7 @@ describe('applySnapshot', () => {
// Stop call to db later on in apply-snapshot
vi.spyOn(getSchema, 'getSchema').mockReturnValue(Promise.resolve(snapshotApplyTestSchema));
// We are not actually testing that deleteOne works, just that is is called correctly
const deleteOneCollectionSpy = vi
.spyOn(CollectionsService.prototype, 'deleteOne')
.mockImplementation(vi.fn().mockReturnValue([]));
const deleteOneCollectionSpy = vi.spyOn(CollectionsService.prototype, 'deleteOne').mockResolvedValue('test');
await applySnapshot(snapshotToApply, {
database: db,