yohei0125 4 лет назад
Родитель
Сommit
019ee97d91

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

@@ -707,7 +707,7 @@ export default (crowi: Crowi): any => {
     // Delete PageRedirect if exists
     const PageRedirect = mongoose.model('PageRedirect') as unknown as PageRedirectModel;
     try {
-      await PageRedirect.deleteOne({ from: path });
+      await PageRedirect.deleteOne({ fromPath: path });
       logger.warn(`Deleted page redirect after creating a new page at path "${path}".`);
     }
     catch (err) {

+ 2 - 0
packages/app/test/integration/global-setup.js

@@ -30,6 +30,8 @@ module.exports = async() => {
 
   // create global user & rootPage
   const globalUser = (await userCollection.insertMany([{ name: 'globalUser', username: 'globalUser', email: 'globalUser@example.com' }]))[0];
+  await userCollection.insertMany([{ name: 'v5DummyUser1', username: 'v5DummyUser1', email: 'v5DummyUser1@example.com' }])[0];
+  await userCollection.insertMany([{ name: 'v5DummyUser2', username: 'v5DummyUser2', email: 'v5DummyUser2@example.com' }])[0];
   await pageCollection.insertMany([{
     path: '/',
     grant: 1,

+ 0 - 3
packages/app/test/integration/models/v5.page.test.js

@@ -34,9 +34,6 @@ describe('Page', () => {
     PageRedirect = mongoose.model('PageRedirect');
 
     dummyUser1 = await User.findOne({ username: 'v5DummyUser1' });
-    if (dummyUser1 == null) {
-      dummyUser1 = await User.create({ name: 'v5DummyUser1', username: 'v5DummyUser1', email: 'v5DummyUser1@example.com' });
-    }
 
     rootPage = await Page.findOne({ path: '/' });