Browse Source

fix test error

yohei0125 4 years ago
parent
commit
1d29b4a221

+ 1 - 1
packages/app/src/server/service/page.ts

@@ -1269,7 +1269,7 @@ class PageService {
       .pipe(createBatchStream(BULK_REINDEX_SIZE))
       .pipe(createBatchStream(BULK_REINDEX_SIZE))
       .pipe(writeStream);
       .pipe(writeStream);
 
 
-    await streamToPromise(readStream);
+    await streamToPromise(writeStream);
 
 
     return nDeletedNonEmptyPages;
     return nDeletedNonEmptyPages;
   }
   }

+ 26 - 3
packages/app/test/integration/service/v5.page.test.ts

@@ -237,6 +237,8 @@ describe('PageService page operations with only public pages', () => {
     const pageIdForDelete1 = new mongoose.Types.ObjectId();
     const pageIdForDelete1 = new mongoose.Types.ObjectId();
     const pageIdForDelete2 = new mongoose.Types.ObjectId();
     const pageIdForDelete2 = new mongoose.Types.ObjectId();
     const pageIdForDelete3 = new mongoose.Types.ObjectId();
     const pageIdForDelete3 = new mongoose.Types.ObjectId();
+    const pageIdForDelete4 = new mongoose.Types.ObjectId();
+    const pageIdForDelete5 = new mongoose.Types.ObjectId();
 
 
     await Page.insertMany([
     await Page.insertMany([
       {
       {
@@ -289,6 +291,23 @@ describe('PageService page operations with only public pages', () => {
         parent: rootPage._id,
         parent: rootPage._id,
         status: Page.STATUS_PUBLISHED,
         status: Page.STATUS_PUBLISHED,
       },
       },
+      {
+        _id: pageIdForDelete4,
+        path: '/user',
+        grant: Page.GRANT_PUBLIC,
+        parent: rootPage._id,
+        status: Page.STATUS_PUBLISHED,
+        isEmpty: true,
+      },
+      {
+        _id: pageIdForDelete5,
+        path: '/user/v5DummyUser1',
+        grant: Page.GRANT_PUBLIC,
+        creator: dummyUser1,
+        lastUpdateUser: dummyUser1._id,
+        parent: pageIdForDelete4,
+        status: Page.STATUS_PUBLISHED,
+      },
     ]);
     ]);
 
 
     const tagIdForDelete1 = new mongoose.Types.ObjectId();
     const tagIdForDelete1 = new mongoose.Types.ObjectId();
@@ -496,12 +515,16 @@ describe('PageService page operations with only public pages', () => {
       expect(isThrown).toBe(true);
       expect(isThrown).toBe(true);
     });
     });
     test('Should NOT delete /user/hoge page', async() => {
     test('Should NOT delete /user/hoge page', async() => {
-      const dummyUser1Page = await Page.findOne({ username: 'dummyUser1' });
+      const dummyUser1Page = await Page.findOne({ path: '/user/v5DummyUser1' });
       expectAllToBeTruthy([dummyUser1Page]);
       expectAllToBeTruthy([dummyUser1Page]);
 
 
       let isThrown;
       let isThrown;
-      try { await deletePage(dummyUser1Page, dummyUser1, {}, false) }
-      catch (err) { isThrown = true }
+      try {
+        await deletePage(dummyUser1Page, dummyUser1, {}, false);
+      }
+      catch (err) {
+        isThrown = true;
+      }
 
 
       expect(isThrown).toBe(true);
       expect(isThrown).toBe(true);
     });
     });