Futa Arai пре 7 месеци
родитељ
комит
3dae29befb

+ 4 - 4
apps/app/test/integration/service/v5.non-public-page.test.ts

@@ -1798,7 +1798,7 @@ describe('PageService page operations with non-public pages', () => {
       expect(duplicatedRevision1?.body).toBe(_revision1?.body);
       expect(duplicatedRevision1?.pageId).toStrictEqual(duplicatedPage1?._id);
       expect(
-        normalizeGrantedGroups(duplicatedPage2.grantedGroups),
+        normalizeGrantedGroups(duplicatedPage2?.grantedGroups),
       ).toStrictEqual([
         { item: groupIdC, type: GroupType.userGroup },
         { item: externalGroupIdC, type: GroupType.externalUserGroup },
@@ -1893,9 +1893,9 @@ describe('PageService page operations with non-public pages', () => {
         });
         expect(pageN).toBeNull();
         expect(page1).toBeTruthy();
-        expect(page1.status).toBe(Page.STATUS_DELETED);
-        expect(page1.descendantCount).toBe(0);
-        expect(page1.parent).toBeNull();
+        expect(page1?.status).toBe(Page.STATUS_DELETED);
+        expect(page1?.descendantCount).toBe(0);
+        expect(page1?.parent).toBeNull();
       });
     });
     describe('Delete multiple pages with grant USER_GROUP', () => {

+ 12 - 6
apps/app/test/integration/service/v5.public-page.test.ts

@@ -2035,8 +2035,8 @@ describe('PageService page operations with only public pages', () => {
       expect(generalXssFilterProcessSpy).toHaveBeenCalled();
       expect(duplicatedPage.path).toBe(newPagePath);
       expect(duplicatedPage._id).not.toStrictEqual(page?._id);
-      expect(duplicatedPage.revision).toStrictEqual(duplicatedRevision._id);
-      expect(duplicatedRevision.body).toEqual(baseRevision.body);
+      expect(duplicatedPage.revision).toStrictEqual(duplicatedRevision?._id);
+      expect(duplicatedRevision?.body).toEqual(baseRevision?.body);
     });
 
     test('Should NOT duplicate single empty page', async () => {
@@ -2077,8 +2077,8 @@ describe('PageService page operations with only public pages', () => {
       expect(generalXssFilterProcessSpy).toHaveBeenCalled();
       expect(duplicatedPage.path).toBe(newPagePath);
       expect(duplicatedPage._id).not.toStrictEqual(page?._id);
-      expect(duplicatedPage.revision).toStrictEqual(duplicatedRevision._id);
-      expect(duplicatedRevision.body).toEqual(baseRevision.body);
+      expect(duplicatedPage.revision).toStrictEqual(duplicatedRevision?._id);
+      expect(duplicatedRevision?.body).toEqual(baseRevision?.body);
     });
 
     test('Should duplicate multiple pages', async () => {
@@ -2243,10 +2243,16 @@ describe('PageService page operations with only public pages', () => {
       });
       const basePageChild = await Page.findOne({
         parent: basePage?._id,
-      }).populate({ path: 'revision', model: 'Revision' });
+      }).populate<{ revision: IRevisionDocument }>({
+        path: 'revision',
+        model: 'Revision',
+      });
       const basePageGrandhild = await Page.findOne({
         parent: basePageChild?._id,
-      }).populate({ path: 'revision', model: 'Revision' });
+      }).populate<{ revision: IRevisionDocument }>({
+        path: 'revision',
+        model: 'Revision',
+      });
       expect(basePage).toBeTruthy();
       expect(basePageChild).toBeTruthy();
       expect(basePageGrandhild).toBeTruthy();