From 66663d13bc4634c5620f2a2d6e860ed4d4aaa437 Mon Sep 17 00:00:00 2001 From: Muxing Lin <61750044+ivalkshfoeif@users.noreply.github.com> Date: Thu, 22 Jun 2023 14:36:40 -0700 Subject: [PATCH] [MM-23412] : Migrate "components/integrations/installed_outgoing_webhook.test.jsx" to Typescript (#23768) --- ... installed_outgoing_webhook.test.tsx.snap} | 9 +-- ...sx => installed_outgoing_webhook.test.tsx} | 62 +++++++++++-------- webapp/channels/src/utils/test_helper.ts | 24 ++++++- 3 files changed, 62 insertions(+), 33 deletions(-) rename webapp/channels/src/components/integrations/__snapshots__/{installed_outgoing_webhook.test.jsx.snap => installed_outgoing_webhook.test.tsx.snap} (95%) rename webapp/channels/src/components/integrations/{installed_outgoing_webhook.test.jsx => installed_outgoing_webhook.test.tsx} (64%) diff --git a/webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.jsx.snap b/webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.tsx.snap similarity index 95% rename from webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.jsx.snap rename to webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.tsx.snap index 70f505133e..fca0a9e4a6 100644 --- a/webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.jsx.snap +++ b/webapp/channels/src/components/integrations/__snapshots__/installed_outgoing_webhook.test.tsx.snap @@ -4,12 +4,7 @@ exports[`components/integrations/InstalledOutgoingWebhook Should match snapshot exports[`components/integrations/InstalledOutgoingWebhook Should match snapshot of makeDisplayName 2`] = `"channel display name"`; -exports[`components/integrations/InstalledOutgoingWebhook Should match snapshot of makeDisplayName 3`] = ` - -`; +exports[`components/integrations/InstalledOutgoingWebhook Should match snapshot of makeDisplayName 3`] = `"name"`; exports[`components/integrations/InstalledOutgoingWebhook should match snapshot 1`] = `
diff --git a/webapp/channels/src/components/integrations/installed_outgoing_webhook.test.jsx b/webapp/channels/src/components/integrations/installed_outgoing_webhook.test.tsx similarity index 64% rename from webapp/channels/src/components/integrations/installed_outgoing_webhook.test.jsx rename to webapp/channels/src/components/integrations/installed_outgoing_webhook.test.tsx index 15fef863cc..98e8cdadc8 100644 --- a/webapp/channels/src/components/integrations/installed_outgoing_webhook.test.jsx +++ b/webapp/channels/src/components/integrations/installed_outgoing_webhook.test.tsx @@ -5,20 +5,30 @@ import React from 'react'; import {shallow} from 'enzyme'; import {Link} from 'react-router-dom'; +import {OutgoingWebhook} from '@mattermost/types/integrations'; +import {Team} from '@mattermost/types/teams'; +import {UserProfile} from '@mattermost/types/users'; +import {Channel} from '@mattermost/types/channels'; + import DeleteIntegrationLink from 'components/integrations/delete_integration_link'; import InstalledOutgoingWebhook, {matchesFilter} from 'components/integrations/installed_outgoing_webhook'; +import {TestHelper} from 'utils/test_helper'; describe('components/integrations/InstalledOutgoingWebhook', () => { - const team = { + const team: Team = TestHelper.getTeamMock({ id: 'testteamid', name: 'test', - }; - const channel = { + }); + + const channel: Channel = TestHelper.getChannelMock({ id: '1jiw9kphbjrntfyrm7xpdcya4o', name: 'town-square', display_name: 'Town Square', - }; - const outgoingWebhook = { + }); + + const userProfile: UserProfile = TestHelper.getUserMock(); + + const outgoingWebhook: OutgoingWebhook = TestHelper.getOutgoingWebhookMock({ callback_urls: ['http://adsfdasd.com'], channel_id: 'mdpzfpfcxi85zkkqkzkch4b85h', content_type: 'application/x-www-form-urlencoded', @@ -32,16 +42,17 @@ describe('components/integrations/InstalledOutgoingWebhook', () => { token: 'xoxz1z7c3tgi9xhrfudn638q9r', trigger_when: 0, trigger_words: ['build'], - 0: 'asdf', update_at: 1508329149618, - }; + username: 'hook_user_name', + + }); const baseProps = { outgoingWebhook, onRegenToken: () => {}, //eslint-disable-line no-empty-function onDelete: () => {}, //eslint-disable-line no-empty-function filter: '', - creator: {username: 'username'}, + creator: userProfile, canChange: true, team, channel, @@ -83,7 +94,7 @@ describe('components/integrations/InstalledOutgoingWebhook', () => { }); test('Should not display description as it is null', () => { - const newOutgoingWebhook = {...outgoingWebhook, description: null}; + const newOutgoingWebhook = TestHelper.getOutgoingWebhookMock({...outgoingWebhook, description: undefined}); const props = {...baseProps, outgoingWebhook: newOutgoingWebhook}; const wrapper = shallow( , @@ -145,32 +156,33 @@ describe('components/integrations/InstalledOutgoingWebhook', () => { , ); + const instance = wrapper.instance() as InstalledOutgoingWebhook; + // displays webhook's display name - expect(wrapper.instance().makeDisplayName({display_name: 'hook display name'}, {})).toMatchSnapshot(); + expect(instance.makeDisplayName(TestHelper.getOutgoingWebhookMock({display_name: 'hook display name'}), TestHelper.getChannelMock())).toMatchSnapshot(); // displays channel's display name - expect(wrapper.instance().makeDisplayName({}, {display_name: 'channel display name'})).toMatchSnapshot(); + expect(instance.makeDisplayName(TestHelper.getOutgoingWebhookMock(), TestHelper.getChannelMock({display_name: 'channel display name'}))).toMatchSnapshot(); // displays a private hook - expect(wrapper.instance().makeDisplayName({})).toMatchSnapshot(); + expect(instance.makeDisplayName(TestHelper.getOutgoingWebhookMock(), TestHelper.getChannelMock())).toMatchSnapshot(); }); test('Should match result when matchesFilter is called', () => { - expect(matchesFilter({}, {}, 'word')).toEqual(false); - expect(matchesFilter({display_name: null}, {}, 'word')).toEqual(false); - expect(matchesFilter({description: null}, {}, 'word')).toEqual(false); - expect(matchesFilter({trigger_words: null}, {}, 'word')).toEqual(false); - expect(matchesFilter({}, {name: null}, 'channel')).toEqual(false); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock(), TestHelper.getChannelMock(), 'word')).toEqual(false); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock({display_name: undefined}), TestHelper.getChannelMock(), 'word')).toEqual(false); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock({description: undefined}), TestHelper.getChannelMock(), 'word')).toEqual(false); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock({trigger_words: undefined}), TestHelper.getChannelMock(), 'word')).toEqual(false); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock(), TestHelper.getChannelMock({name: undefined}), 'channel')).toEqual(false); - expect(matchesFilter({}, {}, '')).toEqual(true); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock(), TestHelper.getChannelMock(), '')).toEqual(true); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock({display_name: 'Word'}), TestHelper.getChannelMock(), 'word')).toEqual(true); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock({display_name: 'word'}), TestHelper.getChannelMock(), 'word')).toEqual(true); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock({description: 'Trigger description'}), TestHelper.getChannelMock(), 'description')).toEqual(true); - expect(matchesFilter({display_name: 'Word'}, {}, 'word')).toEqual(true); - expect(matchesFilter({display_name: 'word'}, {}, 'word')).toEqual(true); - expect(matchesFilter({description: 'Trigger description'}, {}, 'description')).toEqual(true); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock({trigger_words: ['Trigger']}), TestHelper.getChannelMock(), 'trigger')).toEqual(true); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock({trigger_words: ['word', 'Trigger']}), TestHelper.getChannelMock(), 'trigger')).toEqual(true); - expect(matchesFilter({trigger_words: ['Trigger']}, {}, 'trigger')).toEqual(true); - expect(matchesFilter({trigger_words: ['word', 'Trigger']}, {}, 'trigger')).toEqual(true); - - expect(matchesFilter({}, {name: 'channel_name'}, 'channel')).toEqual(true); + expect(matchesFilter(TestHelper.getOutgoingWebhookMock(), TestHelper.getChannelMock({name: 'channel_name'}), 'channel')).toEqual(true); }); }); diff --git a/webapp/channels/src/utils/test_helper.ts b/webapp/channels/src/utils/test_helper.ts index 5d48cb4a1e..045db99cc8 100644 --- a/webapp/channels/src/utils/test_helper.ts +++ b/webapp/channels/src/utils/test_helper.ts @@ -10,7 +10,7 @@ import {Group} from '@mattermost/types/groups'; import {FileInfo} from '@mattermost/types/files'; import {Post} from '@mattermost/types/posts'; import {CategorySorting, ChannelCategory} from '@mattermost/types/channel_categories'; -import {Command, IncomingWebhook} from '@mattermost/types/integrations'; +import {Command, IncomingWebhook, OutgoingWebhook} from '@mattermost/types/integrations'; import {CategoryTypes} from 'mattermost-redux/constants/channel_categories'; import {SystemEmoji, CustomEmoji} from '@mattermost/types/emojis'; import {Session} from '@mattermost/types/sessions'; @@ -269,6 +269,28 @@ export class TestHelper { return Object.assign({}, defaultIncomingWebhook, override); } + public static getOutgoingWebhookMock(override: Partial = {}): OutgoingWebhook { + const defaultOutgoingWebhook: OutgoingWebhook = { + id: 'id', + token: 'hook_token', + create_at: 0, + update_at: 0, + delete_at: 0, + creator_id: 'creator_id', + channel_id: '', + team_id: '', + trigger_words: [], + trigger_when: 0, + callback_urls: [], + display_name: '', + description: '', + content_type: '', + username: '', + icon_url: '', + }; + return Object.assign({}, defaultOutgoingWebhook, override); + } + public static getPostMock(override: Partial = {}): Post { const defaultPost: Post = { edit_at: 0,