+ This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
+
`;
exports[`components/admin_console/data_retention_settings/team_list should match snapshot with paging 1`] = `
-
-
+
+
+
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, without results 1`] = `
-
+
+
+
+
+
+
+
+
+
+ Name
+
+
+
+
+
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, with results and previous 1`] = `
-
+
- ,
- "remove":
+
+
-
+
+
+
+ DN
+
+
+
-
+
+
+
+
+
- ,
- "remove":
+
+
-
+
+
+
+ DN
+
+
+
-
+
+
+
+
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, with results and next and previous 1`] = `
-
+
- ,
- "remove":
+
+
-
+
+
+
+ DN
+
+
+
-
+
+
+
+
+
- ,
- "remove":
+
+
-
+
+
+
+ DN
+
+
+
-
+
+
+
+ {
teams={testTeams}
totalCount={testTeams.length}
actions={actions}
- />);
- expect(wrapper).toMatchSnapshot();
+ />,
+ );
+ expect(container).toMatchSnapshot();
});
test('should match snapshot with paging', () => {
@@ -52,7 +53,7 @@ describe('components/admin_console/data_retention_settings/team_list', () => {
setTeamListSearch: jest.fn(),
setTeamListFilters: jest.fn(),
};
- const wrapper = shallow(
+ const {container} = renderWithContext(
{
teams={testTeams}
totalCount={testTeams.length}
actions={actions}
- />);
- wrapper.setState({loading: false});
- expect(wrapper).toMatchSnapshot();
+ />,
+ );
+
+ // With 30 teams and page size 10, should show first 10 and pagination
+ expect(screen.getByText('DN0')).toBeInTheDocument();
+ expect(screen.getByText('DN9')).toBeInTheDocument();
+ expect(screen.getByText((content) => content.includes('1') && content.includes('10') && content.includes('30'))).toBeInTheDocument();
+ expect(container).toMatchSnapshot();
});
});
diff --git a/webapp/channels/src/components/admin_console/group_settings/__snapshots__/group_row.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/__snapshots__/group_row.test.tsx.snap
index 0d9413cae38..28af0a03bcf 100644
--- a/webapp/channels/src/components/admin_console/group_settings/__snapshots__/group_row.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/group_settings/__snapshots__/group_row.test.tsx.snap
@@ -1,314 +1,341 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`components/admin_console/group_settings/GroupRow should match snapshot, on checked row 1`] = `
-
`;
exports[`components/admin_console/group_settings/GroupRow should match snapshot, on failed linked row 1`] = `
-
+
- ,
- "remove":
+
+
-
+
+
+
+ DN
+
+
+
-
+
+
+
+
`;
diff --git a/webapp/channels/src/components/admin_console/data_retention_settings/team_list/team_list.test.tsx b/webapp/channels/src/components/admin_console/data_retention_settings/team_list/team_list.test.tsx
index 2a6d4774c17..44714af45fc 100644
--- a/webapp/channels/src/components/admin_console/data_retention_settings/team_list/team_list.test.tsx
+++ b/webapp/channels/src/components/admin_console/data_retention_settings/team_list/team_list.test.tsx
@@ -1,13 +1,13 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
import type {Team} from '@mattermost/types/teams';
import TeamList from 'components/admin_console/data_retention_settings/team_list/team_list';
+import {renderWithContext, screen} from 'tests/react_testing_utils';
import {TestHelper} from 'utils/test_helper';
describe('components/admin_console/data_retention_settings/team_list', () => {
@@ -23,7 +23,7 @@ describe('components/admin_console/data_retention_settings/team_list', () => {
setTeamListSearch: jest.fn(),
setTeamListFilters: jest.fn(),
};
- const wrapper = shallow(
+ const {container} = renderWithContext(
+
- ,
- "remove":
+
+
-
+
+
+
+ DN
+
+
+
-
+
+
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
`;
exports[`components/admin_console/group_settings/GroupRow should match snapshot, on failed not linked row 1`] = `
-
+
`;
exports[`components/admin_console/group_settings/GroupRow should match snapshot, on linked and configured row 1`] = `
-
+
`;
exports[`components/admin_console/group_settings/GroupRow should match snapshot, on linked but not configured row 1`] = `
-
+
`;
exports[`components/admin_console/group_settings/GroupRow should match snapshot, on not linked row 1`] = `
-
+
diff --git a/webapp/channels/src/components/admin_console/group_settings/__snapshots__/group_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/__snapshots__/group_settings.test.tsx.snap
index a71b22af6cb..91406916824 100644
--- a/webapp/channels/src/components/admin_console/group_settings/__snapshots__/group_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/group_settings/__snapshots__/group_settings.test.tsx.snap
@@ -1,64 +1,133 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`components/admin_console/group_settings/GroupSettings should match snapshot 1`] = `
-
-
-
+
AD/LDAP configuration page.",
- "id": "admin.group_settings.ldapGroupsDescription",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "AD/LDAP Groups",
- "id": "admin.group_settings.ldapGroupsTitle",
- }
- }
- >
-
-
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, with results and next 1`] = `
-
+ Groups
+
+
+
-
+
+
+
+
+ + AD/LDAP Groups +
+
+ Connect AD/LDAP and create groups in Mattermost. To get started, configure group attributes on the
+
+ AD/LDAP
+
+ configuration page.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
`;
exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChannels should match snapshot, with teams, with channels and loading 1`] = `
-
-
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_profile_and_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_profile_and_settings.test.tsx.snap
index a9a68b086a7..d9f8969fcae 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_profile_and_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_profile_and_settings.test.tsx.snap
@@ -1,115 +1,266 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`components/admin_console/group_settings/group_details/GroupProfileAndSettings should match snapshot, with toggle off 1`] = `
-
-
-
+
+
+
+ + Group Profile +
+
+ The name for this group.
+
+
-
+ +
+ + +
+
+
+
+
+
+
-
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+ When enabled, this group can be mentioned in other channels and teams. This may result in the group member list being visible to all users.
+
+
+
+
+
+ + Group Profile +
+
+ The name for this group.
+
+
-
+ +
+ + +
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+ When enabled, this group can be mentioned in other channels and teams. This may result in the group member list being visible to all users.
+
+
+
+
+
-
+
+
+
+
+
-
+
+
+
+
+
+ Channel 4
+
+
+
+ Channel
+
+
+
+
+
+
+
+
+
+ Team 2
+
+
+
+ Team (Private)
+
+
+
+
+
+
+
+
+
+ Team 3
+
+
+
+ Team (Private)
+
+
+
+
+
+
+
+
+
+ Team 9
+
+
+
+ Team
+
+
+
+
+
+
+
+
+
+
+ Channel 5
+
+
+
+ Channel (Private)
+
+
+
+
+
+
+
+
+
+
+ Channel 6
+
+
+
+ Channel (Private)
+
+
+
+
+
+
+
+
- |
+ Name
+ |
+
+ Type
+ |
+
+ Assigned Roles
+ |
+
-
- |
+ | |
|---|---|---|---|---|---|
| + + + Team 1 + + + | + Team + | ++ | + + | +||
| - |
+
`;
exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChannels should match snapshot, without teams, without channels and loaded 1`] = `
-
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, with results 1`] = `
-
-
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChannels should match snapshot, without teams, without channels and loading 1`] = `
-
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, with only not-linked selected 1`] = `
-
-
+ No teams or channels specified yet
+
+
`;
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels_row.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels_row.test.tsx.snap
index a7958243864..2a7d0d36b25 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels_row.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_teams_and_channels_row.test.tsx.snap
@@ -1,481 +1,312 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChannelsRow should match snapshot, for private-channel 1`] = `
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
- Test private-team
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
- Test public-team
-
-
-
-
-
-
-
-
+
-
-
-
-
-
- Test team with children
-
-
-
-
-
-
-
-
+
-
-
-
-
-
- Test team with children
-
-
-
-
-
-
-
-
+((
+ renderWithContext(
(
+ renderWithContext(
+
+ {ui}
+
+
,
+ );
+ };
+
for (const type of [
'public-team',
'private-team',
@@ -14,7 +25,7 @@ describe('components/admin_console/group_settings/group_details/GroupTeamsAndCha
'private-channel',
]) {
test('should match snapshot, for ' + type, () => {
- const wrapper = shallow(
+ const {container} = renderInTable(
(
+ renderInTable(
(
+ renderWithContext(
(
- (
- {
}}
/>,
);
- expect(wrapper).toMatchSnapshot();
+ expect(container).toMatchSnapshot();
});
test('should match snapshot, on linked but not configured row', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
{
}}
/>,
);
- expect(wrapper).toMatchSnapshot();
+ expect(container).toMatchSnapshot();
});
test('should match snapshot, on not linked row', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
{
}}
/>,
);
- expect(wrapper).toMatchSnapshot();
+ expect(container).toMatchSnapshot();
});
test('should match snapshot, on checked row', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
{
}}
/>,
);
- expect(wrapper).toMatchSnapshot();
+ expect(container).toMatchSnapshot();
});
test('should match snapshot, on failed linked row', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
{
}}
/>,
);
- expect(wrapper).toMatchSnapshot();
+ expect(container).toMatchSnapshot();
});
test('should match snapshot, on failed not linked row', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
{
}}
/>,
);
- expect(wrapper).toMatchSnapshot();
+ expect(container).toMatchSnapshot();
});
- test('onRowClick call to onCheckToggle', () => {
+ test('onRowClick call to onCheckToggle', async () => {
const onCheckToggle = jest.fn();
- const wrapper = shallow(
+ renderWithContext(
{
/>,
);
- wrapper.find('.group').prop('onClick')?.({} as unknown as React.MouseEvent);
+ await userEvent.click(document.getElementById('name_group')!);
expect(onCheckToggle).toHaveBeenCalledWith('primary_key');
});
test('linkHandler must run the link action', async () => {
const link = jest.fn().mockReturnValue(Promise.resolve());
- const wrapper = shallow(
+ renderWithContext(
{
/>,
);
- await wrapper.find('a').prop('onClick')?.({stopPropagation: jest.fn(), preventDefault: jest.fn()} as unknown as React.MouseEvent);
- expect(wrapper.find(LoadingSpinner).exists()).toBe(false);
- expect(link).toHaveBeenCalledWith('primary_key');
+ await userEvent.click(screen.getByText('Not Linked'));
+ await waitFor(() => {
+ expect(link).toHaveBeenCalledWith('primary_key');
+ });
+ expect(screen.queryByText('Linking')).not.toBeInTheDocument();
});
test('unlinkHandler must run the unlink action', async () => {
const unlink = jest.fn().mockReturnValue(Promise.resolve());
- const wrapper = shallow(
+ renderWithContext(
{
/>,
);
- await wrapper.find('a').prop('onClick')?.({stopPropagation: jest.fn(), preventDefault: jest.fn()} as unknown as React.MouseEvent);
- expect(wrapper.find(LoadingSpinner).exists()).toBe(false);
- expect(unlink).toHaveBeenCalledWith('primary_key');
+ await userEvent.click(screen.getByText('Linked'));
+ await waitFor(() => {
+ expect(unlink).toHaveBeenCalledWith('primary_key');
+ });
+ expect(screen.queryByText('Unlinking')).not.toBeInTheDocument();
});
});
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_settings.test.tsx b/webapp/channels/src/components/admin_console/group_settings/group_settings.test.tsx
index 14f8d2b34b7..e17fd224c10 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_settings.test.tsx
+++ b/webapp/channels/src/components/admin_console/group_settings/group_settings.test.tsx
@@ -1,16 +1,17 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
import GroupSettings from 'components/admin_console/group_settings/group_settings';
+import {renderWithContext} from 'tests/react_testing_utils';
+
describe('components/admin_console/group_settings/GroupSettings', () => {
test('should match snapshot', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, with only linked selected 1`] = `
-
-
+
+
+
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChannelsRow should match snapshot, for private-team 1`] = `
-| + + + + Test private-channel + + | ++ Channel (Private) + | ++ | + + | +
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChannelsRow should match snapshot, for public-channel 1`] = `
-| + + + Test private-team + + | ++ Team (Private) + | ++ | + + | +
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChannelsRow should match snapshot, for public-team 1`] = `
-| + + + + Test public-channel + + | ++ Channel + | ++ | + + | +
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChannelsRow should match snapshot, when has children 1`] = `
-| + + + Test public-team + + | ++ Team + | ++ | + + | +
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupTeamsAndChannelsRow should match snapshot, when has children and is collapsed 1`] = `
-| + + + Test team with children + + | ++ Team + | ++ | + + | +
+
+
+
+
`;
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users.test.tsx.snap
index 460cff89caa..5a8d98f9470 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users.test.tsx.snap
@@ -1,1622 +1,6016 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`components/admin_console/group_settings/group_details/GroupUsers should match snapshot, loaded with data 1`] = `
-| + + + Test team with children + + | ++ Team + | ++ | + + | +
+
`;
exports[`components/admin_console/group_settings/group_details/GroupUsers should match snapshot, loaded with multiple pages 1`] = `
-
-
-
-
+ AD/LDAP Connector is configured to sync and manage this group and its users.
+
+ Click here to view
+
-
-
-
-
+
+
+
+
+ 
+
+
+
+
+
+ @username0
+
+ -
+
+ Name0 Surname0
+
+
+
+
+ Email:
+
+
+ test0@test.com
+
+
+
+ 
+
+
+
+
+
+ @username1
+
+ -
+
+ Name1 Surname1
+
+
+
+
+ Email:
+
+
+ test1@test.com
+
+
+
+ 
+
+
+
+
+
+ @username2
+
+ -
+
+ Name2 Surname2
+
+
+
+
+ Email:
+
+
+ test2@test.com
+
+
+
+ 
+
+
+
+
+
+ @username3
+
+ -
+
+ Name3 Surname3
+
+
+
+
+ Email:
+
+
+ test3@test.com
+
+
+
+ 
+
+
+
+
+
+ @username4
+
+ -
+
+ Name4 Surname4
+
+
+
+
+ Email:
+
+
+ test4@test.com
+
+
+
+ 
+
+
+
+
+
+ @username5
+
+ -
+
+ Name5 Surname5
+
+
+
+
+ Email:
+
+
+ test5@test.com
+
+
+
+ 
+
+
+
+
+
+ @username6
+
+ -
+
+ Name6 Surname6
+
+
+
+
+ Email:
+
+
+ test6@test.com
+
+
+
+ 
+
+
+
+
+
+ @username7
+
+ -
+
+ Name7 Surname7
+
+
+
+
+ Email:
+
+
+ test7@test.com
+
+
+
+ 
+
+
+
+
+
+ @username8
+
+ -
+
+ Name8 Surname8
+
+
+
+
+ Email:
+
+
+ test8@test.com
+
+
+
+ 
+
+
+
+
+
+ @username9
+
+ -
+
+ Name9 Surname9
+
+
+
+
+ Email:
+
+
+ test9@test.com
+
+
+
+ 
+
+
+
+
+
+ @username10
+
+ -
+
+ Name10 Surname10
+
+
+
+
+ Email:
+
+
+ test10@test.com
+
+
+
+ 
+
+
+
+
+
+ @username11
+
+ -
+
+ Name11 Surname11
+
+
+
+
+ Email:
+
+
+ test11@test.com
+
+
+
+ 
+
+
+
+
+
+ @username12
+
+ -
+
+ Name12 Surname12
+
+
+
+
+ Email:
+
+
+ test12@test.com
+
+
+
+ 
+
+
+
+
+
+ @username13
+
+ -
+
+ Name13 Surname13
+
+
+
+
+ Email:
+
+
+ test13@test.com
+
+
+
+ 
+
+
+
+
+
+ @username14
+
+ -
+
+ Name14 Surname14
+
+
+
+
+ Email:
+
+
+ test14@test.com
+
+
+
+ 
+
+
+
+
+
+ @username15
+
+ -
+
+ Name15 Surname15
+
+
+
+
+ Email:
+
+
+ test15@test.com
+
+
+
+ 
+
+
+
+
+
+ @username16
+
+ -
+
+ Name16 Surname16
+
+
+
+
+ Email:
+
+
+ test16@test.com
+
+
+
+ 
+
+
+
+
+
+ @username17
+
+ -
+
+ Name17 Surname17
+
+
+
+
+ Email:
+
+
+ test17@test.com
+
+
+
+ 
+
+
+
+
+
+ @username18
+
+ -
+
+ Name18 Surname18
+
+
+
+
+ Email:
+
+
+ test18@test.com
+
+
+
+ 
+
+
+
+
+ @username19
+
+ -
+
+ Name19 Surname19
+
+
+
+
+ Email:
+
+
+ test19@test.com
+
+
+
+ 1 - 20 of 20
+
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupUsers should match snapshot, loaded with multiple pages 2`] = `
-
-
-
-
+ AD/LDAP Connector is configured to sync and manage this group and its users.
+
+ Click here to view
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ @username0
+
+ -
+
+ Name0 Surname0
+
+
+
+
+ Email:
+
+
+ test0@test.com
+
+
+
+
+
+
+
+
+
+ @username1
+
+ -
+
+ Name1 Surname1
+
+
+
+
+ Email:
+
+
+ test1@test.com
+
+
+
+
+
+
+
+
+
+ @username2
+
+ -
+
+ Name2 Surname2
+
+
+
+
+ Email:
+
+
+ test2@test.com
+
+
+
+
+
+
+
+
+
+ @username3
+
+ -
+
+ Name3 Surname3
+
+
+
+
+ Email:
+
+
+ test3@test.com
+
+
+
+
+
+
+
+
+
+ @username4
+
+ -
+
+ Name4 Surname4
+
+
+
+
+ Email:
+
+
+ test4@test.com
+
+
+
+
+
+
+
+
+
+ @username5
+
+ -
+
+ Name5 Surname5
+
+
+
+
+ Email:
+
+
+ test5@test.com
+
+
+
+
+
+
+
+
+
+ @username6
+
+ -
+
+ Name6 Surname6
+
+
+
+
+ Email:
+
+
+ test6@test.com
+
+
+
+
+
+
+
+
+
+ @username7
+
+ -
+
+ Name7 Surname7
+
+
+
+
+ Email:
+
+
+ test7@test.com
+
+
+
+
+
+
+
+
+
+ @username8
+
+ -
+
+ Name8 Surname8
+
+
+
+
+ Email:
+
+
+ test8@test.com
+
+
+
+
+
+
+
+
+
+ @username9
+
+ -
+
+ Name9 Surname9
+
+
+
+
+ Email:
+
+
+ test9@test.com
+
+
+
+
+
+
+
+
+
+ @username10
+
+ -
+
+ Name10 Surname10
+
+
+
+
+ Email:
+
+
+ test10@test.com
+
+
+
+
+
+
+
+
+
+ @username11
+
+ -
+
+ Name11 Surname11
+
+
+
+
+ Email:
+
+
+ test11@test.com
+
+
+
+
+
+
+
+
+
+ @username12
+
+ -
+
+ Name12 Surname12
+
+
+
+
+ Email:
+
+
+ test12@test.com
+
+
+
+
+
+
+
+
+
+ @username13
+
+ -
+
+ Name13 Surname13
+
+
+
+
+ Email:
+
+
+ test13@test.com
+
+
+
+
+
+
+
+
+
+ @username14
+
+ -
+
+ Name14 Surname14
+
+
+
+
+ Email:
+
+
+ test14@test.com
+
+
+
+
+
+
+
+
+
+ @username15
+
+ -
+
+ Name15 Surname15
+
+
+
+
+ Email:
+
+
+ test15@test.com
+
+
+
+
+
+
+
+
+
+ @username16
+
+ -
+
+ Name16 Surname16
+
+
+
+
+ Email:
+
+
+ test16@test.com
+
+
+
+
+
+
+
+
+
+ @username17
+
+ -
+
+ Name17 Surname17
+
+
+
+
+ Email:
+
+
+ test17@test.com
+
+
+
+
+
+
+
+
+
+ @username18
+
+ -
+
+ Name18 Surname18
+
+
+
+
+ Email:
+
+
+ test18@test.com
+
+
+
+
+
+
+
+
+ @username19
+
+ -
+
+ Name19 Surname19
+
+
+
+
+ Email:
+
+
+ test19@test.com
+
+
+
+ 1 - 20 of 55
+
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupUsers should match snapshot, loaded with multiple pages 3`] = `
-
-
-
-
+ AD/LDAP Connector is configured to sync and manage this group and its users.
+
+ Click here to view
+
-
-
-
-
+
+
+
+
+ 
+
+
+
+
+
+ @username20
+
+ -
+
+ Name20 Surname20
+
+
+
+
+ Email:
+
+
+ test20@test.com
+
+
+
+ 
+
+
+
+
+
+ @username21
+
+ -
+
+ Name21 Surname21
+
+
+
+
+ Email:
+
+
+ test21@test.com
+
+
+
+ 
+
+
+
+
+
+ @username22
+
+ -
+
+ Name22 Surname22
+
+
+
+
+ Email:
+
+
+ test22@test.com
+
+
+
+ 
+
+
+
+
+
+ @username23
+
+ -
+
+ Name23 Surname23
+
+
+
+
+ Email:
+
+
+ test23@test.com
+
+
+
+ 
+
+
+
+
+
+ @username24
+
+ -
+
+ Name24 Surname24
+
+
+
+
+ Email:
+
+
+ test24@test.com
+
+
+
+ 
+
+
+
+
+
+ @username25
+
+ -
+
+ Name25 Surname25
+
+
+
+
+ Email:
+
+
+ test25@test.com
+
+
+
+ 
+
+
+
+
+
+ @username26
+
+ -
+
+ Name26 Surname26
+
+
+
+
+ Email:
+
+
+ test26@test.com
+
+
+
+ 
+
+
+
+
+
+ @username27
+
+ -
+
+ Name27 Surname27
+
+
+
+
+ Email:
+
+
+ test27@test.com
+
+
+
+ 
+
+
+
+
+
+ @username28
+
+ -
+
+ Name28 Surname28
+
+
+
+
+ Email:
+
+
+ test28@test.com
+
+
+
+ 
+
+
+
+
+
+ @username29
+
+ -
+
+ Name29 Surname29
+
+
+
+
+ Email:
+
+
+ test29@test.com
+
+
+
+ 
+
+
+
+
+
+ @username30
+
+ -
+
+ Name30 Surname30
+
+
+
+
+ Email:
+
+
+ test30@test.com
+
+
+
+ 
+
+
+
+
+
+ @username31
+
+ -
+
+ Name31 Surname31
+
+
+
+
+ Email:
+
+
+ test31@test.com
+
+
+
+ 
+
+
+
+
+
+ @username32
+
+ -
+
+ Name32 Surname32
+
+
+
+
+ Email:
+
+
+ test32@test.com
+
+
+
+ 
+
+
+
+
+
+ @username33
+
+ -
+
+ Name33 Surname33
+
+
+
+
+ Email:
+
+
+ test33@test.com
+
+
+
+ 
+
+
+
+
+
+ @username34
+
+ -
+
+ Name34 Surname34
+
+
+
+
+ Email:
+
+
+ test34@test.com
+
+
+
+ 
+
+
+
+
+
+ @username35
+
+ -
+
+ Name35 Surname35
+
+
+
+
+ Email:
+
+
+ test35@test.com
+
+
+
+ 
+
+
+
+
+
+ @username36
+
+ -
+
+ Name36 Surname36
+
+
+
+
+ Email:
+
+
+ test36@test.com
+
+
+
+ 
+
+
+
+
+
+ @username37
+
+ -
+
+ Name37 Surname37
+
+
+
+
+ Email:
+
+
+ test37@test.com
+
+
+
+ 
+
+
+
+
+
+ @username38
+
+ -
+
+ Name38 Surname38
+
+
+
+
+ Email:
+
+
+ test38@test.com
+
+
+
+ 
+
+
+
+
+ @username39
+
+ -
+
+ Name39 Surname39
+
+
+
+
+ Email:
+
+
+ test39@test.com
+
+
+
+ 21 - 40 of 55
+
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupUsers should match snapshot, loaded with one page 1`] = `
-
-
-
-
+ AD/LDAP Connector is configured to sync and manage this group and its users.
+
+ Click here to view
+
-
-
-
-
+
+
+
+
+ 
+
+
+
+
+
+ @username40
+
+ -
+
+ Name40 Surname40
+
+
+
+
+ Email:
+
+
+ test40@test.com
+
+
+
+ 
+
+
+
+
+
+ @username41
+
+ -
+
+ Name41 Surname41
+
+
+
+
+ Email:
+
+
+ test41@test.com
+
+
+
+ 
+
+
+
+
+
+ @username42
+
+ -
+
+ Name42 Surname42
+
+
+
+
+ Email:
+
+
+ test42@test.com
+
+
+
+ 
+
+
+
+
+
+ @username43
+
+ -
+
+ Name43 Surname43
+
+
+
+
+ Email:
+
+
+ test43@test.com
+
+
+
+ 
+
+
+
+
+
+ @username44
+
+ -
+
+ Name44 Surname44
+
+
+
+
+ Email:
+
+
+ test44@test.com
+
+
+
+ 
+
+
+
+
+
+ @username45
+
+ -
+
+ Name45 Surname45
+
+
+
+
+ Email:
+
+
+ test45@test.com
+
+
+
+ 
+
+
+
+
+
+ @username46
+
+ -
+
+ Name46 Surname46
+
+
+
+
+ Email:
+
+
+ test46@test.com
+
+
+
+ 
+
+
+
+
+
+ @username47
+
+ -
+
+ Name47 Surname47
+
+
+
+
+ Email:
+
+
+ test47@test.com
+
+
+
+ 
+
+
+
+
+
+ @username48
+
+ -
+
+ Name48 Surname48
+
+
+
+
+ Email:
+
+
+ test48@test.com
+
+
+
+ 
+
+
+
+
+
+ @username49
+
+ -
+
+ Name49 Surname49
+
+
+
+
+ Email:
+
+
+ test49@test.com
+
+
+
+ 
+
+
+
+
+
+ @username50
+
+ -
+
+ Name50 Surname50
+
+
+
+
+ Email:
+
+
+ test50@test.com
+
+
+
+ 
+
+
+
+
+
+ @username51
+
+ -
+
+ Name51 Surname51
+
+
+
+
+ Email:
+
+
+ test51@test.com
+
+
+
+ 
+
+
+
+
+
+ @username52
+
+ -
+
+ Name52 Surname52
+
+
+
+
+ Email:
+
+
+ test52@test.com
+
+
+
+ 
+
+
+
+
+
+ @username53
+
+ -
+
+ Name53 Surname53
+
+
+
+
+ Email:
+
+
+ test53@test.com
+
+
+
+ 
+
+
+
+
+ @username54
+
+ -
+
+ Name54 Surname54
+
+
+
+
+ Email:
+
+
+ test54@test.com
+
+
+
+ 41 - 55 of 55
+
+
+
+
+
`;
exports[`components/admin_console/group_settings/group_details/GroupUsers should match snapshot, loaded without data 1`] = `
-
-
-
-
+ AD/LDAP Connector is configured to sync and manage this group and its users.
+
+ Click here to view
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ @username0
+
+ -
+
+ Name0 Surname0
+
+
+
+
+ Email:
+
+
+ test0@test.com
+
+
+
+
+
+
+
+
+
+ @username1
+
+ -
+
+ Name1 Surname1
+
+
+
+
+ Email:
+
+
+ test1@test.com
+
+
+
+
+
+
+
+
+
+ @username2
+
+ -
+
+ Name2 Surname2
+
+
+
+
+ Email:
+
+
+ test2@test.com
+
+
+
+
+
+
+
+
+
+ @username3
+
+ -
+
+ Name3 Surname3
+
+
+
+
+ Email:
+
+
+ test3@test.com
+
+
+
+
+
+
+
+
+
+ @username4
+
+ -
+
+ Name4 Surname4
+
+
+
+
+ Email:
+
+
+ test4@test.com
+
+
+
+
+
+
+
+
+
+ @username5
+
+ -
+
+ Name5 Surname5
+
+
+
+
+ Email:
+
+
+ test5@test.com
+
+
+
+
+
+
+
+
+
+ @username6
+
+ -
+
+ Name6 Surname6
+
+
+
+
+ Email:
+
+
+ test6@test.com
+
+
+
+
+
+
+
+
+
+ @username7
+
+ -
+
+ Name7 Surname7
+
+
+
+
+ Email:
+
+
+ test7@test.com
+
+
+
+
+
+
+
+
+
+ @username8
+
+ -
+
+ Name8 Surname8
+
+
+
+
+ Email:
+
+
+ test8@test.com
+
+
+
+
+
+
+
+
+
+ @username9
+
+ -
+
+ Name9 Surname9
+
+
+
+
+ Email:
+
+
+ test9@test.com
+
+
+
+
+
+
+
+
+
+ @username10
+
+ -
+
+ Name10 Surname10
+
+
+
+
+ Email:
+
+
+ test10@test.com
+
+
+
+
+
+
+
+
+
+ @username11
+
+ -
+
+ Name11 Surname11
+
+
+
+
+ Email:
+
+
+ test11@test.com
+
+
+
+
+
+
+
+
+
+ @username12
+
+ -
+
+ Name12 Surname12
+
+
+
+
+ Email:
+
+
+ test12@test.com
+
+
+
+
+
+
+
+
+
+ @username13
+
+ -
+
+ Name13 Surname13
+
+
+
+
+ Email:
+
+
+ test13@test.com
+
+
+
+
+
+
+
+
+
+ @username14
+
+ -
+
+ Name14 Surname14
+
+
+
+
+ Email:
+
+
+ test14@test.com
+
+
+
+
+
+
+
+
+
+ @username15
+
+ -
+
+ Name15 Surname15
+
+
+
+
+ Email:
+
+
+ test15@test.com
+
+
+
+
+
+
+
+
+
+ @username16
+
+ -
+
+ Name16 Surname16
+
+
+
+
+ Email:
+
+
+ test16@test.com
+
+
+
+
+
+
+
+
+
+ @username17
+
+ -
+
+ Name17 Surname17
+
+
+
+
+ Email:
+
+
+ test17@test.com
+
+
+
+
+
+
+
+
+
+ @username18
+
+ -
+
+ Name18 Surname18
+
+
+
+
+ Email:
+
+
+ test18@test.com
+
+
+
+
+
+
+
+
+ @username19
+
+ -
+
+ Name19 Surname19
+
+
+
+
+ Email:
+
+
+ test19@test.com
+
+
+
+ 1 - 20 of 20
+
+
+
+
+
-
`;
exports[`components/admin_console/group_settings/group_details/GroupUsers should match snapshot, on loading with data 1`] = `
-
-
+ AD/LDAP Connector is configured to sync and manage this group and its users.
+
+ Click here to view
+
+
+
+
+
+
+
+
+ No users found
+
+
-
-
-
-
-
-
-
+
`;
exports[`components/admin_console/group_settings/group_details/GroupUsers should match snapshot, on loading without data 1`] = `
-
-
-
-
+ AD/LDAP Connector is configured to sync and manage this group and its users.
+
+ Click here to view
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ @username0
+
+ -
+
+ Name0 Surname0
+
+
+
+
+ Email:
+
+
+ test0@test.com
+
+
+
+
+
+
+
+
+
+ @username1
+
+ -
+
+ Name1 Surname1
+
+
+
+
+ Email:
+
+
+ test1@test.com
+
+
+
+
+
+
+
+
+
+ @username2
+
+ -
+
+ Name2 Surname2
+
+
+
+
+ Email:
+
+
+ test2@test.com
+
+
+
+
+
+
+
+
+
+ @username3
+
+ -
+
+ Name3 Surname3
+
+
+
+
+ Email:
+
+
+ test3@test.com
+
+
+
+
+
+
+
+
+
+ @username4
+
+ -
+
+ Name4 Surname4
+
+
+
+
+ Email:
+
+
+ test4@test.com
+
+
+
+
+
+
+
+
+
+ @username5
+
+ -
+
+ Name5 Surname5
+
+
+
+
+ Email:
+
+
+ test5@test.com
+
+
+
+
+
+
+
+
+
+ @username6
+
+ -
+
+ Name6 Surname6
+
+
+
+
+ Email:
+
+
+ test6@test.com
+
+
+
+
+
+
+
+
+
+ @username7
+
+ -
+
+ Name7 Surname7
+
+
+
+
+ Email:
+
+
+ test7@test.com
+
+
+
+
+
+
+
+
+
+ @username8
+
+ -
+
+ Name8 Surname8
+
+
+
+
+ Email:
+
+
+ test8@test.com
+
+
+
+
+
+
+
+
+
+ @username9
+
+ -
+
+ Name9 Surname9
+
+
+
+
+ Email:
+
+
+ test9@test.com
+
+
+
+
+
+
+
+
+
+ @username10
+
+ -
+
+ Name10 Surname10
+
+
+
+
+ Email:
+
+
+ test10@test.com
+
+
+
+
+
+
+
+
+
+ @username11
+
+ -
+
+ Name11 Surname11
+
+
+
+
+ Email:
+
+
+ test11@test.com
+
+
+
+
+
+
+
+
+
+ @username12
+
+ -
+
+ Name12 Surname12
+
+
+
+
+ Email:
+
+
+ test12@test.com
+
+
+
+
+
+
+
+
+
+ @username13
+
+ -
+
+ Name13 Surname13
+
+
+
+
+ Email:
+
+
+ test13@test.com
+
+
+
+
+
+
+
+
+
+ @username14
+
+ -
+
+ Name14 Surname14
+
+
+
+
+ Email:
+
+
+ test14@test.com
+
+
+
+
+
+
+
+
+
+ @username15
+
+ -
+
+ Name15 Surname15
+
+
+
+
+ Email:
+
+
+ test15@test.com
+
+
+
+
+
+
+
+
+
+ @username16
+
+ -
+
+ Name16 Surname16
+
+
+
+
+ Email:
+
+
+ test16@test.com
+
+
+
+
+
+
+
+
+
+ @username17
+
+ -
+
+ Name17 Surname17
+
+
+
+
+ Email:
+
+
+ test17@test.com
+
+
+
+
+
+
+
+
+
+ @username18
+
+ -
+
+ Name18 Surname18
+
+
+
+
+ Email:
+
+
+ test18@test.com
+
+
+
+
+
+
+
+
+ @username19
+
+ -
+
+ Name19 Surname19
+
+
+
+
+ Email:
+
+
+ test19@test.com
+
+
+
+ 1 - 20 of 20
+
+
+
+
+
-
`;
exports[`components/admin_console/group_settings/group_details/GroupUsers should match snapshot, plugin group 1`] = `
-
-
+ AD/LDAP Connector is configured to sync and manage this group and its users.
+
+ Click here to view
+
+
+
+
+
+
+
+
+ No users found
+
+
-
-
-
-
-
-
-
+
`;
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users_row.test.tsx.snap b/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users_row.test.tsx.snap
deleted file mode 100644
index 96f543f019e..00000000000
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/__snapshots__/group_users_row.test.tsx.snap
+++ /dev/null
@@ -1,47 +0,0 @@
-// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
-
-exports[`components/admin_console/group_settings/group_details/GroupUsersRow should match snapshot 1`] = `
-
-
-
-
+ This group is managed by a plugin.
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+ @username0
+
+ -
+
+ Name0 Surname0
+
+
+
+
+ Email:
+
+
+ test0@test.com
+
+
+
+
+
+
+
+
+
+ @username1
+
+ -
+
+ Name1 Surname1
+
+
+
+
+ Email:
+
+
+ test1@test.com
+
+
+
+
+
+
+
+
+
+ @username2
+
+ -
+
+ Name2 Surname2
+
+
+
+
+ Email:
+
+
+ test2@test.com
+
+
+
+
+
+
+
+
+
+ @username3
+
+ -
+
+ Name3 Surname3
+
+
+
+
+ Email:
+
+
+ test3@test.com
+
+
+
+
+
+
+
+
+
+ @username4
+
+ -
+
+ Name4 Surname4
+
+
+
+
+ Email:
+
+
+ test4@test.com
+
+
+
+
+
+
+
+
+
+ @username5
+
+ -
+
+ Name5 Surname5
+
+
+
+
+ Email:
+
+
+ test5@test.com
+
+
+
+
+
+
+
+
+
+ @username6
+
+ -
+
+ Name6 Surname6
+
+
+
+
+ Email:
+
+
+ test6@test.com
+
+
+
+
+
+
+
+
+
+ @username7
+
+ -
+
+ Name7 Surname7
+
+
+
+
+ Email:
+
+
+ test7@test.com
+
+
+
+
+
+
+
+
+
+ @username8
+
+ -
+
+ Name8 Surname8
+
+
+
+
+ Email:
+
+
+ test8@test.com
+
+
+
+
+
+
+
+
+
+ @username9
+
+ -
+
+ Name9 Surname9
+
+
+
+
+ Email:
+
+
+ test9@test.com
+
+
+
+
+
+
+
+
+
+ @username10
+
+ -
+
+ Name10 Surname10
+
+
+
+
+ Email:
+
+
+ test10@test.com
+
+
+
+
+
+
+
+
+
+ @username11
+
+ -
+
+ Name11 Surname11
+
+
+
+
+ Email:
+
+
+ test11@test.com
+
+
+
+
+
+
+
+
+
+ @username12
+
+ -
+
+ Name12 Surname12
+
+
+
+
+ Email:
+
+
+ test12@test.com
+
+
+
+
+
+
+
+
+
+ @username13
+
+ -
+
+ Name13 Surname13
+
+
+
+
+ Email:
+
+
+ test13@test.com
+
+
+
+
+
+
+
+
+
+ @username14
+
+ -
+
+ Name14 Surname14
+
+
+
+
+ Email:
+
+
+ test14@test.com
+
+
+
+
+
+
+
+
+
+ @username15
+
+ -
+
+ Name15 Surname15
+
+
+
+
+ Email:
+
+
+ test15@test.com
+
+
+
+
+
+
+
+
+
+ @username16
+
+ -
+
+ Name16 Surname16
+
+
+
+
+ Email:
+
+
+ test16@test.com
+
+
+
+
+
+
+
+
+
+ @username17
+
+ -
+
+ Name17 Surname17
+
+
+
+
+ Email:
+
+
+ test17@test.com
+
+
+
+
+
+
+
+
+
+ @username18
+
+ -
+
+ Name18 Surname18
+
+
+
+
+ Email:
+
+
+ test18@test.com
+
+
+
+
+
+
+
+
+ @username19
+
+ -
+
+ Name19 Surname19
+
+
+
+
+ Email:
+
+
+ test19@test.com
+
+
+
+ 1 - 20 of 20
+
+
+
+
-
-`;
diff --git a/webapp/channels/src/components/admin_console/group_settings/group_details/group_profile.test.tsx b/webapp/channels/src/components/admin_console/group_settings/group_details/group_profile.test.tsx
index d0f1cab495c..77b98ee8f01 100644
--- a/webapp/channels/src/components/admin_console/group_settings/group_details/group_profile.test.tsx
+++ b/webapp/channels/src/components/admin_console/group_settings/group_details/group_profile.test.tsx
@@ -1,22 +1,28 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
import GroupProfile from 'components/admin_console/group_settings/group_details/group_profile';
+import {renderWithContext, screen} from 'tests/react_testing_utils';
+
describe('components/admin_console/group_settings/group_details/GroupProfile', () => {
test('should match snapshot', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
-
-
-
- @test
-
- -
-
- Test display name
-
-
-
-
-
-
+
-
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, with filters open 1`] = `
-
-
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
-
-
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, with mixed types selected 1`] = `
-
-
-
-
-
+
+
+
+
+
+
+ Is Linked
+
+
+
+
+
+ Is Not Linked
+
+
+
+
+
+ Is Configured
+
+
+
+
+
+ Is Not Configured
+
+
+
+ Search
+
+
+
+
-
+
+ No groups found
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+ class="group-list-link-unlink"
+ >
+
+
-
+
-
+ Name
+
+
+
+ Mattermost Linking
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ test1
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+
+
+ test2
+
+
+
+
+
+ Linked
+
+
+
+
+ Configure
+
+
+
+
+ 1 - 2 of 2
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+ class="group-list-link-unlink"
+ >
+
+
-
+
-
+ Name
+
+
+
+ Mattermost Linking
+
+
+
-
-
-
+
+
+
+
+
+
+
+ test1
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+
+
+ test2
+
+
+
+
+
+ Linked
+
+
+
+
+ Configure
+
+
+
+
+ 1 - 2 of 2
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+ class="group-list-link-unlink"
+ >
+
+
-
+
-
+ Name
+
+
+
+ Mattermost Linking
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ test1
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+ test2
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Configure
+
+
+
+
+ 1 - 2 of 2
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+ class="group-list-link-unlink"
+ >
+
+
-
-
-
-
-
+ Name
+
+
+
+ Mattermost Linking
+
+
+
+
+
+
+
+
+
+ test2
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Configure
+
+
+
+
+
+
+
+
+
+
+ test3
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Edit
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+ class="group-list-link-unlink"
+ >
+
+
-
-
-
-
-
+ Name
+
+
+
+ Mattermost Linking
+
+
+
+
+
+
+
+
+
+ test2
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Configure
+
+
+
+
+
+
+
+
+
+
+ test3
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Edit
+
+
+
+
+
+
+
+
+
+
+ test4
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test5
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test6
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test7
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test8
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test9
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test10
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+ class="group-list-link-unlink"
+ >
+
+
-
-
-
-
-
+ Name
+
+
+
+ Mattermost Linking
+
+
+
+
+
+
+
+
+
+ test2
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Configure
+
+
+
+
+
+
+
+
+
+
+ test3
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Edit
+
+
+
+
+
+
+
+
+
+
+ test4
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test5
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test6
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test7
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test8
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test9
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test10
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
+ class="group-list-link-unlink"
+ >
+
+
-
-
-
-
-
+ Name
+
+
+
+ Mattermost Linking
+
+
+
+
+
+
+
+
+
+ test2
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Configure
+
+
+
+
+
+
+
+
+
+
+ test3
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Edit
+
+
+
+
+
-
-
`;
exports[`components/admin_console/group_settings/GroupsList.tsx should match snapshot, without selection 1`] = `
-
-
-
-
+
+
+
+
-
+ No groups found
+
+
-
`;
diff --git a/webapp/channels/src/components/admin_console/group_settings/groups_list/groups_list.test.tsx b/webapp/channels/src/components/admin_console/group_settings/groups_list/groups_list.test.tsx
index 2993eccbbce..089bd492160 100644
--- a/webapp/channels/src/components/admin_console/group_settings/groups_list/groups_list.test.tsx
+++ b/webapp/channels/src/components/admin_console/group_settings/groups_list/groups_list.test.tsx
@@ -1,30 +1,50 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
+import {fireEvent, waitFor} from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
import React from 'react';
import GroupsList from 'components/admin_console/group_settings/groups_list/groups_list';
+import {renderWithContext, screen} from 'tests/react_testing_utils';
+
+// Helper to open the filter dropdown without it immediately closing.
+// The component registers a document 'click' listener (with {once: true}) to close the dropdown,
+// which fires on the same event that opens it. We temporarily suppress that listener.
+function openFilters() {
+ const originalAddEventListener = document.addEventListener.bind(document);
+ const spy = jest.spyOn(document, 'addEventListener').mockImplementation((...args: Parameters) => {
+ if (args[0] === 'click') {
+ // Suppress the one-time close listener
+ return;
+ }
+ originalAddEventListener(...args);
+ });
+ const caretDown = document.querySelector('i.fa-caret-down')!;
+ fireEvent.click(caretDown);
+ spy.mockRestore();
+}
+
describe('components/admin_console/group_settings/GroupsList.tsx', () => {
test('should match snapshot, while loading', () => {
- const wrapper = shallow(
+ // getLdapGroups never resolves, so component stays in loading state
+ const {container} = renderWithContext(
{})),
link: jest.fn(),
unlink: jest.fn(),
}}
/>,
);
- wrapper.setState({loading: true});
- expect(wrapper).toMatchSnapshot();
+ expect(container).toMatchSnapshot();
});
- test('should match snapshot, with only linked selected', () => {
- const wrapper = shallow(
+ test('should match snapshot, with only linked selected', async () => {
+ const {container} = renderWithContext(
{
}}
/>,
);
- wrapper.setState({checked: {test2: true}});
- expect(wrapper).toMatchSnapshot();
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
+
+ // Click on test2 (linked group) to select it
+ await userEvent.click(screen.getByText('test2'));
+
+ expect(container).toMatchSnapshot();
});
- test('should match snapshot, with only not-linked selected', () => {
- const wrapper = shallow(
+ test('should match snapshot, with only not-linked selected', async () => {
+ const {container} = renderWithContext(
{
}}
/>,
);
- wrapper.setState({checked: {test1: true}});
- expect(wrapper).toMatchSnapshot();
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
+
+ // Click on test1 (not-linked group) to select it
+ await userEvent.click(screen.getByText('test1'));
+
+ expect(container).toMatchSnapshot();
});
- test('should match snapshot, with mixed types selected', () => {
- const wrapper = shallow(
+ test('should match snapshot, with mixed types selected', async () => {
+ const {container} = renderWithContext(
{
}}
/>,
);
- wrapper.setState({checked: {test1: true, test2: true}});
- expect(wrapper).toMatchSnapshot();
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
+
+ // Click both groups to select them
+ await userEvent.click(screen.getByText('test1'));
+ await userEvent.click(screen.getByText('test2'));
+
+ expect(container).toMatchSnapshot();
});
- test('should match snapshot, without selection', () => {
- const wrapper = shallow(
+ test('should match snapshot, without selection', async () => {
+ const {container} = renderWithContext(
{
}}
/>,
);
- wrapper.setState({checked: {}});
- expect(wrapper).toMatchSnapshot();
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
+
+ expect(container).toMatchSnapshot();
});
- test('onCheckToggle must toggle the checked data', () => {
- const wrapper = shallow(
+ test('onCheckToggle must toggle the checked data', async () => {
+ renderWithContext(
{
}}
/>,
);
- const instance = wrapper.instance();
- expect(wrapper.state().checked).toEqual({});
- instance.onCheckToggle('test1');
- expect(wrapper.state().checked).toEqual({test1: true});
- instance.onCheckToggle('test1');
- expect(wrapper.state().checked).toEqual({test1: false});
- instance.onCheckToggle('test2');
- expect(wrapper.state().checked).toEqual({test1: false, test2: true});
- instance.onCheckToggle('test2');
- expect(wrapper.state().checked).toEqual({test1: false, test2: false});
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
+
+ const test1Group = screen.getByText('test1').closest('.group')!;
+ const test2Group = screen.getByText('test2').closest('.group')!;
+
+ // Initially neither is checked
+ expect(test1Group).not.toHaveClass('checked');
+ expect(test2Group).not.toHaveClass('checked');
+
+ // Toggle test1 on
+ await userEvent.click(screen.getByText('test1'));
+ expect(test1Group).toHaveClass('checked');
+
+ // Toggle test1 off
+ await userEvent.click(screen.getByText('test1'));
+ expect(test1Group).not.toHaveClass('checked');
+
+ // Toggle test2 on
+ await userEvent.click(screen.getByText('test2'));
+ expect(test2Group).toHaveClass('checked');
+
+ // Toggle test2 off
+ await userEvent.click(screen.getByText('test2'));
+ expect(test2Group).not.toHaveClass('checked');
});
- test('linkSelectedGroups must call link for unlinked selected groups', () => {
+ test('linkSelectedGroups must call link for unlinked selected groups', async () => {
const link = jest.fn();
- const wrapper = shallow(
+ renderWithContext(
{
}}
/>,
);
- const instance = wrapper.instance();
- expect(wrapper.state().checked).toEqual({});
- instance.onCheckToggle('test1');
- instance.onCheckToggle('test2');
- instance.linkSelectedGroups();
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
+
+ // Select both groups
+ await userEvent.click(screen.getByText('test1'));
+ await userEvent.click(screen.getByText('test2'));
+
+ // When mixed types are selected with an unlinked group, the button should be "Link Selected Groups"
+ await userEvent.click(screen.getByText('Link Selected Groups'));
+
+ // Only test1 (unlinked) should be linked
expect(link).toHaveBeenCalledTimes(1);
expect(link).toHaveBeenCalledWith('test1');
});
- test('unlinkSelectedGroups must call unlink for linked selected groups', () => {
+ test('unlinkSelectedGroups must call unlink for linked selected groups', async () => {
const unlink = jest.fn();
- const wrapper = shallow(
+ renderWithContext(
{
}}
/>,
);
- const instance = wrapper.instance();
- expect(wrapper.state().checked).toEqual({});
- instance.onCheckToggle('test1');
- instance.onCheckToggle('test2');
- instance.unlinkSelectedGroups();
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
+
+ // Select test2 (linked) only - this will show "Unlink Selected Groups"
+ await userEvent.click(screen.getByText('test2'));
+
+ // Now only test2 (linked) is selected, button should say "Unlink Selected Groups"
+ await userEvent.click(screen.getByText('Unlink Selected Groups'));
+
expect(unlink).toHaveBeenCalledTimes(1);
expect(unlink).toHaveBeenCalledWith('test2');
});
- test('should match snapshot, without results', () => {
- const wrapper = shallow(
+ test('should match snapshot, without results', async () => {
+ const {container} = renderWithContext(
{
}}
/>,
);
- wrapper.setState({loading: false});
- expect(wrapper).toMatchSnapshot();
+ await waitFor(() => {
+ expect(screen.getByText('No groups found')).toBeInTheDocument();
+ });
+ expect(container).toMatchSnapshot();
});
- test('should match snapshot, with results', () => {
- const wrapper = shallow(
+ test('should match snapshot, with results', async () => {
+ const {container} = renderWithContext(
{
}}
/>,
);
- wrapper.setState({loading: false});
- expect(wrapper).toMatchSnapshot();
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
+ expect(container).toMatchSnapshot();
});
- test('should match snapshot, with results and next and previous', () => {
- const wrapper = shallow(
+ test('should match snapshot, with results and next and previous', async () => {
+ const getLdapGroups = jest.fn().mockReturnValue(Promise.resolve());
+ const groups = [
+ {primary_key: 'test1', name: 'test1'},
+ {primary_key: 'test2', name: 'test2', mattermost_group_id: 'group-id-1', has_syncables: false},
+ {primary_key: 'test3', name: 'test3', mattermost_group_id: 'group-id-2', has_syncables: true},
+ {primary_key: 'test4', name: 'test4'},
+ {primary_key: 'test5', name: 'test5'},
+ {primary_key: 'test6', name: 'test6'},
+ {primary_key: 'test7', name: 'test7'},
+ {primary_key: 'test8', name: 'test8'},
+ {primary_key: 'test9', name: 'test9'},
+ {primary_key: 'test10', name: 'test10'},
+ ];
+
+ const {container} = renderWithContext(
+ {
{primary_key: 'test9', name: 'test9'},
{primary_key: 'test10', name: 'test10'},
]}
- total={33}
+ total={401}
actions={{
- getLdapGroups: jest.fn().mockReturnValue(Promise.resolve()),
+ getLdapGroups,
link: jest.fn(),
unlink: jest.fn(),
}}
/>,
);
- wrapper.setState({page: 1, loading: false});
- expect(wrapper).toMatchSnapshot();
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
+
+ // On page 0 with total=401, next is enabled, prev is disabled
+ expect(container).toMatchSnapshot();
});
- test('should match snapshot, with results and next', () => {
- const wrapper = shallow(
- (
+ renderWithContext(
{
{primary_key: 'test9', name: 'test9'},
{primary_key: 'test10', name: 'test10'},
]}
- total={20}
+ total={401}
actions={{
getLdapGroups,
link: jest.fn(),
@@ -312,32 +417,58 @@ describe('components/admin_console/group_settings/GroupsList.tsx', () => {
}}
/>,
);
- wrapper.setState({page: 2, checked: {test1: true, test2: true}});
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
- await wrapper.instance().previousPage({preventDefault: jest.fn()});
+ const nextButton = screen.getByTitle('Next Icon').closest('button')!;
+ const prevButton = screen.getByTitle('Previous Icon').closest('button')!;
- let state = wrapper.instance().state;
- expect(state.checked).toEqual({});
- expect(state.page).toBe(1);
- expect(state.loading).toBe(false);
+ // Navigate to page 2: click next twice
+ await userEvent.click(nextButton);
+ await waitFor(() => {
+ expect(getLdapGroups).toHaveBeenCalledTimes(2);
+ });
- await wrapper.instance().previousPage({preventDefault: jest.fn()});
- state = wrapper.state();
- expect(state.checked).toEqual({});
- expect(state.page).toBe(0);
- expect(state.loading).toBe(false);
+ await userEvent.click(nextButton);
+ await waitFor(() => {
+ expect(getLdapGroups).toHaveBeenCalledTimes(3);
+ });
+
+ // Select some groups then click previous
+ await userEvent.click(screen.getByText('test1'));
+ await userEvent.click(screen.getByText('test2'));
+
+ // Click previous (page 2 -> 1)
+ await userEvent.click(prevButton);
+ await waitFor(() => {
+ expect(getLdapGroups).toHaveBeenCalledTimes(4);
+ });
+
+ // Checked state should be cleared (groups should not have checked class)
+ const test1Group = screen.getByText('test1').closest('.group')!;
+ expect(test1Group).not.toHaveClass('checked');
+
+ // Click previous again (page 1 -> 0)
+ await userEvent.click(prevButton);
+ await waitFor(() => {
+ expect(getLdapGroups).toHaveBeenCalledTimes(5);
+ });
+
+ // Previous button should now be disabled (page 0)
+ expect(prevButton).toBeDisabled();
});
test('should change properly the state and call the getLdapGroups, on previousPage when page == 0', async () => {
const getLdapGroups = jest.fn().mockReturnValue(Promise.resolve());
- const wrapper = shallow(
+ renderWithContext(
{
}}
/>,
);
- wrapper.setState({page: 0, checked: {test1: true, test2: true}});
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
- await wrapper.instance().previousPage({preventDefault: jest.fn()});
+ const prevButton = screen.getByTitle('Previous Icon').closest('button')!;
- const state = wrapper.instance().state;
- expect(state.checked).toEqual({});
- expect(state.page).toBe(0);
- expect(state.loading).toBe(false);
+ // On page 0, previous button should be disabled
+ expect(prevButton).toBeDisabled();
+
+ // Selections should not matter since we can't go back
+ const test1Group = screen.getByText('test1').closest('.group')!;
+ expect(test1Group).not.toHaveClass('checked');
});
test('should change properly the state and call the getLdapGroups, on nextPage clicked', async () => {
const getLdapGroups = jest.fn().mockReturnValue(Promise.resolve());
- const wrapper = shallow(
+ renderWithContext(
{
{primary_key: 'test9', name: 'test9'},
{primary_key: 'test10', name: 'test10'},
]}
- total={20}
+ total={401}
actions={{
getLdapGroups,
link: jest.fn(),
@@ -379,23 +514,38 @@ describe('components/admin_console/group_settings/GroupsList.tsx', () => {
}}
/>,
);
- wrapper.setState({page: 0, checked: {test1: true, test2: true}});
+ await waitFor(() => {
+ expect(screen.getByText('test1')).toBeInTheDocument();
+ });
- await wrapper.instance().nextPage({preventDefault: jest.fn()});
- let state = wrapper.state();
- expect(state.checked).toEqual({});
- expect(state.page).toBe(1);
- expect(state.loading).toBe(false);
+ const nextButton = screen.getByTitle('Next Icon').closest('button')!;
- await wrapper.instance().nextPage({preventDefault: jest.fn()});
- state = wrapper.state();
- expect(state.checked).toEqual({});
- expect(state.page).toBe(2);
- expect(state.loading).toBe(false);
+ // Select some groups
+ await userEvent.click(screen.getByText('test1'));
+ await userEvent.click(screen.getByText('test2'));
+
+ // Click next (page 0 -> 1)
+ await userEvent.click(nextButton);
+ await waitFor(() => {
+ expect(getLdapGroups).toHaveBeenCalledTimes(2);
+ });
+
+ // Checked state should be cleared
+ const test1Group = screen.getByText('test1').closest('.group')!;
+ expect(test1Group).not.toHaveClass('checked');
+
+ // Click next again (page 1 -> 2)
+ await userEvent.click(nextButton);
+ await waitFor(() => {
+ expect(getLdapGroups).toHaveBeenCalledTimes(3);
+ });
+
+ // Still not checked
+ expect(test1Group).not.toHaveClass('checked');
});
- test('should match snapshot, with filters open', () => {
- const wrapper = shallow(
+ test('should match snapshot, with filters open', async () => {
+ const {container} = renderWithContext(
{
}}
/>,
);
- wrapper.setState({showFilters: true, filterIsLinked: true, filterIsUnlinked: true});
- expect(wrapper).toMatchSnapshot();
+ await waitFor(() => {
+ expect(screen.getByText('No groups found')).toBeInTheDocument();
+ });
+
+ // Open the filter dropdown
+ openFilters();
+
+ // Verify filters are shown
+ expect(screen.getByText('Is Linked')).toBeInTheDocument();
+ expect(screen.getByText('Is Not Linked')).toBeInTheDocument();
+
+ expect(container).toMatchSnapshot();
});
- test('clicking the clear icon clears searchString', () => {
- const wrapper = shallow(
+ test('clicking the clear icon clears searchString', async () => {
+ renderWithContext(
{
}}
/>,
);
- wrapper.setState({searchString: 'foo'});
- wrapper.find('i.fa-times-circle').first().simulate('click');
- expect(wrapper.state().searchString).toEqual('');
+ await waitFor(() => {
+ expect(screen.getByText('No groups found')).toBeInTheDocument();
+ });
+
+ // Type in search input
+ const searchInput = screen.getByPlaceholderText('Search');
+ await userEvent.type(searchInput, 'foo');
+ expect(searchInput).toHaveValue('foo');
+
+ // Click the clear icon
+ await userEvent.click(document.querySelector('i.fa-times-circle')!);
+
+ expect(searchInput).toHaveValue('');
});
- test('clicking the down arrow opens the filters', () => {
- const wrapper = shallow(
+ test('clicking the down arrow opens the filters', async () => {
+ renderWithContext(
{
}}
/>,
);
- expect(wrapper.state().showFilters).toEqual(false);
- wrapper.find('i.fa-caret-down').first().simulate('click');
- expect(wrapper.state().showFilters).toEqual(true);
+ await waitFor(() => {
+ expect(screen.getByText('No groups found')).toBeInTheDocument();
+ });
+
+ // Filters should not be visible initially
+ expect(screen.queryByText('Is Linked')).not.toBeInTheDocument();
+
+ // Click the down arrow
+ openFilters();
+
+ // Filters should now be visible
+ expect(screen.getByText('Is Linked')).toBeInTheDocument();
});
- test('clicking search invokes getLdapGroups', () => {
+ test('clicking search invokes getLdapGroups', async () => {
const getLdapGroups = jest.fn().mockReturnValue(Promise.resolve());
- const wrapper = shallow(
+ renderWithContext(
{
}}
/>,
);
- wrapper.setState({showFilters: true, searchString: 'foo iS:ConfiGuReD is:notlinked'});
- expect(wrapper.state().filterIsConfigured).toEqual(false);
- expect(wrapper.state().filterIsUnlinked).toEqual(false);
+ await waitFor(() => {
+ expect(screen.getByText('No groups found')).toBeInTheDocument();
+ });
- wrapper.find('a.search-groups-btn').first().simulate('click');
+ // Open filters
+ openFilters();
+
+ // Type search string with filter keywords
+ const searchInput = screen.getByPlaceholderText('Search');
+ await userEvent.clear(searchInput);
+ await userEvent.type(searchInput, 'foo iS:ConfiGuReD is:notlinked');
+
+ // Click the Search button in the filter panel
+ await userEvent.click(screen.getByText('Search'));
+
+ // getLdapGroups should have been called: once on mount + once on search
expect(getLdapGroups).toHaveBeenCalledTimes(2);
expect(getLdapGroups).toHaveBeenCalledWith(0, 200, {q: 'foo', is_configured: true, is_linked: false});
- expect(wrapper.state().filterIsConfigured).toEqual(true);
- expect(wrapper.state().filterIsUnlinked).toEqual(true);
});
- test('checking a filter checkbox add the filter to the searchString', () => {
+ test('checking a filter checkbox add the filter to the searchString', async () => {
const getLdapGroups = jest.fn().mockReturnValue(Promise.resolve());
- const wrapper = shallow(
+ renderWithContext(
{
}}
/>,
);
- wrapper.setState({showFilters: true, searchString: 'foo'});
- wrapper.find('span.filter-check').first().simulate('click');
- expect(wrapper.state().searchString).toEqual('foo is:linked');
+ await waitFor(() => {
+ expect(screen.getByText('No groups found')).toBeInTheDocument();
+ });
+
+ // Type 'foo' in search
+ const searchInput = screen.getByPlaceholderText('Search');
+ await userEvent.type(searchInput, 'foo');
+
+ // Open filters
+ openFilters();
+
+ // Click the "Is Linked" filter checkbox
+ const isLinkedCheckbox = screen.getByText('Is Linked').parentElement!.querySelector('.filter-check')!;
+ await userEvent.click(isLinkedCheckbox);
+
+ // The search string should now include 'is:linked'
+ expect(searchInput).toHaveValue('foo is:linked');
});
- test('unchecking a filter checkbox removes the filter from the searchString', () => {
+ test('unchecking a filter checkbox removes the filter from the searchString', async () => {
const getLdapGroups = jest.fn().mockReturnValue(Promise.resolve());
- const wrapper = shallow(
+ renderWithContext(
{
}}
/>,
);
- wrapper.setState({showFilters: true, searchString: 'foo is:linked', filterIsLinked: true});
- wrapper.find('span.filter-check').first().simulate('click');
- expect(wrapper.state().searchString).toEqual('foo');
+ await waitFor(() => {
+ expect(screen.getByText('No groups found')).toBeInTheDocument();
+ });
+
+ // Type 'foo' in search
+ const searchInput = screen.getByPlaceholderText('Search');
+ await userEvent.type(searchInput, 'foo');
+
+ // Open filters
+ openFilters();
+
+ // Click the "Is Linked" filter checkbox to check it
+ const isLinkedCheckbox = screen.getByText('Is Linked').parentElement!.querySelector('.filter-check')!;
+ await userEvent.click(isLinkedCheckbox);
+ expect(searchInput).toHaveValue('foo is:linked');
+
+ // Click it again to uncheck it
+ await userEvent.click(isLinkedCheckbox);
+ expect(searchInput).toHaveValue('foo');
});
});
diff --git a/webapp/channels/src/components/admin_console/license_settings/__snapshots__/license_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/license_settings/__snapshots__/license_settings.test.tsx.snap
index 085149667ac..0e81ef14e87 100644
--- a/webapp/channels/src/components/admin_console/license_settings/__snapshots__/license_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/license_settings/__snapshots__/license_settings.test.tsx.snap
@@ -1,108 +1,476 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`components/admin_console/license_settings/LicenseSettings load screen after upgrading 1`] = `
-
-
+
+
+
+
+
+
+
+
+
+
+ Name
+
+
+
+
+ Mattermost Linking
+
+
+
+
+
+
+
+
+
+
+
+ test1
+
+
+
+
+
+
+ Not Linked
+
+
+
+
+
+
+
+
+
+
+
+ test2
+
+
+
+
+
+
+ Linked
+
+
+
+
+ Configure
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -112,108 +480,498 @@ exports[`components/admin_console/license_settings/LicenseSettings load screen a
`;
exports[`components/admin_console/license_settings/LicenseSettings load screen while upgrading 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+ Team Edition
+
+
+
+ + When using Mattermost Team Edition, the software is offered under a Mattermost MIT Compiled License. See MIT-COMPILED-LICENSE.md in your root install directory for details. +
++ When using Mattermost Enterprise Edition, the software is offered under a commercial license. See + + here + + for “Enterprise Edition License” for details. +
++ See NOTICE.txt for information about open source software used in the system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
+
+
+
+
+
+
+
+
+ Upgrade to Enterprise Edition
+
+
+ A license is required to unlock enterprise features
+
+
+
+
+
+ AD/LDAP Group Sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ And more...
+
+
+
+ + You have upgraded your binary to mattermost enterprise, please restart the server to start using the new binary. You can do it right here: +
++ +
+
-
-
+
@@ -223,149 +981,659 @@ exports[`components/admin_console/license_settings/LicenseSettings load screen w
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot enterprise build with E10 license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+ Team Edition
+
+
+
+ + When using Mattermost Team Edition, the software is offered under a Mattermost MIT Compiled License. See MIT-COMPILED-LICENSE.md in your root install directory for details. +
++ When using Mattermost Enterprise Edition, the software is offered under a commercial license. See + + here + + for “Enterprise Edition License” for details. +
++ See NOTICE.txt for information about open source software used in the system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
+
+
+
+
+
+
+
+
+ Upgrade to Enterprise Edition
+
+
+ A license is required to unlock enterprise features
+
+
+
+
+
+ AD/LDAP Group Sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ And more...
+
+
+
+ + +
++ By clicking + + Upgrade + + , I agree to the terms of the Mattermost + + Enterprise Edition License + + . Upgrading will download the binary and update your team edition. +
+
-
-
+
@@ -375,137 +1643,645 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot enterprise build with E20 license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+ Mattermost Enterprise E10
+
+
+
+
+
+ License details
+
+
+
+
+
+ + + +
+
+
+ START DATE:
+
+
+ 2/4/2018
+
+
+
+
+ EXPIRES:
+
+
+ 5/6/2021
+
+
+ Expires in 22 days
+
+
+
+
+ LICENSED SEATS:
+
+
+ 100
+
+
+
+
+ ACTIVE USERS:
+
+
+ 0
+
+
+
+
+ EDITION:
+
+
+ Mattermost Enterprise E10
+
+
+
+
+ LICENSE ISSUED:
+
+
+ 2/4/2018
+
+ 3:24 AM
+
+
+
+
+ NAME:
+
+
+ LicenseName
+
+
+
+
+ COMPANY / ORG:
+
+
+ Mattermost Inc.
+
+
+ + + + +
+
+ + This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
- Curious about upgrading?
-
- Compare Plans
-
+
+
+
+
+
+
+
+ Upgrade to Enterprise
+
+
+
+
+
+
+
+
+ AD/LDAP Group sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ Advanced roles and permissions
+
+
+
+ And more...
+
+
+ Curious about upgrading?
+
+ Compare Plans
+
+
-
-
+
@@ -515,137 +2291,661 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot enterprise build with Enterprise license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Mattermost Enterprise E20
+
+
+
+
+
+ License details
+
+
+
+
+
+ + + +
+
+
+ START DATE:
+
+
+ 2/4/2018
+
+
+
+
+ EXPIRES:
+
+
+ 5/6/2021
+
+
+ Expires in 22 days
+
+
+
+
+ LICENSED SEATS:
+
+
+ 100
+
+
+
+
+ ACTIVE USERS:
+
+
+ 0
+
+
+
+
+ EDITION:
+
+
+ Mattermost Enterprise E20
+
+
+
+
+ LICENSE ISSUED:
+
+
+ 2/4/2018
+
+ 3:24 AM
+
+
+
+
+ NAME:
+
+
+ LicenseName
+
+
+
+
+ COMPANY / ORG:
+
+
+ Mattermost Inc.
+
+
+ + + + +
+
+ + This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
+
+
+
+
+
+
+
+
+ Upgrade to Enterprise
+
+
+
+
+
+
+
+
+ AD/LDAP Group sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ Advanced roles and permissions
+
+
+
+ And more...
+
+
-
-
+
@@ -655,137 +2955,645 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot enterprise build with license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Mattermost Enterprise
+
+
+
+
+
+ License details
+
+
+
+
+
+ + + +
+
+
+ START DATE:
+
+
+ 2/4/2018
+
+
+
+
+ EXPIRES:
+
+
+ 5/6/2021
+
+
+ Expires in 22 days
+
+
+
+
+ LICENSED SEATS:
+
+
+ 100
+
+
+
+
+ ACTIVE USERS:
+
+
+ 0
+
+
+
+
+ EDITION:
+
+
+ Mattermost Enterprise
+
+
+
+
+ LICENSE ISSUED:
+
+
+ 2/4/2018
+
+ 3:24 AM
+
+
+
+
+ NAME:
+
+
+ LicenseName
+
+
+
+
+ COMPANY / ORG:
+
+
+ Mattermost Inc.
+
+
+ + + + +
+
+ + This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
+
+
+
+
+
+
+
+
+ Upgrade to Enterprise Advanced
+
+
+
+
+
+
+
+
+ Attribute-based access control
+
+
+
+ Channel warning banners
+
+
+
+ AD/LDAP group sync
+
+
+
+ Advanced workflows with Playbooks
+
+
+
+ High availability
+
+
+
+ Advanced compliance
+
+
+
+ And more...
+
+
-
-
+
@@ -795,137 +3603,646 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot enterprise build with license and isDisabled set to true 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Mattermost Enterprise E20
+
+
+
+
+
+ License details
+
+
+
+
+
+ + + +
+
+
+ START DATE:
+
+
+ 2/4/2018
+
+
+
+
+ EXPIRES:
+
+
+ 5/6/2021
+
+
+ Expires in 22 days
+
+
+
+
+ LICENSED SEATS:
+
+
+ 100
+
+
+
+
+ ACTIVE USERS:
+
+
+ 0
+
+
+
+
+ EDITION:
+
+
+ Mattermost Enterprise E20
+
+
+
+
+ LICENSE ISSUED:
+
+
+ 2/4/2018
+
+ 3:24 AM
+
+
+
+
+ NAME:
+
+
+ LicenseName
+
+
+
+
+ COMPANY / ORG:
+
+
+ Mattermost Inc.
+
+
+ + + + +
+
+ + This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
+
+
+
+
+
+
+
+
+ Upgrade to Enterprise
+
+
+
+
+
+
+
+
+ AD/LDAP Group sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ Advanced roles and permissions
+
+
+
+ And more...
+
+
-
-
+
@@ -935,137 +4252,651 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot enterprise build with license and upgraded from TE 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Mattermost Enterprise E20
+
+
+
+
+
+ License details
+
+
+
+
+
+ + + +
+
+
+ START DATE:
+
+
+ 2/4/2018
+
+
+
+
+ EXPIRES:
+
+
+ 5/6/2021
+
+
+ Expires in 22 days
+
+
+
+
+ LICENSED SEATS:
+
+
+ 100
+
+
+
+
+ ACTIVE USERS:
+
+
+ 0
+
+
+
+
+ EDITION:
+
+
+ Mattermost Enterprise E20
+
+
+
+
+ LICENSE ISSUED:
+
+
+ 2/4/2018
+
+ 3:24 AM
+
+
+
+
+ NAME:
+
+
+ LicenseName
+
+
+
+
+ COMPANY / ORG:
+
+
+ Mattermost Inc.
+
+
+ + + + +
+
+ + This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
+
+
+
+
+
+
+
+
+ Upgrade to Enterprise
+
+
+
+
+
+
+
+
+ AD/LDAP Group sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ Advanced roles and permissions
+
+
+
+ And more...
+
+
-
-
+
@@ -1075,111 +4906,578 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot enterprise build with trial license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Mattermost Enterprise E20
+
+
+
+
+
+ License details
+
+
+
+
+
+ + + +
+
+
+ START DATE:
+
+
+ 2/4/2018
+
+
+
+
+ EXPIRES:
+
+
+ 5/6/2021
+
+
+ Expires in 22 days
+
+
+
+
+ LICENSED SEATS:
+
+
+ 100
+
+
+
+
+ ACTIVE USERS:
+
+
+ 0
+
+
+
+
+ EDITION:
+
+
+ Mattermost Enterprise E20
+
+
+
+
+ LICENSE ISSUED:
+
+
+ 2/4/2018
+
+ 3:24 AM
+
+
+
+
+ NAME:
+
+
+ LicenseName
+
+
+
+
+ COMPANY / ORG:
+
+
+ Mattermost Inc.
+
+
+ + + + +
+
+ + When using Mattermost Enterprise Edition, the software is offered under a commercial license. See + + here + + for "Enterprise Edition License" for details. + See NOTICE.txt for information about open source software used in the system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
+
+
+
+
+
+
+
+
+ Upgrade to Enterprise
+
+
+
+
+
+
+
+
+ AD/LDAP Group sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ Advanced roles and permissions
+
+
+
+ And more...
+
+
-
-
+
@@ -1189,119 +5487,537 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot enterprise build without license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+
+ Mattermost Enterprise Advanced
+
+
+
+ Trial
+
+
+
+
+
+
+ License details
+
+
+
+
+
+ + + +
+
+
+ START DATE:
+
+
+ 4/6/2021
+
+
+
+
+ EXPIRES:
+
+
+ 5/6/2021
+
+
+ Expires in 22 days
+
+
+
+
+ LICENSED SEATS:
+
+
+ NaN
+
+
+
+
+ ACTIVE USERS:
+
+
+ 0
+
+
+
+
+ EDITION:
+
+
+
+
+
+ LICENSE ISSUED:
+
+
+ 4/6/2021
+
+ 1:10 PM
+
+
+
+
+ NAME:
+
+
+
+
+
+ COMPANY / ORG:
+
+
+
+ + + + +
+
+ + This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
- Curious about upgrading?
-
- Compare Plans
-
+
+
+
+
+
+
+
+ Purchase Enterprise Advanced
+
+
+ Continue your access to Enterprise Advanced features by purchasing a license.
+
+
+
+ Curious about upgrading?
+
+ Compare Plans
+
+
-
-
+
@@ -1311,119 +6027,543 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot enterprise build without license and upgrade from TE 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+ Free
+
+
+
+
+
+ Current Plan
+
+
+ Purchase Professional or Enterprise to unlock enterprise features.
+
+ +
+
+
+
+
+ License Key:
+
+
+
+
+
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
- Curious about upgrading?
-
- Compare Plans
-
+
+
+
+
+
+
+
+ Purchase one of our plans to unlock more features
+
+
+
+
+
+
+ Attribute-based access control
+
+
+
+ Channel warning banners
+
+
+
+ AD/LDAP group sync
+
+
+
+ Advanced workflows with Playbooks
+
+
+
+ High availability
+
+
+
+ Advanced compliance
+
+
+
+ And more...
+
+
+ Curious about upgrading?
+
+ Compare Plans
+
+
-
-
+
@@ -1433,108 +6573,488 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot team edition build with license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+ Free
+
+
+
+
+
+ Current Plan
+
+
+ Purchase Professional or Enterprise to unlock enterprise features.
+
+ +
+
+ + When using Mattermost Enterprise Edition, the software is offered under a commercial license. See + + here + + for "Enterprise Edition License" for details. + See NOTICE.txt for information about open source software used in the system. +
+
+
+
+ License Key:
+
+
+
+
+
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
- Curious about upgrading?
-
- Compare Plans
-
+
+
+
+
+
+
+
+ Purchase one of our plans to unlock more features
+
+
+
+
+
+
+ Attribute-based access control
+
+
+
+ Channel warning banners
+
+
+
+ AD/LDAP group sync
+
+
+
+ Advanced workflows with Playbooks
+
+
+
+ High availability
+
+
+
+ Advanced compliance
+
+
+
+ And more...
+
+
+ Curious about upgrading?
+
+ Compare Plans
+
+
-
-
+
@@ -1544,112 +7064,512 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot team edition build without license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+ Team Edition
+
+
+
+ + When using Mattermost Team Edition, the software is offered under a Mattermost MIT Compiled License. See MIT-COMPILED-LICENSE.md in your root install directory for details. +
++ When using Mattermost Enterprise Edition, the software is offered under a commercial license. See + + here + + for “Enterprise Edition License” for details. +
++ See NOTICE.txt for information about open source software used in the system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
+
+
+
+
+
+
+
+
+ Upgrade to Enterprise Edition
+
+
+ A license is required to unlock enterprise features
+
+
+
+
+
+ AD/LDAP Group Sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ And more...
+
+
+
+ + +
++ By clicking + + Upgrade + + , I agree to the terms of the Mattermost + + Enterprise Edition License + + . Upgrading will download the binary and update your team edition. +
+
-
-
+
@@ -1659,104 +7579,461 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot team edition with expired trial in the past 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+ Team Edition
+
+
+
+ + When using Mattermost Team Edition, the software is offered under a Mattermost MIT Compiled License. See MIT-COMPILED-LICENSE.md in your root install directory for details. +
++ When using Mattermost Enterprise Edition, the software is offered under a commercial license. See + + here + + for “Enterprise Edition License” for details. +
++ See NOTICE.txt for information about open source software used in the system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
- Curious about upgrading?
-
- Compare Plans
-
+
+
+
+
+
+
+
+ Upgrade to Enterprise Edition
+
+
+ A license is required to unlock enterprise features
+
+
+
+
+
+ AD/LDAP Group Sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ And more...
+
+
+
+ + +
++ By clicking + + Upgrade + + , I agree to the terms of the Mattermost + + Enterprise Edition License + + . Upgrading will download the binary and update your team edition. +
+
+ Curious about upgrading?
+
+ Compare Plans
+
+
-
-
+
+
-
@@ -1766,124 +8043,568 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot with cloud expiring license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+ Free
- }
- fileInputRef={
- Object {
- "current": null,
- }
- }
- handleChange={[Function]}
- openEELicenseModal={[Function]}
- upgradedFromTE={false}
- />
+
+
+
+
+ Current Plan
+
+
+ Purchase Professional or Enterprise to unlock enterprise features.
+
+ +
+
+ + This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
+
+
+ License Key:
+
+
+
+
+
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
- See also
-
- Enterprise Edition Terms of Use
-
- and
-
+
+
+
+
+
+ Purchase one of our plans to unlock more features
+
+
+
+
+
+
+ Attribute-based access control
+
+
+
+ Channel warning banners
+
+
+
+ AD/LDAP group sync
+
+
+
+ Advanced workflows with Playbooks
+
+
+
+ High availability
+
+
+
+ Advanced compliance
+
+
+
+ And more...
+
+
- Privacy Policy
-
-
-
-
-
-
- Curious about upgrading?
-
- Compare Plans
-
+ Curious about upgrading?
+
+ Compare Plans
+
+
-
-
+
-
@@ -1893,137 +8614,645 @@ exports[`components/admin_console/license_settings/LicenseSettings should match
`;
exports[`components/admin_console/license_settings/LicenseSettings should match snapshot with expiring license 1`] = `
-
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+ Mattermost Enterprise E20
+
+
+
+
+
+ License details
+
+
+
+
+
+ + + +
+
+
+ START DATE:
+
+
+ 2/4/2018
+
+
+
+
+ EXPIRES:
+
+
+ 5/14/2021
+
+
+ Expires in 30 days
+
+
+
+
+ LICENSED SEATS:
+
+
+ 100
+
+
+
+
+ ACTIVE USERS:
+
+
+ 0
+
+
+
+
+ EDITION:
+
+
+ Mattermost Enterprise E20
+
+
+
+
+ LICENSE ISSUED:
+
+
+ 2/4/2018
+
+ 3:24 AM
+
+
+
+
+ NAME:
+
+
+ LicenseName
+
+
+
+
+ COMPANY / ORG:
+
+
+ Mattermost Inc.
+
+
+ + + + +
+
+ + This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
- See also
-
- Enterprise Edition Terms of Use
-
- and
-
- Privacy Policy
-
-
-
-
-
+
+
+
+
+
+ Upgrade to Enterprise
+
+
+
+
+
+
+
+
+ AD/LDAP Group sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ Advanced roles and permissions
+
+
+
+ And more...
+
+
-
-
+
diff --git a/webapp/channels/src/components/admin_console/license_settings/license_settings.test.tsx b/webapp/channels/src/components/admin_console/license_settings/license_settings.test.tsx
index 03da2b58a11..53311a7ca9e 100644
--- a/webapp/channels/src/components/admin_console/license_settings/license_settings.test.tsx
+++ b/webapp/channels/src/components/admin_console/license_settings/license_settings.test.tsx
@@ -1,12 +1,11 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import moment from 'moment';
import React from 'react';
-import type {ComponentProps} from 'react';
import {fakeDate} from 'tests/helpers/date';
+import {renderWithContext, screen, act} from 'tests/react_testing_utils';
import {LicenseSkus} from 'utils/constants';
import LicenseSettings from './license_settings';
@@ -24,7 +23,7 @@ describe('components/admin_console/license_settings/LicenseSettings', () => {
resetFakeDate();
});
- const defaultProps: ComponentProps = {
+ const defaultProps: React.ComponentProps = {
isDisabled: false,
license: {
IsLicensed: 'true',
@@ -61,48 +60,48 @@ describe('components/admin_console/license_settings/LicenseSettings', () => {
};
test('should match snapshot enterprise build with license', () => {
- const wrapper = shallow((
+ const {container} = renderWithContext(
(((((();
expect(actions.upgradeToE0).toHaveBeenCalledTimes(1);
- expect(actions.upgradeToE0Status).toHaveBeenCalledTimes(1);
- wrapper.update();
- expect(wrapper.update().state('upgradingPercentage')).toBe(1);
- // eslint-disable-next-line @typescript-eslint/ban-ts-comment
- // @ts-ignore
- expect(instance.interval).not.toBe(null);
});
test('load screen while upgrading', async () => {
@@ -144,9 +141,11 @@ describe('components/admin_console/license_settings/LicenseSettings', () => {
upgradeToE0Status: jest.fn().mockImplementation(() => Promise.resolve({percentage: 42, error: null})),
};
const props = {...defaultProps, enterpriseReady: false, actions};
- const wrapper = shallow(((((((((
-
+
`;
diff --git a/webapp/channels/src/components/admin_console/license_settings/modals/__snapshots__/upload_license_modal.test.tsx.snap b/webapp/channels/src/components/admin_console/license_settings/modals/__snapshots__/upload_license_modal.test.tsx.snap
index 81b6db47e1a..f302ce3ceab 100644
--- a/webapp/channels/src/components/admin_console/license_settings/modals/__snapshots__/upload_license_modal.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/license_settings/modals/__snapshots__/upload_license_modal.test.tsx.snap
@@ -1,77 +1,13 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`components/admin_console/license_settings/modals/upload_license_modal should match snapshot when is licensed 1`] = `
-
-
+
`;
exports[`components/admin_console/license_settings/modals/upload_license_modal should match snapshot when is not licensed 1`] = `
-
-
+
`;
diff --git a/webapp/channels/src/components/admin_console/license_settings/modals/confirm_license_removal_modal.test.tsx b/webapp/channels/src/components/admin_console/license_settings/modals/confirm_license_removal_modal.test.tsx
index 5223519c0a5..92305f4fb12 100644
--- a/webapp/channels/src/components/admin_console/license_settings/modals/confirm_license_removal_modal.test.tsx
+++ b/webapp/channels/src/components/admin_console/license_settings/modals/confirm_license_removal_modal.test.tsx
@@ -1,18 +1,19 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
-import {Provider} from 'react-redux';
-import {mountWithIntl} from 'tests/helpers/intl-test-helper';
-import mockStore from 'tests/test_store';
+import type {DeepPartial} from '@mattermost/types/utilities';
+
+import {renderWithContext, screen} from 'tests/react_testing_utils';
+
+import type {GlobalState} from 'types/store';
import ConfirmLicenseRemovalModal from './confirm_license_removal_modal';
describe('components/admin_console/license_settings/modals/confirm_license_removal_modal', () => {
// required state to mount using the provider
- const state = {
+ const state: DeepPartial = {
entities: {
general: {
license: {
@@ -40,62 +41,56 @@ describe('components/admin_console/license_settings/modals/confirm_license_remov
handleRemove: mockHandleRemove,
};
- const store = mockStore(state);
-
test('should match snapshot', () => {
- const wrapper = shallow(
-
- ,
+ const {container} = renderWithContext(
+
- ,
+ renderWithContext(
+
- ,
+ renderWithContext(
+ = {
+ ...state,
+ views: {
+ modals: {
+ modalState: {},
+ },
},
};
- const localStore = {...state, views: ConfirmLicenseRemovalModalHidden};
- const store = mockStore(localStore);
- const wrapper = mountWithIntl(
-
- ,
+ renderWithContext(
+
- ,
+ renderWithContext(
+ = {
entities: {
general: {
license: {
@@ -58,43 +65,38 @@ describe('components/admin_console/license_settings/modals/upload_license_modal'
fileObjFromProps: {name: 'Test license file'} as File,
};
- const store = mockStore(state);
-
test('should match snapshot when is not licensed', () => {
- const wrapper = shallow(
-
- ,
+ const {container} = renderWithContext(
+ = {
+ ...state,
+ entities: {
+ general: {
+ license: {...license},
+ },
},
};
- const localStore = {...state, entities: licensedState};
- const store = mockStore(localStore);
- const wrapper = shallow(
-
- ,
+ const {container} = renderWithContext(
+
- ,
+ const newProps = {...props, fileObjFromProps: null};
+ renderWithContext(
+
- ,
+ renderWithContext(
+
- ,
+ const newProps = {...props, fileObjFromProps: null};
+ renderWithContext(
+
- ,
+ renderWithContext(
+ = {
+ ...state,
+ entities: {
+ general: {
+ license: {...license},
+ },
},
};
- const localStore = {...state, entities: licensedState};
- const store = mockStore(localStore);
- const useDispatchMock = jest.spyOn(reactRedux, 'useDispatch');
-
- const dummyDispatch = jest.fn();
- useDispatchMock.mockReturnValue(dummyDispatch.mockImplementation(() => new Promise((resolve) => {
- resolve('');
- })));
-
- const wrapper = mountWithIntl(
-
- ,
+ renderWithContext(
+ = {
+ ...state,
+ entities: {
+ general: {
+ license: {...license, Users: '123456789'},
+ },
},
};
- const localStore = {...state, entities: licensedState};
- const store = mockStore(localStore);
- const useDispatchMock = jest.spyOn(reactRedux, 'useDispatch');
-
- const dummyDispatch = jest.fn();
- useDispatchMock.mockReturnValue(dummyDispatch.mockImplementation(() => new Promise((resolve) => {
- resolve('');
- })));
-
- const wrapper = mountWithIntl(
-
- ,
+ renderWithContext(
+ = {
+ ...state,
+ views: {
+ modals: {
+ modalState: {},
+ },
},
};
- const localStore = {...state, views: UploadLicenseModalHidden};
- const store = mockStore(localStore);
- const wrapper = mountWithIntl(
-
- ,
+ renderWithContext(
+ = {
views: {
announcementBar: {
announcementBarState: {
@@ -42,17 +42,6 @@ const initialState = {
},
};
-const actImmediate = (wrapper: ReactWrapper) =>
- act(
- () =>
- new Promise((resolve) => {
- setImmediate(() => {
- wrapper.update();
- resolve();
- });
- }),
- );
-
describe('components/RenewalLicenseCard', () => {
const props = {
license: {
@@ -65,14 +54,11 @@ describe('components/RenewalLicenseCard', () => {
isDisabled: false,
};
- test('should show Contact sales button', async () => {
- const store = mockStore(initialState);
- const wrapper = mountWithIntl(
+ Edition and License
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+ Mattermost Enterprise E20
+
+
+
+
+
+ License details
+
+
+
+
+
+ + + +
+
+
+ START DATE:
+
+
+ 2/4/2018
+
+
+
+
+ EXPIRES:
+
+
+ 5/14/2021
+
+
+ Expires in 30 days
+
+
+
+
+ LICENSED SEATS:
+
+
+ 100
+
+
+
+
+ ACTIVE USERS:
+
+
+ 0
+
+
+
+
+ EDITION:
+
+
+ Mattermost Enterprise E20
+
+
+
+
+ LICENSE ISSUED:
+
+
+ 2/4/2018
+
+ 3:24 AM
+
+
+
+
+ NAME:
+
+
+ LicenseName
+
+
+
+
+ COMPANY / ORG:
+
+
+ Mattermost Inc.
+
+
+ + + + +
+
+ + This software is offered under a commercial license. + +See ENTERPRISE-EDITION-LICENSE.txt in your root install directory for details. See NOTICE.txt for information about open source software used in this system. +
+
+ See also
+
+ Enterprise Edition Terms of Use
+
+ and
+
+ Privacy Policy
+
+
+
+
+
+
+
+
+
+
+ Upgrade to Enterprise
+
+
+
+
+
+
+
+
+ AD/LDAP Group sync
+
+
+
+ High Availability
+
+
+
+ Advanced compliance
+
+
+
+ Advanced roles and permissions
+
+
+
+ And more...
+
+
-
+
`;
exports[`admin_console/team_channel_settings/group/GroupList should match snapshot with no members 1`] = `
-
+
+
+
+
+
- }
- previousPage={[Function]}
- rows={
- Array [
- Object {
- "cells": Object {
- "id": "id0",
- "name":
+
+
+
+
+
+
+
+
+
+
+
+ Loading
+
+
-
+
`;
diff --git a/webapp/channels/src/components/admin_console/member_list_group/member_list_group.test.tsx b/webapp/channels/src/components/admin_console/member_list_group/member_list_group.test.tsx
index 7884eacc096..bb44bbb5dcb 100644
--- a/webapp/channels/src/components/admin_console/member_list_group/member_list_group.test.tsx
+++ b/webapp/channels/src/components/admin_console/member_list_group/member_list_group.test.tsx
@@ -1,10 +1,10 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import range from 'lodash/range';
import React from 'react';
+import {renderWithContext} from 'tests/react_testing_utils';
import {TestHelper} from 'utils/test_helper';
import MemberListGroup from './member_list_group';
@@ -21,9 +21,9 @@ describe('admin_console/team_channel_settings/group/GroupList', () => {
});
const actions = {
- getProfilesInGroup: jest.fn(),
- getGroupStats: jest.fn(),
- searchProfiles: jest.fn(),
+ getProfilesInGroup: jest.fn().mockResolvedValue({data: []}),
+ getGroupStats: jest.fn().mockResolvedValue({data: {}}),
+ searchProfiles: jest.fn().mockResolvedValue({data: []}),
setModalSearchTerm: jest.fn(),
};
@@ -36,17 +36,17 @@ describe('admin_console/team_channel_settings/group/GroupList', () => {
};
test('should match snapshot with no members', () => {
- const wrapper = shallow(
+
+
+
+
+
- }
- previousPage={[Function]}
- rows={Array []}
- startCount={1}
- term=""
- total={0}
- />
+
+
+
+
+
+
+
+
+
+
+
+ Loading
+
+
+
- ![OpenId Convert Image]()
-
-
-
diff --git a/webapp/channels/src/components/admin_console/openid_convert/openid_convert.test.tsx b/webapp/channels/src/components/admin_console/openid_convert/openid_convert.test.tsx
index 8a6c9402d89..bd7277c610e 100644
--- a/webapp/channels/src/components/admin_console/openid_convert/openid_convert.test.tsx
+++ b/webapp/channels/src/components/admin_console/openid_convert/openid_convert.test.tsx
@@ -1,11 +1,12 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
import OpenIdConvert from 'components/admin_console/openid_convert/openid_convert';
+import {renderWithContext} from 'tests/react_testing_utils';
+
describe('components/OpenIdConvert', () => {
const baseProps = {
actions: {
@@ -14,10 +15,10 @@ describe('components/OpenIdConvert', () => {
};
test('should match snapshot', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
-
-
-
-
+ ![OpenId Convert Image]()
+
+
+
+ You can now convert your OAuth2.0 configuration to OpenID Connect. +
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_checkbox should match snapshot on other value 1`] = `
-
+
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_checkbox should match snapshot on value "checked" 1`] = `
-
-
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_checkbox should match snapshot on value "checked" and no id 1`] = `
-
-
-
+
- This is a clickable description
-
- }
->
+
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_checkbox should match snapshot on value "intermediate" 1`] = `
-
-
-
+
- }
+
-
-
-
-
- Inherited from
-
- All Members
-
- .
-
-
-
-
-
-
-
+ Inherited from
+
+ All Members
+
+ .
+
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_description should match snapshot if inherited 1`] = `
-
+
`;
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_description.test.tsx.snap b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_description.test.tsx.snap
index 1443cba92bf..3d9eb2810c1 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_description.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_description.test.tsx.snap
@@ -1,158 +1,59 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`components/admin_console/permission_schemes_settings/permission_description should allow select with link 1`] = `
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_description should match snapshot with clickable link 1`] = `
-
-
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_description should match snapshot with default Props 1`] = `
-
-
+
`;
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_group.test.tsx.snap b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_group.test.tsx.snap
index bcd57c9a000..319e3cffce4 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_group.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_group.test.tsx.snap
@@ -1,723 +1,1511 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
-exports[`components/admin_console/permission_schemes_settings/permission_group should expand and collapse correctly, expanded by default, collapsed and then expanded again 1`] = `
-
-
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_group should expand and collapse correctly, expanded by default, collapsed and then expanded again 2`] = `
-
-
-
-
-
-
-
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_group should expand and collapse correctly, expanded by default, collapsed and then expanded again 3`] = `
-
-
-
-
-
-
-
-`;
-
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot on editable with all permissions 1`] = `
-
-
-
-
-
-
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot on editable with all permissions and read-only 1`] = `
-
-
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot on editable with all permissions from parentRole 1`] = `
-
-
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot on editable with some permissions 1`] = `
-
-
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot on editable with some permissions and read-only 1`] = `
-
-
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot on editable with some permissions from parentRole 1`] = `
-
-
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot on editable without every permission out of the scope 1`] = `
-
-
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot on editable without permissions 1`] = `
-
-
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot on editable without permissions and read-only 1`] = `
-
-
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_group should match snapshot with additional values 1`] = `
-
-
-
+
+
`;
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_row.test.tsx.snap b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_row.test.tsx.snap
index 81d2b429518..fd605629caa 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_row.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_row.test.tsx.snap
@@ -1,139 +1,411 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
exports[`components/admin_console/permission_schemes_settings/permission_row should match snapshot on editable and inherited 1`] = `
-
-
-
+
-
`;
exports[`components/admin_console/permission_schemes_settings/permission_row should match snapshot on editable and not inherited 1`] = `
-
-
+`;
+
+exports[`components/admin_console/permission_schemes_settings/permission_row should match snapshot on read only and inherited 1`] = `
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_row should match snapshot on read only and not inherited 1`] = `
-
-
`;
exports[`components/admin_console/permission_schemes_settings/permission_row should match snapshot with additional values 1`] = `
-
-
-
`;
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap
index f92518e8cb9..1a4611b4a91 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/__snapshots__/permission_schemes_settings.test.tsx.snap
@@ -1,651 +1,1135 @@
// Jest Snapshot v1, https://jestjs.io/docs/snapshot-testing
-exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should match snapshot loading 1`] = `
-
-
+exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should match snapshot loading 1`] = `
+
+
+`;
+
+exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should match snapshot with schemes 1`] = `
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should match snapshot without schemes 1`] = `
-
+
+ + Loading +
+ + + +
+
+
- Team Override Scheme is applied.",
- "id": "admin.permissions.systemSchemeBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "System Scheme",
- "id": "admin.permissions.systemSchemeBannerTitle",
- }
- }
- url="/admin_console/user_management/permissions/system_scheme"
- />
- System Scheme.",
- "id": "admin.permissions.teamOverrideSchemesBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "Team Override Schemes",
- "id": "admin.permissions.teamOverrideSchemesTitle",
- }
- }
- url="/admin_console/user_management/permissions/team_override_scheme"
- >
-
+ Permission Schemes
+
+
+
+
+
+
+
+
+
+
+ + System Scheme +
+
+ Set the default permissions inherited by all teams unless a
+
+ Team Override Scheme
+
+ is applied.
+
+
-
-
+
Team Override Scheme is applied.",
- "id": "admin.permissions.systemSchemeBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "System Scheme",
- "id": "admin.permissions.systemSchemeBannerTitle",
- }
- }
- url="/admin_console/user_management/permissions/system_scheme"
- />
- System Scheme.",
- "id": "admin.permissions.teamOverrideSchemesBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "Team Override Schemes",
- "id": "admin.permissions.teamOverrideSchemesTitle",
- }
- }
- url="/admin_console/user_management/permissions/team_override_scheme"
- >
-
`;
exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should show migration in-progress view 1`] = `
-
- ,
+ const {container} = renderWithContext(
+
- ,
+ const {container} = renderWithContext(
+ (
+ test('should collapse when toggle to all permissions and expand otherwise', async () => {
+ // Start with some permissions (intermediate state) -> clicking toggles to all -> should collapse
+ const {container, rerender} = renderWithContext(
(
+ const user = userEvent.setup();
+ const {container, rerender} = renderWithContext(
= {
schemes: {
@@ -20,8 +21,8 @@ describe('components/admin_console/permission_schemes_settings/permission_scheme
jobsAreEnabled: true,
clusterIsEnabled: false,
actions: {
- loadSchemes: jest.fn(() => Promise.resolve({})),
- loadSchemeTeams: jest.fn(),
+ loadSchemes: jest.fn(() => Promise.resolve({data: [], error: {}})),
+ loadSchemeTeams: jest.fn(() => Promise.resolve({data: []})),
},
license: {
CustomPermissionsSchemes: 'true',
@@ -31,56 +32,91 @@ describe('components/admin_console/permission_schemes_settings/permission_scheme
};
test('should match snapshot loading', () => {
- const wrapper = shallow(
- (() => {}));
+ const {container} = renderWithContext(
+ = {};
+const mockGuestTreeProps: Record = {};
+const mockPlaybookTreeProps: Record = {};
+
+// Identify PermissionsTree instances by scope + parentRole presence
+function mockGetPermissionsTreeId(props: any): string {
+ if (!props.parentRole && props.scope === 'team_scope') {
+ return 'all_users';
+ }
+ if (props.scope === 'channel_scope') {
+ return 'channel_admin';
+ }
+ if (props.parentRole && props.scope === 'team_scope') {
+ return 'team_admin';
+ }
+ return 'unknown';
}
-function getAnyState(wrapper: any) {
- return wrapper.state() as any;
-}
+jest.mock('../permissions_tree', () => ({
+ __esModule: true,
+ default: (props: any) => {
+ const id = mockGetPermissionsTreeId(props);
+ mockPermissionsTreeProps[id] = props;
+ return
+ Permission Schemes
+
+
+
-
+
+
+
+
+
+
+ + System Scheme +
+
+ Set the default permissions inherited by all teams unless a
+
+ Team Override Scheme
+
+ is applied.
+
+
-
-
-
-
+
- Team Override Scheme is applied.",
- "id": "admin.permissions.systemSchemeBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "System Scheme",
- "id": "admin.permissions.systemSchemeBannerTitle",
- }
- }
- url="/admin_console/user_management/permissions/system_scheme"
- />
- System Scheme.",
- "id": "admin.permissions.teamOverrideSchemesBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "Team Override Schemes",
- "id": "admin.permissions.teamOverrideSchemesTitle",
- }
- }
- url="/admin_console/user_management/permissions/team_override_scheme"
- >
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should show migration on hold view 1`] = `
-
+ Permission Schemes
+
+
-
-
-
+
+
-
+
+
+
+
+ + System Scheme +
+
+ Set the default permissions inherited by all teams unless a
+
+ Team Override Scheme
+
+ is applied.
+
+
-
-
+
- Team Override Scheme is applied.",
- "id": "admin.permissions.systemSchemeBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "System Scheme",
- "id": "admin.permissions.systemSchemeBannerTitle",
- }
- }
- url="/admin_console/user_management/permissions/system_scheme"
- />
- System Scheme.",
- "id": "admin.permissions.teamOverrideSchemesBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "Team Override Schemes",
- "id": "admin.permissions.teamOverrideSchemesTitle",
- }
- }
- url="/admin_console/user_management/permissions/team_override_scheme"
- >
-
+
+
`;
exports[`components/admin_console/permission_schemes_settings/permission_schemes_settings should show normal view (jobs disabled after migration) 1`] = `
-
+ Permission Schemes
+
+
-
-
-
+
+
-
+
+
+
+
+ + System Scheme +
+
+ Set the default permissions inherited by all teams unless a
+
+ Team Override Scheme
+
+ is applied.
+
+
-
-
+
- Team Override Scheme is applied.",
- "id": "admin.permissions.systemSchemeBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "System Scheme",
- "id": "admin.permissions.systemSchemeBannerTitle",
- }
- }
- url="/admin_console/user_management/permissions/system_scheme"
- />
- System Scheme.",
- "id": "admin.permissions.teamOverrideSchemesBannerText",
- }
- }
- subtitleValues={
- Object {
- "link": [Function],
- }
- }
- title={
- Object {
- "defaultMessage": "Team Override Schemes",
- "id": "admin.permissions.teamOverrideSchemesTitle",
- }
- }
- url="/admin_console/user_management/permissions/team_override_scheme"
- >
-
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_checkbox.test.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_checkbox.test.tsx
index 7500c13694d..1c8943eedcd 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_checkbox.test.tsx
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_checkbox.test.tsx
@@ -1,53 +1,59 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
import PermissionCheckbox from 'components/admin_console/permission_schemes_settings/permission_checkbox';
+import {renderWithContext, screen} from 'tests/react_testing_utils';
+
describe('components/admin_console/permission_schemes_settings/permission_checkbox', () => {
test('should match snapshot on no value', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
+ Permission Schemes
+
+
+
+
+
+
+
+
+
+
+ + System Scheme +
+
+ Set the default permissions inherited by all teams unless a
+
+ Team Override Scheme
+
+ is applied.
+
+
-
-
-
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit with permissions 2`] = `
-Object {
- "all_users": Object {
- "displayName": "All members",
- "name": "all_users",
- "permissions": Array [
- "invite_user",
- "add_reaction",
- "delete_post",
- "delete_post",
- ],
- },
- "channel_admin": Object {
- "name": "channel_admin",
- "permissions": Array [
- "delete_post",
- ],
- },
- "channel_guest": Object {
- "permissions": Array [
- "delete_post",
- ],
- },
- "channel_user": Object {
- "permissions": Array [
- "add_reaction",
- ],
- },
- "guests": Object {
- "displayName": "Guests",
- "name": "guests",
- "permissions": Array [
- "edit_post",
- "delete_post",
- ],
- },
- "playbook_admin": Object {
- "permissions": Array [
- "delete_post",
- ],
- },
- "playbook_member": Object {
- "permissions": Array [
- "delete_post",
- ],
- },
- "run_member": Object {
- "permissions": Array [
- "delete_post",
- ],
- },
- "team_admin": Object {
- "name": "team_admin",
- "permissions": Array [
- "add_user_to_team",
- ],
- },
- "team_guest": Object {
- "permissions": Array [
- "edit_post",
- ],
- },
- "team_user": Object {
- "permissions": Array [
- "invite_user",
- ],
- },
-}
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit without guest permissions 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit without guest permissions 2`] = `
-Object {
- "all_users": Object {
- "displayName": "All members",
- "name": "all_users",
- "permissions": Array [],
- },
- "channel_admin": Object {
- "permissions": Array [],
- },
- "channel_guest": Object {
- "permissions": Array [],
- },
- "channel_user": Object {
- "permissions": Array [],
- },
- "guests": Object {
- "displayName": "Guests",
- "name": "guests",
- "permissions": Array [],
- },
- "playbook_admin": Object {
- "permissions": Array [],
- },
- "playbook_member": Object {
- "permissions": Array [],
- },
- "run_member": Object {
- "permissions": Array [],
- },
- "team_admin": Object {
- "permissions": Array [],
- },
- "team_guest": Object {
- "permissions": Array [],
- },
- "team_user": Object {
- "permissions": Array [],
- },
-}
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit without license 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit without license 2`] = `
-Object {
- "all_users": Object {
- "displayName": "All members",
- "name": "all_users",
- "permissions": Array [],
- },
- "channel_admin": Object {
- "permissions": Array [],
- },
- "channel_guest": Object {
- "permissions": Array [],
- },
- "channel_user": Object {
- "permissions": Array [],
- },
- "guests": Object {
- "displayName": "Guests",
- "name": "guests",
- "permissions": Array [],
- },
- "playbook_admin": Object {
- "permissions": Array [],
- },
- "playbook_member": Object {
- "permissions": Array [],
- },
- "run_member": Object {
- "permissions": Array [],
- },
- "team_admin": Object {
- "permissions": Array [],
- },
- "team_guest": Object {
- "permissions": Array [],
- },
- "team_user": Object {
- "permissions": Array [],
- },
-}
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit without permissions 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on edit without permissions 2`] = `
-Object {
- "all_users": Object {
- "displayName": "All members",
- "name": "all_users",
- "permissions": Array [],
- },
- "channel_admin": Object {
- "permissions": Array [],
- },
- "channel_guest": Object {
- "permissions": Array [],
- },
- "channel_user": Object {
- "permissions": Array [],
- },
- "guests": Object {
- "displayName": "Guests",
- "name": "guests",
- "permissions": Array [],
- },
- "playbook_admin": Object {
- "permissions": Array [],
- },
- "playbook_member": Object {
- "permissions": Array [],
- },
- "run_member": Object {
- "permissions": Array [],
- },
- "team_admin": Object {
- "permissions": Array [],
- },
- "team_guest": Object {
- "permissions": Array [],
- },
- "team_user": Object {
- "permissions": Array [],
- },
-}
-`;
-
-exports[`components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings should match snapshot on new with default roles with permissions 1`] = `
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-`;
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.test.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.test.tsx
index 2476dfb3737..f958c3f3b24 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.test.tsx
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings.test.tsx
@@ -1,20 +1,60 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
import Permissions from 'mattermost-redux/constants/permissions';
+import {renderWithContext, screen, act, userEvent, waitFor} from 'tests/react_testing_utils';
+
import PermissionTeamSchemeSettings from './permission_team_scheme_settings';
-function getAnyInstance(wrapper: any) {
- return wrapper.instance() as any;
+// Store the latest props passed to each mocked tree component keyed by identifier
+const mockPermissionsTreeProps: Record
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- ;
+ },
+ EXCLUDED_PERMISSIONS: [],
+}));
+
+jest.mock('../guest_permissions_tree', () => ({
+ __esModule: true,
+ default: (props: any) => {
+ mockGuestTreeProps.guests = props;
+ return ;
+ },
+ GUEST_INCLUDED_PERMISSIONS: [],
+}));
+
+jest.mock('../permissions_tree_playbooks', () => ({
+ __esModule: true,
+ default: (props: any) => {
+ mockPlaybookTreeProps.playbook_admin = props;
+ return ;
+ },
+}));
+
describe('components/admin_console/permission_schemes_settings/permission_team_scheme_settings/permission_team_scheme_settings', () => {
const defaultProps = {
config: {
@@ -25,7 +65,7 @@ describe('components/admin_console/permission_schemes_settings/permission_team_s
CustomPermissionsSchemes: 'true',
GuestAccountsPermissions: 'true',
},
- location: {},
+ location: {search: ''},
schemeId: '',
scheme: null,
isDisabled: false,
@@ -118,17 +158,31 @@ describe('components/admin_console/permission_schemes_settings/permission_team_s
},
} as any;
- test('should match snapshot on new with default roles without permissions', (done) => {
- const wrapper = shallow(
-
+
-
-
`;
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/team_in_list/team_in_list.test.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/team_in_list/team_in_list.test.tsx
index d00d7a7d418..d856c62b0d1 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/team_in_list/team_in_list.test.tsx
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permission_team_scheme_settings/team_in_list/team_in_list.test.tsx
@@ -1,13 +1,13 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
import type {TeamType} from '@mattermost/types/teams';
-import TeamInList
- from 'components/admin_console/permission_schemes_settings/permission_team_scheme_settings/team_in_list/team_in_list';
+import {renderWithContext, screen} from 'tests/react_testing_utils';
+
+import TeamInList from './team_in_list';
describe('components/admin_console/permission_schemes_settings/permission_team_scheme_settings/team_in_list/team_in_list', () => {
test('should match snapshot with team', () => {
@@ -30,12 +30,15 @@ describe('components/admin_console/permission_schemes_settings/permission_team_s
group_constrained: true,
},
isDisabled: false,
- onRemoveTeam: () => {},
+ onRemoveTeam: jest.fn(),
};
- const wrapper = shallow(
+ const {container} = renderWithContext(
+
`;
exports[`components/admin_console/permission_schemes_settings/permissions_scheme_summary should match snapshot on more than eight teams 1`] = `
-
+
`;
exports[`components/admin_console/permission_schemes_settings/permissions_scheme_summary should match snapshot on no teams 1`] = `
-
+
-
`;
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_scheme_summary/permissions_scheme_summary.test.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_scheme_summary/permissions_scheme_summary.test.tsx
index 5b384ea6630..9ee641bfc11 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_scheme_summary/permissions_scheme_summary.test.tsx
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_scheme_summary/permissions_scheme_summary.test.tsx
@@ -1,11 +1,11 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
-import PermissionsSchemeSummary from 'components/admin_console/permission_schemes_settings/permissions_scheme_summary/permissions_scheme_summary';
-import ConfirmModal from 'components/confirm_modal';
+import {renderWithContext, screen, userEvent, waitFor} from 'tests/react_testing_utils';
+
+import PermissionsSchemeSummary from './permissions_scheme_summary';
describe('components/admin_console/permission_schemes_settings/permissions_scheme_summary', () => {
const defaultProps = {
@@ -23,17 +23,33 @@ describe('components/admin_console/permission_schemes_settings/permissions_schem
actions: {
deleteScheme: jest.fn().mockResolvedValue({data: true}),
},
+ history: {
+ push: jest.fn(),
+ },
+ location: {
+ pathname: '',
+ },
+ match: {
+ url: '',
+ },
} as any;
test('should match snapshot on default data', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
-
-
- Test
-
-
-
-
-
- Test description
-
-
+
-
`;
exports[`components/admin_console/permission_schemes_settings/permission_tree should match snapshot on default data 1`] = `
-
-
-
+
-
`;
exports[`components/admin_console/permission_schemes_settings/permission_tree should match snapshot on license without LDAPGroups 1`] = `
-
-
-
+
-
`;
exports[`components/admin_console/permission_schemes_settings/permission_tree should match snapshot on read only 1`] = `
-
-
-
+
-
`;
exports[`components/admin_console/permission_schemes_settings/permission_tree should match snapshot on system scope 1`] = `
-
-
-
+
-
`;
exports[`components/admin_console/permission_schemes_settings/permission_tree should match snapshot on team scope 1`] = `
-
-
-
+
-
`;
exports[`components/admin_console/permission_schemes_settings/permission_tree should match snapshot with parentRole with permissions 1`] = `
-
-
-
+;
+ const groups = PermissionGroup.mock.calls[0][0].permissions as Array;
if (shouldSeeConvertPrivateToPublic) {
expect(groups[2].permissions).toContain('convert_private_channel_to_public');
} else {
@@ -131,7 +146,7 @@ describe('components/admin_console/permission_schemes_settings/permission_tree',
});
test('should hide disabbled integration options', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
;
+ const groups = PermissionGroup.mock.calls[0][0].permissions as Array;
expect(groups[0].id).toStrictEqual('teams');
expect(groups[6].id).toStrictEqual('posts');
expect(groups[7].id).toStrictEqual('integrations');
@@ -171,13 +186,13 @@ describe('components/admin_console/permission_schemes_settings/permission_tree',
},
};
- const wrapper = shallow(
+ renderWithContext(
;
+ const groups = PermissionGroup.mock.calls[0][0].permissions as Array;
expect(groups[3].id).toStrictEqual('playbook_public');
expect(groups[4].id).toStrictEqual('runs');
}));
@@ -193,13 +208,13 @@ describe('components/admin_console/permission_schemes_settings/permission_tree',
},
};
- const wrapper = shallow(
+ renderWithContext(
;
+ const groups = PermissionGroup.mock.calls[0][0].permissions as Array;
expect(groups[3].id).toStrictEqual('playbook_public');
expect(groups[4].id).toStrictEqual('playbook_private');
expect(groups[5].id).toStrictEqual('runs');
@@ -218,12 +233,12 @@ describe('components/admin_console/permission_schemes_settings/permission_tree',
},
};
- const wrapper = shallow(
+ renderWithContext(
;
+ const groups = PermissionGroup.mock.calls[0][0].permissions as Array;
expect(groups[1].permissions).not.toContain('manage_public_channel_auto_translation');
expect(groups[1].permissions).not.toContain('manage_private_channel_auto_translation');
expect(groups[2].permissions).not.toContain('manage_public_channel_auto_translation');
@@ -241,12 +256,12 @@ describe('components/admin_console/permission_schemes_settings/permission_tree',
},
};
- const wrapper = shallow(
+ renderWithContext(
;
+ const groups = PermissionGroup.mock.calls[0][0].permissions as Array;
expect(groups[1].permissions).toContain('manage_public_channel_auto_translation');
expect(groups[1].permissions).not.toContain('manage_private_channel_auto_translation');
expect(groups[2].permissions).not.toContain('manage_public_channel_auto_translation');
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree_playbooks.test.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree_playbooks.test.tsx
index a3036e2f738..4213cd3e309 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree_playbooks.test.tsx
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree_playbooks.test.tsx
@@ -1,17 +1,22 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
import type {ComponentProps} from 'react';
-import PermissionGroup from 'components/admin_console/permission_schemes_settings/permission_group';
import PermissionsTreePlaybooks from 'components/admin_console/permission_schemes_settings/permissions_tree_playbooks';
+import {renderWithContext} from 'tests/react_testing_utils';
import {LicenseSkus} from 'utils/constants';
import type {Group, Permission} from './permissions_tree/types';
+jest.mock('components/admin_console/permission_schemes_settings/permission_group', () => {
+ return jest.fn(() => );
+});
+
+const PermissionGroup = require('components/admin_console/permission_schemes_settings/permission_group');
+
describe('components/admin_console/permission_schemes_settings/permissions_tree_playbooks', () => {
const defaultProps: ComponentProps = {
role: {name: 'role'},
@@ -24,6 +29,10 @@ describe('components/admin_console/permission_schemes_settings/permissions_tree_
},
};
+ beforeEach(() => {
+ PermissionGroup.mockClear();
+ });
+
describe('should show playbook permissions', () => {
describe('for non-enterprise license', () => {
['', LicenseSkus.E10, LicenseSkus.Starter, LicenseSkus.Professional].forEach((licenseSku) => test(licenseSku, () => {
@@ -35,11 +44,11 @@ describe('components/admin_console/permission_schemes_settings/permissions_tree_
},
};
- const wrapper = shallow(
+ renderWithContext(
-
`;
diff --git a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.test.tsx b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.test.tsx
index e78f260f7d0..0b171d92309 100644
--- a/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.test.tsx
+++ b/webapp/channels/src/components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree.test.tsx
@@ -1,18 +1,27 @@
// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved.
// See LICENSE.txt for license information.
-import {shallow} from 'enzyme';
import React from 'react';
import GeneralConstants from 'mattermost-redux/constants/general';
-import PermissionGroup from 'components/admin_console/permission_schemes_settings/permission_group';
import PermissionsTree from 'components/admin_console/permission_schemes_settings/permissions_tree/permissions_tree';
+import {renderWithContext} from 'tests/react_testing_utils';
import {LicenseSkus} from 'utils/constants';
import type {Group, Permission} from './types';
+jest.mock('components/admin_console/permission_schemes_settings/permission_group', () => {
+ return jest.fn(() => );
+});
+
+jest.mock('components/admin_console/permission_schemes_settings/edit_post_time_limit_modal', () => {
+ return jest.fn(() => null);
+});
+
+const PermissionGroup = require('components/admin_console/permission_schemes_settings/permission_group');
+
describe('components/admin_console/permission_schemes_settings/permission_tree', () => {
const defaultProps = {
scope: 'channel_scope',
@@ -39,73 +48,79 @@ describe('components/admin_console/permission_schemes_settings/permission_tree',
customGroupsEnabled: true,
};
+ beforeEach(() => {
+ PermissionGroup.mockClear();
+ });
+
test('should match snapshot on default data', () => {
- const wrapper = shallow(
+ const {container} = renderWithContext(
-
-