upstream/mattermost
1
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-05-28 04:35:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 20

Merge 16081e075b into 7e75035cb6

Browse source
This commit is contained in:
arya rizky 2026-05-23 03:04:37 +02:00 committed by GitHub
commit c7bbdef569
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
webapp/channels/src/components/team_settings/team_access_tab/allowed_domains_select.tsx
View file

@ -71,7 +71,7 @@ const AllowedDomainsSelect = ({allowedDomains, setAllowedDomains, setHasChanges,
onChange={handleOnChangeDomains}
handleNewSelection={updateAllowedDomains}
isClearable={false}
description={formatMessage({id: 'general_tab.AllowedDomainsTip', defaultMessage: 'Seperate multiple domains with a space, comma, tab or enter.'})}
description={formatMessage({id: 'general_tab.AllowedDomainsTip', defaultMessage: 'Separate multiple domains with a space, comma, tab or enter.'})}
/>
}
</>

4
webapp/channels/src/components/team_settings/team_access_tab/team_access_tab.test.tsx
View file

@ -81,14 +81,14 @@ describe('components/TeamSettings', () => {
test('should not show allowed domains input if allowed domains is empty', () => {
const props = {...defaultProps, team: TestHelper.getTeamMock({allowed_domains: ''})};
renderWithContext(<AccessTab {...props}/>);
const allowedDomainsInput = screen.queryByText('Seperate multiple domains with a space, comma, tab or enter.');
const allowedDomainsInput = screen.queryByText('Separate multiple domains with a space, comma, tab or enter.');
expect(allowedDomainsInput).toBeNull();
});
test('should show allowed domains input if allowed domains is not empty', () => {
const props = {...defaultProps, team: TestHelper.getTeamMock({allowed_domains: 'test.com'})};
renderWithContext(<AccessTab {...props}/>);
const allowedDomainsInput = screen.getByText('Seperate multiple domains with a space, comma, tab or enter.');
const allowedDomainsInput = screen.getByText('Separate multiple domains with a space, comma, tab or enter.');
expect(allowedDomainsInput).toBeInTheDocument();
const allowedDomainsInputValue = screen.getByText('test.com');
expect(allowedDomainsInputValue).toBeInTheDocument();