itizawa 5 лет назад
Родитель
Сommit
72194d743e
2 измененных файлов с 4 добавлено и 29 удалено
  1. 0 6
      src/server/models/page.js
  2. 4 23
      src/test/models/page.test.js

+ 0 - 6
src/server/models/page.js

@@ -412,12 +412,6 @@ module.exports = function(crowi) {
     return saved;
     return saved;
   };
   };
 
 
-  pageSchema.methods.getSlackChannel = function() {
-    const slackChannel = this.get('slackChannel');
-
-    return slackChannel || '';
-  };
-
   pageSchema.methods.updateSlackChannel = function(slackChannel) {
   pageSchema.methods.updateSlackChannel = function(slackChannel) {
     this.slackChannel = slackChannel;
     this.slackChannel = slackChannel;
 
 

+ 4 - 23
src/test/models/page.test.js

@@ -93,10 +93,9 @@ describe('Page', () => {
         creator: testUser0,
         creator: testUser0,
       },
       },
       {
       {
-        path: '/page/for/extended',
+        path: '/page/child/without/parents',
         grant: Page.GRANT_PUBLIC,
         grant: Page.GRANT_PUBLIC,
         creator: testUser0,
         creator: testUser0,
-        extended: { hoge: 1 },
       },
       },
       {
       {
         path: '/grant/groupacl',
         path: '/grant/groupacl',
@@ -266,24 +265,6 @@ describe('Page', () => {
     });
     });
   });
   });
 
 
-  describe('Extended field', () => {
-    describe('Slack Channel.', () => {
-      test('should be empty', async() => {
-        const page = await Page.findOne({ path: '/page/for/extended' });
-        expect(page.extended.hoge).toEqual(1);
-        expect(page.getSlackChannel()).toEqual('');
-      });
-
-      test('set slack channel and should get it and should keep hoge ', async() => {
-        let page = await Page.findOne({ path: '/page/for/extended' });
-        await page.updateSlackChannel('slack-channel1');
-        page = await Page.findOne({ path: '/page/for/extended' });
-        expect(page.extended.hoge).toEqual(1);
-        expect(page.getSlackChannel()).toEqual('slack-channel1');
-      });
-    });
-  });
-
   describe('.findPage', () => {
   describe('.findPage', () => {
     describe('findByIdAndViewer', () => {
     describe('findByIdAndViewer', () => {
       test('should find page (public)', async() => {
       test('should find page (public)', async() => {
@@ -341,7 +322,7 @@ describe('Page', () => {
       expect(result.length).toEqual(1);
       expect(result.length).toEqual(1);
       // assert paths
       // assert paths
       const pagePaths = result.map((page) => { return page.path });
       const pagePaths = result.map((page) => { return page.path });
-      expect(pagePaths).toContainEqual('/page/for/extended');
+      expect(pagePaths).toContainEqual('/page/child/without/parents');
     });
     });
 
 
     test('can retrieve descendants of /page1', async() => {
     test('can retrieve descendants of /page1', async() => {
@@ -370,7 +351,7 @@ describe('Page', () => {
       expect(result.length).toEqual(1);
       expect(result.length).toEqual(1);
       // assert paths
       // assert paths
       const pagePaths = result.map((page) => { return page.path });
       const pagePaths = result.map((page) => { return page.path });
-      expect(pagePaths).toContainEqual('/page/for/extended');
+      expect(pagePaths).toContainEqual('/page/child/without/parents');
     });
     });
 
 
     test('can retrieve only descendants of /page1', async() => {
     test('can retrieve only descendants of /page1', async() => {
@@ -398,7 +379,7 @@ describe('Page', () => {
       expect(result.length).toEqual(4);
       expect(result.length).toEqual(4);
       // assert paths
       // assert paths
       const pagePaths = result.map((page) => { return page.path });
       const pagePaths = result.map((page) => { return page.path });
-      expect(pagePaths).toContainEqual('/page/for/extended');
+      expect(pagePaths).toContainEqual('/page/child/without/parents');
       expect(pagePaths).toContainEqual('/page1');
       expect(pagePaths).toContainEqual('/page1');
       expect(pagePaths).toContainEqual('/page1/child1');
       expect(pagePaths).toContainEqual('/page1/child1');
       expect(pagePaths).toContainEqual('/page2');
       expect(pagePaths).toContainEqual('/page2');