From 7e84b356a2aed96b5482de0a34d2b516f52c4e90 Mon Sep 17 00:00:00 2001 From: Vyrtsev Mikhail Date: Sat, 20 Apr 2019 20:45:23 +0300 Subject: [PATCH] fix tests --- web/app/store/thread/reducers.test.ts | 10 ++++++---- web/app/testUtils/index.ts | 20 ++++++++++++++++++++ web/jest.config.js | 2 +- web/setup-jest-env.js | 1 - 4 files changed, 27 insertions(+), 6 deletions(-) delete mode 100644 web/setup-jest-env.js diff --git a/web/app/store/thread/reducers.test.ts b/web/app/store/thread/reducers.test.ts index b26e0926..d15530be 100644 --- a/web/app/store/thread/reducers.test.ts +++ b/web/app/store/thread/reducers.test.ts @@ -4,10 +4,10 @@ import { setCollapse } from './actions'; import { THREAD_SET_COLLAPSE } from './types'; describe('collapsedThreads', () => { - const comment = { id: 'some-id' } as Comment; - it('should set collapsed to true', () => { - const state = { collapsedThreads: {} }; + const comment = { id: 'some-id' } as Comment; + const node = { comment, replies: [] }; + const state = { collapsedThreads: {}, comments: [node] }; const dispatch = jest.fn(); const getState = jest.fn(() => state) as any; @@ -20,9 +20,11 @@ describe('collapsedThreads', () => { }); it('should collapse toggled', () => { + const comment = { id: 'some-id' } as Comment; + const node = { comment, replies: [] }; const dispatch = jest.fn(); const getState = jest.fn(); - getState.mockReturnValue({ collapsedThreads: { 'some-id': true } }); + getState.mockReturnValue({ collapsedThreads: { 'some-id': true }, comments: [node] }); setCollapse(comment.id)(dispatch, getState, undefined); expect(dispatch).toBeCalledWith({ diff --git a/web/app/testUtils/index.ts b/web/app/testUtils/index.ts index 5c9b588b..8f373dd0 100644 --- a/web/app/testUtils/index.ts +++ b/web/app/testUtils/index.ts @@ -1,3 +1,23 @@ +import { StaticStore } from '@app/common/static_store'; + +require('document-register-element/pony')(window); + +beforeEach(() => { + StaticStore.config = { + admin_email: 'admin@remark42.com', + admins: ['admin'], + auth_providers: ['dev', 'google'], + critical_score: -15, + low_score: -5, + edit_duration: 300, + max_comment_size: 3000, + max_image_size: 5000, + positive_score: false, + readonly_age: 100, + version: 'jest-test', + }; +}); + export function createDomContainer(setup: (domContainer: HTMLElement) => void): void { let domContainer: HTMLElement | null = null; beforeAll(() => { diff --git a/web/jest.config.js b/web/jest.config.js index 07cc975f..bb847d95 100644 --- a/web/jest.config.js +++ b/web/jest.config.js @@ -11,5 +11,5 @@ module.exports = { '\\.scss$': '/app/testUtils/mockStyles.js', '@app/(.*)': '/app/$1', }, - setupFilesAfterEnv: ['/setup-jest-env.js'], + setupFilesAfterEnv: ['/app/testUtils/index.ts'], }; diff --git a/web/setup-jest-env.js b/web/setup-jest-env.js deleted file mode 100644 index be67c9a2..00000000 --- a/web/setup-jest-env.js +++ /dev/null @@ -1 +0,0 @@ -require('document-register-element/pony')(window);