Migration typescript/enterprise/ldap (#25840)
* refactor: migrate file ldap_group_sync_spec.js to ts - migrate file to typescript * refactor: migrate file ldap_guest_spec.ts to ts - migrate file to typescript - update data types * refactor: migrate ldap_login_spec.js to ts * refactor: migrate ldap_setting_spec.js file to ts - convert file to typescript * Fix: type error --------- Co-authored-by: Mattermost Build <build@mattermost.com> Co-authored-by: yasserfaraazkhan <attitude3cena.yf@gmail.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
1e794136c8
Коммит
0aaa047ea3
@@ -10,9 +10,13 @@
|
||||
// Stage: @prod
|
||||
// Group: @channels @enterprise @ldap
|
||||
|
||||
import {Channel} from '@mattermost/types/channels';
|
||||
import {Team} from '@mattermost/types/teams';
|
||||
import {UserProfile} from '@mattermost/types/users';
|
||||
import {AdminConfig} from '@mattermost/types/config';
|
||||
import * as TIMEOUTS from '../../../../fixtures/timeouts';
|
||||
|
||||
function setLDAPTestSettings(config) {
|
||||
function setLDAPTestSettings(config: AdminConfig) {
|
||||
return {
|
||||
siteName: config.TeamSettings.SiteName,
|
||||
siteUrl: config.ServiceSettings.SiteURL,
|
||||
@@ -25,9 +29,9 @@ function setLDAPTestSettings(config) {
|
||||
// assumes that E20 license is uploaded
|
||||
// for setup with AWS: Follow the instructions mentioned in the mattermost/platform-private/config/ldap-test-setup.txt file
|
||||
context('ldap', () => {
|
||||
let testChannel;
|
||||
let testTeam;
|
||||
let testUser;
|
||||
let testChannel: Channel;
|
||||
let testTeam: Team;
|
||||
let testUser: UserProfile;
|
||||
|
||||
describe('LDAP Group Sync Automated Tests', () => {
|
||||
beforeEach(() => {
|
||||
@@ -161,7 +165,7 @@ context('ldap', () => {
|
||||
});
|
||||
|
||||
it('MM-T2621 - Team List Management Column', () => {
|
||||
let testTeam2;
|
||||
let testTeam2: Team;
|
||||
|
||||
// # Go to testTeam config page
|
||||
cy.visit(`/admin_console/user_management/teams/${testTeam.id}`);
|
||||
@@ -14,6 +14,7 @@ import ldapUsers from '../../../../fixtures/ldap_users.json';
|
||||
import * as TIMEOUTS from '../../../../fixtures/timeouts';
|
||||
import {getAdminAccount} from '../../../../support/env';
|
||||
import {getRandomId} from '../../../../utils';
|
||||
import {UserProfile} from '@mattermost/types/users';
|
||||
|
||||
// assumes that E20 license is uploaded
|
||||
// for setup with AWS: Follow the instructions mentioned in the mattermost/platform-private/config/ldap-test-setup.txt file
|
||||
@@ -41,7 +42,7 @@ describe('LDAP guest', () => {
|
||||
});
|
||||
|
||||
// # Get user1 data
|
||||
cy.apiLogin(user1).then(({user}) => {
|
||||
cy.apiLogin(user1 as unknown as UserProfile).then((user) => {
|
||||
user1Data = user;
|
||||
|
||||
// # Remove user1 from all the teams
|
||||
@@ -49,7 +50,7 @@ describe('LDAP guest', () => {
|
||||
});
|
||||
|
||||
// # Get user2 data
|
||||
cy.apiLogin(user2).then(({user}) => {
|
||||
cy.apiLogin(user2 as unknown as UserProfile).then((user) => {
|
||||
user2Data = user;
|
||||
|
||||
// # Remove user2 fromm all the teams
|
||||
@@ -262,13 +263,15 @@ function demoteUserToGuest(user) {
|
||||
});
|
||||
}
|
||||
|
||||
function removeUserFromAllTeams(user) {
|
||||
function removeUserFromAllTeams(user: { id: string }) {
|
||||
// # Get all teams of a user
|
||||
cy.apiGetTeamsForUser(user.id).then(({teams}) => {
|
||||
cy.apiGetTeamsForUser(user.id).then((teams) => {
|
||||
// # Remove user from all the teams
|
||||
teams.forEach((team) => {
|
||||
cy.apiDeleteUserFromTeam(team.id, user.id);
|
||||
});
|
||||
if (teams.length > 0) {
|
||||
teams.forEach((team: { id: string }) => {
|
||||
cy.apiDeleteUserFromTeam(team.id, user.id);
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
@@ -158,7 +158,7 @@ context('ldap', () => {
|
||||
before(() => {
|
||||
cy.apiAdminLogin();
|
||||
|
||||
cy.apiGetTeamByName(testSettings.teamName).then(({team}) => {
|
||||
cy.apiGetTeamByName(testSettings.teamName).then((team) => {
|
||||
cy.apiGetChannelByName(testSettings.teamName, 'town-square').then(({channel}) => {
|
||||
cy.apiGetUserByEmail(guest1.email).then(({user}) => {
|
||||
cy.apiAddUserToTeam(team.id, user.id).then(() => {
|
||||
@@ -220,7 +220,7 @@ function setLDAPTestSettings(config) {
|
||||
}
|
||||
|
||||
function disableOnboardingTaskList(ldapLogin) {
|
||||
cy.apiLogin(ldapLogin).then(({user}) => {
|
||||
cy.apiLogin(ldapLogin).then((user) => {
|
||||
cy.apiSaveOnboardingTaskListPreference(user.id, 'onboarding_task_list_open', 'false');
|
||||
cy.apiSaveOnboardingTaskListPreference(user.id, 'onboarding_task_list_show', 'false');
|
||||
cy.apiSaveSkipStepsPreference(user.id, 'true');
|
||||
@@ -228,13 +228,15 @@ function disableOnboardingTaskList(ldapLogin) {
|
||||
}
|
||||
|
||||
function removeUserFromAllTeams(testUser) {
|
||||
cy.apiGetUsersByUsernames([testUser.username]).then(({users}) => {
|
||||
users.forEach((user) => {
|
||||
cy.apiGetTeamsForUser(user.id).then(({teams}) => {
|
||||
teams.forEach((team) => {
|
||||
cy.apiDeleteUserFromTeam(team.id, user.id);
|
||||
cy.apiGetUsersByUsernames([testUser.username]).then((users) => {
|
||||
if (users.length > 0) {
|
||||
users.forEach((user) => {
|
||||
cy.apiGetTeamsForUser(user.id).then((teams) => {
|
||||
teams.forEach((team) => {
|
||||
cy.apiDeleteUserFromTeam(team.id, user.id);
|
||||
});
|
||||
});
|
||||
});
|
||||
});
|
||||
}
|
||||
});
|
||||
}
|
||||
Ссылка в новой задаче
Block a user