Merge branch 'master' into fetch-mock

2021-02-24 18:29:37 +00:00
parent b184bb5b7b ec62b1a572
commit a2ecfa65d0
13 changed files with 116 additions and 186 deletions
@@ -17,12 +17,18 @@ module.exports = {
  },
  setupFiles: ['<rootDir>/jest.setup.ts'],
  setupFilesAfterEnv: [
-    'jest-localstorage-mock',
    '<rootDir>/app/__mocks__/fetch.ts',
+    '<rootDir>/app/__mocks__/localstorage.ts',
    '<rootDir>/app/__stubs__/remark-config.ts',
    '<rootDir>/app/__stubs__/static-config.ts',
  ],
-  collectCoverageFrom: ['app/**/*.{ts,tsx}', '!**/__mocks__/**', '!**/__stubs__/**', '!app/locales/**'],
+  collectCoverageFrom: [
+    'app/**/*.{ts,tsx}',
+    '!**/__mocks__/**',
+    '!**/__stubs__/**',
+    '!app/locales/**',
+    '!app/utils/loadLocale.ts',
+  ],
  globals: {
    'ts-jest': {
      babelConfig: true,