Yuki Takei 4 лет назад
Родитель
Сommit
4beaf31e3e
1 измененных файлов с 7 добавлено и 12 удалено
  1. 7 12
      packages/app/src/test/service/config-manager.test.js

+ 7 - 12
packages/app/src/test/service/config-manager.test.js

@@ -1,53 +1,48 @@
+import ConfigModel from '~/server/models/config';
+
 const { getInstance } = require('../setup-crowi');
 
 describe('ConfigManager test', () => {
   let crowi;
   let configManager;
 
-  beforeEach(async(done) => {
+  beforeEach(async() => {
     process.env.CONFIG_PUBSUB_SERVER_TYPE = 'nchan';
 
     crowi = await getInstance();
     configManager = crowi.configManager;
-    done();
   });
 
 
   describe('updateConfigsInTheSameNamespace()', () => {
 
-    const configModelMock = {};
-
     beforeEach(async(done) => {
       configManager.s2sMessagingService = {};
-
-      // prepare mocks for updateConfigsInTheSameNamespace method
-      configManager.configModel = configModelMock;
-
       done();
     });
 
     test('invoke publishUpdateMessage()', async() => {
-      configModelMock.bulkWrite = jest.fn();
+      ConfigModel.bulkWrite = jest.fn();
       configManager.loadConfigs = jest.fn();
       configManager.publishUpdateMessage = jest.fn();
 
       const dummyConfig = { dummyKey: 'dummyValue' };
       await configManager.updateConfigsInTheSameNamespace('dummyNs', dummyConfig);
 
-      expect(configModelMock.bulkWrite).toHaveBeenCalledTimes(1);
+      expect(ConfigModel.bulkWrite).toHaveBeenCalledTimes(1);
       expect(configManager.loadConfigs).toHaveBeenCalledTimes(1);
       expect(configManager.publishUpdateMessage).toHaveBeenCalledTimes(1);
     });
 
     test('does not invoke publishUpdateMessage()', async() => {
-      configModelMock.bulkWrite = jest.fn();
+      ConfigModel.bulkWrite = jest.fn();
       configManager.loadConfigs = jest.fn();
       configManager.publishUpdateMessage = jest.fn();
 
       const dummyConfig = { dummyKey: 'dummyValue' };
       await configManager.updateConfigsInTheSameNamespace('dummyNs', dummyConfig, true);
 
-      expect(configModelMock.bulkWrite).toHaveBeenCalledTimes(1);
+      expect(ConfigModel.bulkWrite).toHaveBeenCalledTimes(1);
       expect(configManager.loadConfigs).toHaveBeenCalledTimes(1);
       expect(configManager.publishUpdateMessage).not.toHaveBeenCalled();
     });