Просмотр исходного кода

ensure to clear mocks in default

Yuki Takei 6 лет назад
Родитель
Сommit
50bbb7fe61
2 измененных файлов с 2 добавлено и 7 удалено
  1. 2 5
      config/jest.config.js
  2. 0 2
      src/test/service/acl.test.js

+ 2 - 5
config/jest.config.js

@@ -7,11 +7,6 @@ module.exports = {
 
   rootDir: '../',
 
-  // Automatically clear mock calls and instances between every test
-  clearMocks: true,
-  // Automatically reset mock state between every test
-  resetMocks: true,
-
   projects: [
     {
       displayName: 'server',
@@ -19,6 +14,8 @@ module.exports = {
       rootDir: '.',
       setupFilesAfterEnv: ['<rootDir>/src/test/setup.js'],
       testMatch: ['<rootDir>/src/test/**/*.test.js'],
+      // Automatically clear mock calls and instances between every test
+      clearMocks: true,
       // A map from regular expressions to module names that allow to stub out resources with a single module
       moduleNameMapper: {
         '@root/(.+)': '<rootDir>/$1',

+ 0 - 2
src/test/service/acl.test.js

@@ -3,7 +3,6 @@ import each from 'jest-each';
 const { getInstance } = require('../setup-crowi');
 
 describe('AclService test', () => {
-  // eslint-disable-next-line no-unused-vars
   let crowi;
 
   const initialEnv = process.env;
@@ -135,7 +134,6 @@ describe('AclService test', () => {
     beforeEach(async(done) => {
       // prepare spy for ConfigManager.getConfig
       getConfigSpy = jest.spyOn(crowi.configManager, 'getConfig');
-      getConfigSpy.mockClear();
       done();
     });