From b6fd1b7bcfa61720bca077e3cb4511a2e42af73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 16 Oct 2023 15:11:33 +0200 Subject: [PATCH] migrating elasticsearch_settings.test.jsx to typescript (#24947) * migrating elasticsearch_settings.test.jsx to typescript * Fixing CI --- ...nap => elasticsearch_settings.test.tsx.snap} | 0 ...test.jsx => elasticsearch_settings.test.tsx} | 17 ++++++++++------- 2 files changed, 10 insertions(+), 7 deletions(-) rename webapp/channels/src/components/admin_console/__snapshots__/{elasticsearch_settings.test.jsx.snap => elasticsearch_settings.test.tsx.snap} (100%) rename webapp/channels/src/components/admin_console/{elasticsearch_settings.test.jsx => elasticsearch_settings.test.tsx} (85%) diff --git a/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.jsx.snap b/webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap similarity index 100% rename from webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.jsx.snap rename to webapp/channels/src/components/admin_console/__snapshots__/elasticsearch_settings.test.tsx.snap diff --git a/webapp/channels/src/components/admin_console/elasticsearch_settings.test.jsx b/webapp/channels/src/components/admin_console/elasticsearch_settings.test.tsx similarity index 85% rename from webapp/channels/src/components/admin_console/elasticsearch_settings.test.jsx rename to webapp/channels/src/components/admin_console/elasticsearch_settings.test.tsx index 8f4903ae5c..0471423c65 100644 --- a/webapp/channels/src/components/admin_console/elasticsearch_settings.test.jsx +++ b/webapp/channels/src/components/admin_console/elasticsearch_settings.test.tsx @@ -4,13 +4,15 @@ import {shallow} from 'enzyme'; import React from 'react'; +import type {AdminConfig} from '@mattermost/types/config'; + import ElasticSearchSettings from 'components/admin_console/elasticsearch_settings'; import SaveButton from 'components/save_button'; jest.mock('actions/admin_actions.jsx', () => { return { elasticsearchPurgeIndexes: jest.fn(), - elasticsearchTest: (config, success) => success(), + elasticsearchTest: (config: AdminConfig, success: () => void) => success(), }; }); @@ -33,7 +35,7 @@ describe('components/ElasticSearchSettings', () => { }; const wrapper = shallow( , ); expect(wrapper).toMatchSnapshot(); @@ -57,7 +59,7 @@ describe('components/ElasticSearchSettings', () => { }; const wrapper = shallow( , ); expect(wrapper).toMatchSnapshot(); @@ -76,19 +78,20 @@ describe('components/ElasticSearchSettings', () => { EnableAutocomplete: false, }, }; - const wrapper = shallow( + const wrapper = shallow( , ); expect(wrapper.find(SaveButton).prop('disabled')).toBe(true); wrapper.instance().handleSettingChanged('enableIndexing', true); expect(wrapper.find(SaveButton).prop('disabled')).toBe(true); const instance = wrapper.instance(); - instance.doSubmit = jest.fn(); const success = jest.fn(); - instance.doTestConfig(success); + const error = jest.fn(); + instance.doTestConfig(success, error); expect(success).toBeCalled(); + expect(error).not.toBeCalled(); expect(wrapper.find(SaveButton).prop('disabled')).toBe(false); }); });