MM-21319 : Migrate "/integration/enterprise/ldap_group" e2e tests to…

… TypeScript (#11308) Automatic Merge
mattermost · Oct 15, 2022 · 0a85176 · 0a85176
1 parent b3e92e4
commit 0a85176
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 5 deletions.
diff --git a/...terprise/ldap_group/channel_modes_spec.js → ...terprise/ldap_group/channel_modes_spec.ts b/...terprise/ldap_group/channel_modes_spec.js → ...terprise/ldap_group/channel_modes_spec.ts
diff --git a/...erprise/ldap_group/group_mentions_spec.js → ...erprise/ldap_group/group_mentions_spec.ts b/...erprise/ldap_group/group_mentions_spec.js → ...erprise/ldap_group/group_mentions_spec.ts
diff --git a/...se/ldap_group/groups_assign_roles_spec.js → ...se/ldap_group/groups_assign_roles_spec.ts b/...se/ldap_group/groups_assign_roles_spec.js → ...se/ldap_group/groups_assign_roles_spec.ts
@@ -69,7 +69,8 @@ describe('LDAP Group Sync', () => {
             if (el.text().includes('Edit')) {
                 cy.get('#developers_edit').then((buttonEl) => {
                     // # Get the Group ID and remove all the teams and channels currently attached to it then click the button
-                    const groupId = buttonEl[0].href.match(/\/(?:.(?!\/))+$/)[0].substring(1);
+                    const anchorElement = buttonEl[0] as HTMLAnchorElement;
+                    const groupId = anchorElement.href.match(/\/(?:.(?!\/))+$/)[0].substring(1);
                     getTeamsAssociatedToGroupAndUnlink(groupId);
                     getChannelsAssociatedToGroupAndUnlink(groupId);
                     cy.get('#developers_edit').click();
@@ -82,7 +83,8 @@ describe('LDAP Group Sync', () => {
 
                 // # Get the Group ID and remove all the teams and channels currently attached to it then click the button
                 cy.get('#developers_configure').then((buttonEl) => {
-                    const groupId = buttonEl[0].href.match(/\/(?:.(?!\/))+$/)[0].substring(1);
+                    const anchorElement = buttonEl[0] as HTMLAnchorElement;
+                    const groupId = anchorElement.href.match(/\/(?:.(?!\/))+$/)[0].substring(1);
                     getTeamsAssociatedToGroupAndUnlink(groupId);
                     getChannelsAssociatedToGroupAndUnlink(groupId);
                     cy.get('#developers_configure').click();
@@ -110,7 +112,8 @@ describe('LDAP Group Sync', () => {
 
         cy.get('#team_and_channel_membership_table').then((el) => {
             // * Ensure that the text in the roles column is Member as default text for each row
-            const name = el[0].rows[1].cells[0].innerText;
+            const table = el[0] as HTMLTableElement;
+            const name = table.rows[1].cells[0].innerText;
             cy.findByTestId(`${name}_current_role`).scrollIntoView().should('contain.text', 'Member');
 
             // # Change the option to the admin roles (Channel Admin/Team Admin) for each row

diff --git a/.../enterprise/ldap_group/invite_bot_spec.js → .../enterprise/ldap_group/invite_bot_spec.ts b/.../enterprise/ldap_group/invite_bot_spec.js → .../enterprise/ldap_group/invite_bot_spec.ts
@@ -43,7 +43,12 @@ describe('Group Synced Team - Bot invitation flow', () => {
 
         // # Logout sysadmin and login as an LDAP Group synced user
         cy.apiLogout();
-        cy.apiLogin({username: 'test.one', password: 'Password1'});
+
+        const user = {
+            username: 'test.one',
+            password: 'Password1',
+        } as Cypress.UserProfile;
+        cy.apiLogin(user);
 
         // # Visit the group constrained team
         cy.visit(`/${groupConstrainedTeam.name}`);

diff --git a/...rprise/ldap_group/search_channels_spec.js → ...rprise/ldap_group/search_channels_spec.ts b/...rprise/ldap_group/search_channels_spec.js → ...rprise/ldap_group/search_channels_spec.ts
diff --git a/...oup/team_and_channel_assign_roles_spec.js → ...oup/team_and_channel_assign_roles_spec.ts b/...oup/team_and_channel_assign_roles_spec.js → ...oup/team_and_channel_assign_roles_spec.ts
diff --git a/e2e/cypress/tests/support/api/preference.d.ts b/e2e/cypress/tests/support/api/preference.d.ts
@@ -95,6 +95,13 @@ declare namespace Cypress {
          */
         apiSaveCRTPreference(userId: string, value: string): Chainable<Response>;
 
+        /**
+         * Saves tutorial step of a user
+         * @param {string} userId - User ID
+         * @param {string} value - value of tutorial step, e.g. '999' (default, completed tutorial)
+         */
+        apiSaveTutorialStep(userId: string, value: string): Chainable<Response>;
+
         /**
          * Save cloud trial banner preference.
          * See https://api.mattermost.com/#tag/preferences/paths/~1users~1{user_id}~1preferences/put

diff --git a/e2e/cypress/tests/support/api/team.d.ts b/e2e/cypress/tests/support/api/team.d.ts
@@ -111,7 +111,7 @@ declare namespace Cypress {
          *       // do something with teams
          *   });
          */
-        apiGetAllTeams(queryParams: Record<string, any>): Chainable<Team[]>;
+        apiGetAllTeams(queryParams?: Record<string, any>): Chainable<{teams: Team[]}>;
 
         /**
          * Get a list of teams that a user is on.