From 656424788b39fdae71dd5bcebeff4c0b55204d4c Mon Sep 17 00:00:00 2001 From: jfrerich Date: Tue, 16 Jul 2019 12:27:51 -0500 Subject: [PATCH] =?UTF-8?q?[MM-16534]=20if=20user=20has=20bots,=20but=20th?= =?UTF-8?q?e=20bots=20are=20disabled,=20don't=20s=E2=80=A6=20(#3135)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bots will be disabled --- .../system_users_dropdown.test.js.snap | 34 ++++++++++++++++++- .../system_users_dropdown.jsx | 2 +- .../system_users_dropdown.test.js | 29 +++++++++++++--- 3 files changed, 59 insertions(+), 6 deletions(-) diff --git a/components/admin_console/system_users/system_users_dropdown/__snapshots__/system_users_dropdown.test.js.snap b/components/admin_console/system_users/system_users_dropdown/__snapshots__/system_users_dropdown.test.js.snap index 452ccf988d3e..75df65aecccd 100644 --- a/components/admin_console/system_users/system_users_dropdown/__snapshots__/system_users_dropdown.test.js.snap +++ b/components/admin_console/system_users/system_users_dropdown/__snapshots__/system_users_dropdown.test.js.snap @@ -32,7 +32,39 @@ exports[`components/admin_console/system_users/system_users_dropdown/system_user `; -exports[`components/admin_console/system_users/system_users_dropdown/system_users_dropdown.jsx renderDeactivateMemberModal should render the bot accounts warning in case the user do has any bot accounts 1`] = ` +exports[`components/admin_console/system_users/system_users_dropdown/system_users_dropdown.jsx renderDeactivateMemberModal should not render the bot accounts warning. owner_id has no enabled bot accounts 1`] = ` +
+ + + +
+
+ +
+
+`; + +exports[`components/admin_console/system_users/system_users_dropdown/system_users_dropdown.jsx renderDeactivateMemberModal should render the bot accounts warning. owner_id has enabled bot accounts 1`] = `
{ + test('renderDeactivateMemberModal should render the bot accounts warning. owner_id has enabled bot accounts', async () => { const overrideProps = { config: { ServiceSettings: { @@ -153,12 +153,33 @@ describe('components/admin_console/system_users/system_users_dropdown/system_use }, }, bots: { - 1: {owner_id: '1'}, - 2: {owner_id: '1'}, - 3: {owner_id: 'user_id'}, + 1: {owner_id: '1', delete_at: 0}, + 2: {owner_id: '1', delete_at: 0}, + 3: {owner_id: 'user_id', delete_at: 0}, + }, + }; + const wrapper = shallow(); + wrapper.setState({showDeactivateMemberModal: true}); + + const modal = wrapper.wrap(wrapper.instance().renderDeactivateMemberModal()); + expect(modal.prop('message')).toMatchSnapshot(); + }); + + test('renderDeactivateMemberModal should not render the bot accounts warning. owner_id has no enabled bot accounts', async () => { + const overrideProps = { + config: { + ServiceSettings: { + DisableBotsWhenOwnerIsDeactivated: true, + }, + }, + bots: { + 1: {owner_id: '1', delete_at: 0}, + 2: {owner_id: '1', delete_at: 0}, + 3: {owner_id: 'user_id', delete_at: 1234}, }, }; const wrapper = shallow(); + wrapper.setState({showDeactivateMemberModal: true}); const modal = wrapper.wrap(wrapper.instance().renderDeactivateMemberModal()); expect(modal.prop('message')).toMatchSnapshot();