This text should render in a code blockThis text should render in a code blockThe following markdown should render within the block quote:
--`; + const expectedHtml = `Heading 4
Italics, Italics, Bold, Bold-italics, Bold-italics,
-Strikethrough-:slightly_smiling_face: :slightly_smiling_face: :wink: :scream: :bamboo: :gift_heart: :dolls:
The following markdown should render within the block quote:
\n\n`; // # Post markdown message - cy.postMessageFromFile('markdown/markdown_block_quotes_2.md').wait(TIMEOUTS.FIVE_SEC); + cy.postMessageFromFile('markdown/markdown_block_quotes_2.md').wait(TIMEOUTS.TWO_SEC); // * Verify that HTML Content is correct cy.getLastPostId().then((postId) => { diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/ctrl_cmd_k_open_dm_with_mouse_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/ctrl_cmd_k_open_dm_with_mouse_spec.js index e5aeeba87d..44deb6326b 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/ctrl_cmd_k_open_dm_with_mouse_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/ctrl_cmd_k_open_dm_with_mouse_spec.js @@ -57,7 +57,7 @@ describe('Messaging', () => { cy.get('.channel-intro__text'). should('be.visible'). and('contain', `This is the start of your direct message history with ${secondUser.username}.`). - and('contain', 'Direct messages and files shared here are not shown to people outside this area.'); + and('contain', 'Messages and files shared here are not shown to anyone else.'); }); // # Verify that the focus is on the message box diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_followed_by_punctuation_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_followed_by_punctuation_spec.js index 4fac4d1cee..b6a7742fec 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_followed_by_punctuation_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_followed_by_punctuation_spec.js @@ -15,7 +15,7 @@ function emojiVerification(postId) { const postMessageTextId = `#postMessageText_${postId}`; // * Check for the emoji attr of :) is exists - cy.get(`${postMessageTextId} p span span.emoticon`).should('have.attr', 'title', ':slightly_smiling_face:'); + cy.get(`${postMessageTextId} p span span.emoticon`).should('have.attr', 'alt', ':slightly_smiling_face:'); // * Check for the punctuation('=') is exists without space cy.get(`${postMessageTextId} p`).should('same.text', ':slightly_smiling_face:='); diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_insert_position_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_insert_position_spec.js index d5beacbc5e..eb0189b983 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_insert_position_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_insert_position_spec.js @@ -36,6 +36,6 @@ describe('Messaging', () => { cy.uiGetPostTextBox().type('{enter}'); // * The emoji should be displayed in the post at the position inserted. - cy.getLastPost().find('p').should('have.html', `Hello :grinning: World!`); + cy.getLastPost().find('p').should('have.html', `Hello :grinning: World!`); }); }); diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_keyboard_entry_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_keyboard_entry_spec.js index 39102fa35e..7bc5cfb3db 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_keyboard_entry_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_keyboard_entry_spec.js @@ -99,7 +99,7 @@ describe('MM-T154 Use keyboard navigation in emoji picker', () => { cy.uiGetPostTextBox().type('{enter}'); // * Compare selected emoji with last post - cy.getLastPost().find('.emoticon').should('have.attr', 'title', selectedEmoji); + cy.getLastPost().find('.emoticon').should('have.attr', 'alt', selectedEmoji); }); }); }); diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_skin_tone_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_skin_tone_spec.js index 8029f9475e..c179017199 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_skin_tone_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_skin_tone_spec.js @@ -42,13 +42,15 @@ describe('Messaging', () => { cy.postMessage(gesture + skinTone); // * Check if gesture with skin tone is visible - cy.findByTitle(gesture + skinTone).should('be.visible'); + cy.getLastPost().within(() => { + cy.get('span[data-emoticon] span').should('be.visible').should('have.attr', 'alt', gesture + skinTone); + }); // # Set viewport to mobile cy.viewport('iphone-se2'); // * Check if gesture with skin tone is visible - cy.findByTitle(gesture + skinTone).should('be.visible'); + cy.get('span[data-emoticon] span').should('be.visible'); }); }); }); diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_to_markdown_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_to_markdown_spec.js index a3bdc0fed2..4fd73e526c 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/emoji_to_markdown_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/emoji_to_markdown_spec.js @@ -69,7 +69,8 @@ function createAndVerifyMessage(message, isCode) { cy.get('@' + alias). children().should('have.class', 'all-emoji'). children().find('span').last().should('have.class', 'emoticon'). - and('have.attr', 'title', message.trim() === ':D' ? ':smile:' : ':taco:'); + and('have.attr', 'alt', message.trim() === ':D' ? ':smile:' : ':taco:'). + and('have.text', message.trim() === ':D' ? ':smile:' : ':taco:'); }); } } diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/focus_move_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/focus_move_spec.js index b85d382ef7..77851c6d15 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/focus_move_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/focus_move_spec.js @@ -157,7 +157,7 @@ function verifyFocusInAddChannelMemberModal() { cy.get('#selectItems input').should('have.value', 'A'); // # Click anywhere in the modal that is not on a field that can take focus - cy.get('.channel-invite__header').click(); + cy.get('#deletePostModalLabel > span').click(); // * Note the focus has been removed from the search box cy.get('#selectItems input').should('not.be.focused'); diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_parse_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_parse_spec.js index a256740dd5..a6e6bb7fde 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/message_parse_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_parse_spec.js @@ -43,7 +43,7 @@ describe('Messaging', () => { function verifyPostedMessage(postId, text) { cy.get(`#postMessageText_${postId}`).should('be.visible').within((el) => { cy.wrap(el).should('have.text', text); - cy.get('.emoticon').should('be.visible').and('have.attr', 'title', ':confused:'); + cy.get('.emoticon').should('be.visible').and('have.attr', 'alt', ':confused:').and('have.text', ':confused:'); }); } }); diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/message_reaction_gm_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/message_reaction_gm_spec.js index 968cd5659a..7ac353d460 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/message_reaction_gm_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/message_reaction_gm_spec.js @@ -79,7 +79,7 @@ describe('Emoji reactions to posts/messages in GM channels', () => { cy.viewport('iphone-6'); // * Verify that the Add Reaction button is once again visible - cy.findByLabelText('Add a reaction').should('be.visible'); + cy.findByLabelText('Add a reaction').scrollIntoView().should('be.visible'); }); }); }); diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/permalink_loading_indicator_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/permalink_loading_indicator_spec.js index 7d92d9a467..ab2f45d4fb 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/permalink_loading_indicator_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/permalink_loading_indicator_spec.js @@ -72,7 +72,7 @@ describe('Messaging', () => { cy.wait(TIMEOUTS.FIVE_SEC).url().should('include', `/${testTeam.name}/channels/${testPrivateChannel.name}`).and('not.include', `/${permalinkPostId}`); // * Check if the matching channel intro title is visible - cy.get('#channelIntro').contains('.channel-intro__title', `Beginning of ${testPrivateChannel.display_name}`).scrollIntoView().should('be.visible'); + cy.get('#channelIntro').contains('p.channel-intro__text', `This is the start of ${testPrivateChannel.display_name}`).scrollIntoView().should('be.visible'); }); // # Get last post id from open channel diff --git a/e2e-tests/cypress/tests/integration/channels/messaging/reactions_spec.js b/e2e-tests/cypress/tests/integration/channels/messaging/reactions_spec.js index 8a7bd33e7f..53b96c98d8 100644 --- a/e2e-tests/cypress/tests/integration/channels/messaging/reactions_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/messaging/reactions_spec.js @@ -114,7 +114,8 @@ describe('Messaging', () => { it('MM-T2195 Emoji reaction - not available on system message Save - not available on system message Pin - not available on system message Can delete your own system message', () => { // # Click add a channel header - cy.findByRoleExtended('button', {name: 'Add a channel header'}).should('be.visible').click(); + cy.get('button.header-placeholder').invoke('show').trigger('mouseover'); + cy.findByRoleExtended('button', {name: 'Add a channel header'}).trigger('mouseover').should('be.visible').click(); // # Add or update a channel header cy.get('#editChannelHeaderModalLabel').should('be.visible'); diff --git a/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/gm_header_spec.js b/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/gm_header_spec.js index 7adc6a55cb..b2fe2d8b34 100644 --- a/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/gm_header_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/multi_team_and_dm/gm_header_spec.js @@ -48,6 +48,7 @@ describe('Multi-user group header', () => { cy.visit(`/${testTeam.name}/channels/${groupChannel.name}`); // * no channel header is set + cy.get('button.header-placeholder').invoke('show').trigger('mouseover'); cy.contains('#channelHeaderDescription button span', 'Add a channel header').should('be.visible'); // # click add a channel heander diff --git a/e2e-tests/cypress/tests/integration/channels/settings/display/message_display_mode_colorize_username_spec.js b/e2e-tests/cypress/tests/integration/channels/settings/display/message_display_mode_colorize_username_spec.js index 51057f7c9c..b7a5cbb07d 100644 --- a/e2e-tests/cypress/tests/integration/channels/settings/display/message_display_mode_colorize_username_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/settings/display/message_display_mode_colorize_username_spec.js @@ -141,7 +141,7 @@ function goToMessageDisplaySetting() { // # Go to Settings modal - Display section - Message Display cy.uiOpenSettingsModal('Display').within(() => { cy.get('#displayButton').scrollIntoView().click(); - cy.get('#message_displayEdit').should('be.visible'); + cy.get('#message_displayEdit').scrollIntoView().should('be.visible'); cy.get('#message_displayEdit').click(); }); } diff --git a/e2e-tests/cypress/tests/integration/channels/settings/display/theme/code_theme_colors_spec.js b/e2e-tests/cypress/tests/integration/channels/settings/display/theme/code_theme_colors_spec.js index 9a4d883e44..45f09a9967 100644 --- a/e2e-tests/cypress/tests/integration/channels/settings/display/theme/code_theme_colors_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/settings/display/theme/code_theme_colors_spec.js @@ -38,7 +38,7 @@ describe('Settings > Display > Theme > Custom Theme Colors', () => { cy.get('#centerChannelStyles').click({force: true}).wait(TIMEOUTS.ONE_HUNDRED_MILLIS); // # Select custom code theme - cy.get('#codeThemeSelect').scrollIntoView().should('be.visible').select(theme.name); + cy.get('#codeThemeSelect').should('be.visible').scrollIntoView().select(theme.name); // * Verify that the setting changes in the background? verifyLastPostStyle(theme); diff --git a/e2e-tests/cypress/tests/integration/channels/settings/display/theme/settings_view_spec.js b/e2e-tests/cypress/tests/integration/channels/settings/display/theme/settings_view_spec.js index 5264caf8a7..c914b7676c 100644 --- a/e2e-tests/cypress/tests/integration/channels/settings/display/theme/settings_view_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/settings/display/theme/settings_view_spec.js @@ -36,10 +36,10 @@ function verifyMinDisplayView() { cy.get('#clockTitle').should('be.visible', 'contain', 'Clock Display'); cy.get('#clockEdit').should('be.visible', 'contain', 'Edit'); - cy.get('#name_formatTitle').should('be.visible', 'contain', 'Teammate Name Display'); + cy.get('#name_formatTitle').scrollIntoView().should('be.visible', 'contain', 'Teammate Name Display'); cy.get('#name_formatEdit').should('be.visible', 'contain', 'Edit'); - cy.get('#collapseTitle').should('be.visible', 'contain', 'Default appearance of image previews'); + cy.get('#collapseTitle').scrollIntoView().should('be.visible', 'contain', 'Default appearance of image previews'); cy.get('#collapseEdit').should('be.visible', 'contain', 'Edit'); cy.get('#message_displayTitle').scrollIntoView().should('be.visible', 'contain', 'Message Display'); diff --git a/e2e-tests/cypress/tests/integration/channels/signin_authentication/login_open_server_spec.js b/e2e-tests/cypress/tests/integration/channels/signin_authentication/login_open_server_spec.js index 213f662c13..c4219a7947 100644 --- a/e2e-tests/cypress/tests/integration/channels/signin_authentication/login_open_server_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/signin_authentication/login_open_server_spec.js @@ -62,7 +62,7 @@ describe('Login page with open server', () => { cy.findByText('Forgot your password?').should('exist').and('be.visible').should('have.attr', 'href', '/reset_password'); // * Verify create an account link is present - cy.findByText('Don\'t have an account?').should('exist').and('be.visible').should('have.attr', 'href', '/signup_user_complete'); + cy.findByText('Don\'t have an account?').should('exist').and('be.visible').should('have.attr', 'href').and('contain', '/signup_user_complete'); // # Move inside of footer section cy.get('.hfroute-footer').should('exist').and('be.visible').within(() => { @@ -75,19 +75,19 @@ describe('Login page with open server', () => { // * Check if about footer link is present cy.findByText('About').should('exist'). - and('have.attr', 'href', config.SupportSettings.AboutLink || ABOUT_LINK); + and('have.attr', 'href').and('contain', config.SupportSettings.AboutLink || ABOUT_LINK); // * Check if privacy footer link is present cy.findByText('Privacy Policy').should('exist'). - and('have.attr', 'href', config.SupportSettings.PrivacyPolicyLink || PRIVACY_POLICY_LINK); + and('have.attr', 'href').and('contain', config.SupportSettings.PrivacyPolicyLink || PRIVACY_POLICY_LINK); // * Check if terms footer link is present cy.findByText('Terms').should('exist'). - and('have.attr', 'href', config.SupportSettings.TermsOfServiceLink || TERMS_OF_SERVICE_LINK); + and('have.attr', 'href').and('contain', config.SupportSettings.TermsOfServiceLink || TERMS_OF_SERVICE_LINK); // * Check if help footer link is present cy.findByText('Help').should('exist'). - and('have.attr', 'href', config.SupportSettings.HelpLink || HELP_LINK); + and('have.attr', 'href').and('contain', config.SupportSettings.HelpLink || HELP_LINK); const todaysDate = new Date(); const currentYear = todaysDate.getFullYear(); diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/environment_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/environment_spec.js index 20cbb70309..1fe8f8c5bb 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/environment_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/environment_spec.js @@ -39,14 +39,8 @@ describe('Environment', () => { // * Check that the 'Team Settings' modal was opened cy.get('#teamSettingsModal').should('exist').within(() => { - // clicking on edit button - cy.get('#team_iconEdit').should('be.visible').click(); - - // verify the settings picture button is visible to click - cy.findByTestId('inputSettingPictureButton').should('be.visible').click(); - - // * Before uploading the picture the save button must be disabled - cy.uiSaveButton().should('be.disabled'); + // # Verify upload icon button is visible + cy.get('i[title="Edit Icon"]').should('be.visible'); // # Upload a file on center view cy.findByTestId('uploadPicture').attachFile(mattermostIcon); @@ -89,14 +83,8 @@ describe('Environment', () => { // * Check that the 'Team Settings' modal was opened cy.get('#teamSettingsModal').should('exist').within(() => { - // clicking on edit button - cy.get('#team_iconEdit').should('be.visible').click(); - - // verify the settings picture button is visible to click - cy.findByTestId('inputSettingPictureButton').should('be.visible').click(); - - // * Before uploading the picture the save button must be disabled - cy.uiSaveButton().should('be.disabled'); + // # Verify upload icon button is visible + cy.get('i[title="Edit Icon"]').should('be.visible'); // # Upload a file on center view cy.findByTestId('uploadPicture').attachFile(mattermostIcon); @@ -139,14 +127,8 @@ describe('Environment', () => { // * Check that the 'Team Settings' modal was opened cy.get('#teamSettingsModal').should('exist').within(() => { - // clicking on edit button - cy.get('#team_iconEdit').should('be.visible').click(); - - // verify the settings picture button is visible to click - cy.findByTestId('inputSettingPictureButton').should('be.visible').click(); - - // * Before uploading the picture the save button must be disabled - cy.uiSaveButton().should('be.disabled'); + // # Verify upload icon button is visible + cy.get('i[title="Edit Icon"]').should('be.visible'); // # Upload a file on center view cy.findByTestId('uploadPicture').attachFile(mattermostIcon); diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/inactive_users_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/inactive_users_spec.js index a1b1ad3b90..b4318129d0 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/inactive_users_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/inactive_users_spec.js @@ -23,8 +23,10 @@ describe('System Console', () => { // # Go to users management page cy.visit('/admin_console/user_management/users'); - // # Select inactive users - cy.get('#selectUserStatus').select('Inactive'); + // # Select Deactivated users + cy.get('div.systemUsersFilterContainer button').click(); + cy.get('#DropdownInput_filterStatus').click(); + cy.get('#react-select-5-option-2').click(); cy.apiGetAnalytics().then(({analytics}) => { const inactiveUsers = analytics.filter((d) => { diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/main_menu_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/main_menu_spec.js index e350a43809..dbc79e0c9d 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/main_menu_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/main_menu_spec.js @@ -19,11 +19,16 @@ describe('Main menu', () => { }); const verifyLink = (text, link) => { + cy.get('li.MenuItem'). + contains(text). + scrollIntoView(). + // * Verify link opens in new tab - cy.get('a[href="' + link + '"]').scrollIntoView().should('have.attr', 'target', '_blank'); + should('have.attr', 'target', '_blank'). // * Verify link text matches correct href value - cy.get('a[href="' + link + '"]').contains(text); + should('have.attr', 'href'). + and('contain', link); }; it('MM-T909 Can switch to team', () => { diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/reporting/team_statistics_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/reporting/team_statistics_spec.js index 36e8aa5951..c33dba9ac5 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/reporting/team_statistics_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/reporting/team_statistics_spec.js @@ -38,7 +38,7 @@ describe('System Console > Team Statistics', () => { cy.get('.grid-statistics__card').should('have.length', 4); // * Check that the title content for the stats is as expected. - cy.get('.admin-console__content').eq(0).find('.title').eq(0).should('contain', 'Total Active Users'); + cy.get('.admin-console__content').eq(0).find('.title').eq(0).should('contain', 'Total Activated Users'); cy.get('.admin-console__content').eq(0).find('.title').eq(1).should('contain', 'Public Channels'); cy.get('.admin-console__content').eq(0).find('.title').eq(2).should('contain', 'Private Channels'); cy.get('.admin-console__content').eq(0).find('.title').eq(3).should('contain', 'Total Posts'); diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/announcement_banner_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/announcement_banner_spec.js index 4cb0be105d..d310a59c91 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/announcement_banner_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/announcement_banner_spec.js @@ -34,7 +34,7 @@ describe('Announcement Banner', () => { cy.findByTestId('AnnouncementSettings.EnableBanner'). should('be.visible'). within(() => { - cy.findByText('true'). + cy.findByTestId('AnnouncementSettings.EnableBannertrue'). should('be.visible'). click({force: true}); }); @@ -75,7 +75,7 @@ describe('Announcement Banner', () => { cy.findByTestId('AnnouncementSettings.AllowBannerDismissal'). should('be.visible'). within(() => { - cy.findByText('true'). + cy.findByTestId('AnnouncementSettings.AllowBannerDismissaltrue'). should('be.visible'). click({force: true}); }); diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/customization_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/customization_spec.js index da7e1a33df..e3129921d7 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/customization_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/customization_spec.js @@ -11,6 +11,7 @@ // Group: @channels @system_console import * as TIMEOUTS from '../../../../fixtures/timeouts'; +import {getRandomId} from '../../../../utils'; describe('Customization', () => { beforeEach(() => { @@ -46,8 +47,8 @@ describe('Customization', () => { cy.url().should('include', '/login'); // * Ensure Site Name and Description are shown the updated values in the login screen - cy.findByRole('link', {name: siteName}).should('be.visible'); - cy.get('.login-body-card-title').should('have.text', siteDescription); + cy.get('div.header-main a').should('be.visible').should('have.text', siteName); + cy.get('p.login-body-card-title').should('have.text', siteDescription); }); it('MM-T1025 - Site Name - Product Menu ➜ About and About Modal show custom name', () => { @@ -156,6 +157,8 @@ describe('Customization', () => { }); it('MM-T1029 - Custom branding text can render markdown text', () => { + const emojiText = getRandomId(3); + // # Visit emoji system console page cy.visit('/admin_console/site_config/emoji'); cy.get('.admin-console__header').should('be.visible').and('have.text', 'Emoji'); @@ -173,7 +176,7 @@ describe('Customization', () => { // * Ensure the form is visible cy.get('.backstage-form').should('be.visible').within(() => { // # Fill the emoji data - cy.get('input#name').clear().type('yay'); + cy.get('input#name').clear().type(emojiText); cy.get('input#select-emoji').attachFile('mattermost-icon.png'); // # Save emoji @@ -189,7 +192,7 @@ describe('Customization', () => { cy.get('.admin-console__header').should('be.visible').and('have.text', 'Customization'); // eslint-disable-next-line no-irregular-whitespace - const customBrandText = `:yay: + const customBrandText = `:${emojiText}: :smile: - This is a bullet point @@ -214,12 +217,8 @@ describe('Customization', () => { cy.url().should('include', '/login'); cy.get('.login-body-custom-branding-markdown').first().scrollIntoView().should('be.visible').within(() => { - // * Ensure custom emoji has been rendered - // ToDo: uncomment after fixing MM-12657 - //cy.get('span.emoticon').should('have.attr', 'title', ':yay:'); - // * Ensure default emoji has been rendered - cy.get('span.emoticon').should('have.attr', 'title', ':smile:'); + cy.get('span.emoticon').should('have.attr', 'alt', ':smile:'); // * Ensure the list and two bullets have been rendered cy.get('ul.markdown__list').should('be.visible').within(() => { @@ -306,7 +305,7 @@ describe('Customization', () => { cy.url().should('include', '/login'); // * Ensure that the custom Site Name is shown - cy.findByRole('link', {name: siteName}).should('be.visible'); + cy.get('div.header-main a').should('be.visible').should('have.text', siteName); // # Log back in as an administrator cy.apiAdminLogin(); diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_cloud_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_cloud_spec.js index cd9107b47c..4d971baa75 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_cloud_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/site_configuration/link_customization_cloud_spec.js @@ -28,14 +28,15 @@ describe('SupportSettings', () => { // * Verify links changed [ {text: 'Ask the community', link: SupportSettings.ASK_COMMUNITY_LINK}, - {text: 'Help resources', link: SupportSettings.HELP_LINK}, + {text: 'Mattermost user guide', link: SupportSettings.MATTERMOST_USER_GUIDE}, {text: 'Report a problem', link: SupportSettings.REPORT_A_PROBLEM_LINK}, {text: 'Keyboard shortcuts'}, ].forEach(({text, link}) => { if (link) { cy.findByText(text). parent(). - should('have.attr', 'href', link); + should('have.attr', 'href'). + and('contain', link); } else { cy.findByText(text); } @@ -58,7 +59,8 @@ describe('SupportSettings', () => { // * Verify that links are correct at login page guides.forEach((guide) => { cy.findByText(guide.text). - should('have.attr', 'href', guide.link); + should('have.attr', 'href'). + and('contain', guide.link); }); // # Visit signup page @@ -68,7 +70,8 @@ describe('SupportSettings', () => { // * Verify that links are correct at signup page guides.forEach((guide) => { cy.findByText(guide.text). - should('have.attr', 'href', guide.link); + should('have.attr', 'href'). + and('contain', guide.link); }); }); }); diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/user_management/users_deactivation_not_cloud_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/user_management/users_deactivation_not_cloud_spec.js index 51d4e2cf8f..e591eb6aa2 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/user_management/users_deactivation_not_cloud_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/user_management/users_deactivation_not_cloud_spec.js @@ -35,31 +35,28 @@ describe('System Console > User Management > Deactivation', () => { cy.findByPlaceholderText('Search users').should('be.visible').clear().type(testUser.email).wait(TIMEOUTS.HALF_SEC); // * Verify that user is listed - cy.findByText(`@${testUser.username}`).should('be.visible'); + cy.findByText(`${testUser.username}`).should('be.visible'); - // # Scan on the first item's row in the list - cy.findByTestId('userListRow').should('be.visible').within(() => { - // * Verify before deactivation email is visible - cy.findByText(testUser.email).should('be.visible'); + // * Verify before deactivation email is visible + cy.get('#systemUsersTable-cell-0_emailColumn').should('be.visible').should('have.text', testUser.email); - // # Open the actions menu. - cy.findByText('Member').click().wait(TIMEOUTS.HALF_SEC); + // # Open the actions menu. + cy.get('#actionMenuButton-systemUsersTable-0').should('have.text', 'Member').click().wait(TIMEOUTS.HALF_SEC); - // # Click on deactivate menu button - cy.findByLabelText('User Actions Menu').findByText('Deactivate').click(); - }); + // # Click on deactivate menu button + cy.get('#actionMenuItem-systemUsersTable-0-deactivate').should('have.text', 'Deactivate').click(); // # Click confirm deactivate in the modal cy.get('.a11y__modal').should('exist').and('be.visible').within(() => { cy.findByText('Deactivate').should('be.visible').click(); }); - cy.findByTestId('userListRow').should('be.visible').within(() => { - // * Verify that the user is now inactive - cy.findByText('Inactive').should('be.visible'); + cy.get('#actionMenuButton-systemUsersTable-0').should('have.text', 'Deactivated').should('be.visible'); - // * Verify once again if email is visible - cy.findByText(testUser.email).should('be.visible'); - }); + // * Verify once again if email is visible + cy.findByText(testUser.email).should('be.visible'); + + // * Verify once again if email is visible + cy.get('#systemUsersTable-cell-0_emailColumn').should('be.visible').should('have.text', testUser.email); }); }); diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/user_management_not_cloud_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/user_management_not_cloud_spec.js index e19b5df5fc..583d62b0e9 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/user_management_not_cloud_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/user_management_not_cloud_spec.js @@ -155,21 +155,17 @@ describe('User Management', () => { cy.visit('/admin_console/user_management/users'); // # Search for the user. - cy.get('#searchUsers').clear().type(user.email, {delay: TIMEOUTS.ONE_HUNDRED_MILLIS}).wait(TIMEOUTS.HALF_SEC); + cy.get('#input_searchTerm').clear().type(user.email, {delay: TIMEOUTS.ONE_HUNDRED_MILLIS}).wait(TIMEOUTS.HALF_SEC); - cy.findByTestId('userListRow').within(() => { - if (activate) { - cy.findByText('Inactive').click().wait(TIMEOUTS.HALF_SEC); + cy.get('#actionMenuButton-systemUsersTable-0').click().wait(TIMEOUTS.HALF_SEC); - // # Click on the "Activate" button. - cy.findByLabelText('User Actions Menu').findByText('Activate').click(); - } else { - cy.findByText('Member').click().wait(TIMEOUTS.HALF_SEC); - - // # Click on the "Deactivate" button. - cy.findByLabelText('User Actions Menu').findByText('Deactivate').click(); - } - }); + if (activate) { + // # Click on the "Activate" button. + cy.get('#actionMenuItem-systemUsersTable-0-active').click().wait(TIMEOUTS.HALF_SEC); + } else { + // # Click on the "Deactivate" button. + cy.get('#actionMenuItem-systemUsersTable-0-deactivate').click().wait(TIMEOUTS.HALF_SEC); + } if (!activate) { // # Verify the modal opened and then confirm. diff --git a/e2e-tests/cypress/tests/integration/channels/system_console/user_management_spec.js b/e2e-tests/cypress/tests/integration/channels/system_console/user_management_spec.js index 021a377a98..3ead23d959 100644 --- a/e2e-tests/cypress/tests/integration/channels/system_console/user_management_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/system_console/user_management_spec.js @@ -187,7 +187,7 @@ describe('User Management', () => { cy.get('#input_searchTerm').clear().type(gitlabUser.email).wait(TIMEOUTS.HALF_SEC); // # Open actions menu. - cy.get('#systemUsersTable-cell-0_actionsColumn').click(); + cy.get('#systemUsersTable-cell-0_actionsColumn').click().wait(TIMEOUTS.HALF_SEC); // * Verify Switch to Email/Password is visible. cy.findByText('Switch to Email/Password').should('be.visible').click().wait(TIMEOUTS.HALF_SEC); diff --git a/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js b/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js index f42dd3ccc7..dc2fd0d0d0 100644 --- a/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/team_settings/closed_team_invite_by_email_spec.js @@ -123,7 +123,7 @@ describe('Team Settings', () => { // * Check that the display name of the team the user was invited to is being correctly displayed cy.uiGetLHSHeader().findByText(testTeam.display_name); - // * Check that the 'Beginning of Town Square' message is visible - cy.findByText('Beginning of Town Square').should('be.visible'); + // * Check that the 'Town Square' channel title is visible + cy.get('h2.channel-intro__title').should('be.visible').should('have.text', 'Town Square'); }); }); diff --git a/e2e-tests/cypress/tests/integration/channels/team_settings/teams_spec.js b/e2e-tests/cypress/tests/integration/channels/team_settings/teams_spec.js index 00fae8e087..84f1228476 100644 --- a/e2e-tests/cypress/tests/integration/channels/team_settings/teams_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/team_settings/teams_spec.js @@ -76,7 +76,7 @@ describe('Teams Suite', () => { // # Open team menu and click "Invite People" cy.uiOpenTeamMenu(); cy.uiGetLHSTeamMenu().findByText('Add people to the team'); - cy.uiGetLHSTeamMenu().findByText('Invite People').click(); + cy.uiGetLHSTeamMenu().findByText('Invite People').click().wait(TIMEOUTS.HALF_SEC); // * Check that the Invitation Modal opened up cy.findByTestId('invitationModal', {timeout: TIMEOUTS.HALF_SEC}).should('be.visible'); @@ -134,7 +134,7 @@ describe('Teams Suite', () => { and('have.text', 'System'); cy.wrap($el).get('.post-message__text-container'). should('be.visible'). - and('contain', `@${sysadmin.username} joined the team.`). + and('contain', `@${sysadmin.username} and @${testUser.username} joined the team.`). and('contain', `You were added to the team by @${sysadmin.username}.`); }); @@ -145,7 +145,7 @@ describe('Teams Suite', () => { and('have.text', 'System'); cy.wrap($el).get('.post-message__text-container'). should('be.visible'). - and('contain', `@${sysadmin.username} joined the channel.`). + and('contain', `@${sysadmin.username} and @${testUser.username} joined the channel.`). and('contain', `You were added to the channel by @${sysadmin.username}.`); }); @@ -283,7 +283,7 @@ describe('Teams Suite', () => { // # Verify Town square is visible cy.url().should('include', `/${testTeam.name}/channels/town-square`); - cy.findByText('Beginning of Town Square').should('be.visible'); + cy.get('h2.channel-intro__title').should('be.visible').should('have.text', 'Town Square'); }); it('MM-T2322 Do not allow anyone to join this team', () => { diff --git a/e2e-tests/cypress/tests/integration/channels/toast/new_messages_toast_spec.js b/e2e-tests/cypress/tests/integration/channels/toast/new_messages_toast_spec.js index 83f528972e..27c2197a0c 100644 --- a/e2e-tests/cypress/tests/integration/channels/toast/new_messages_toast_spec.js +++ b/e2e-tests/cypress/tests/integration/channels/toast/new_messages_toast_spec.js @@ -138,7 +138,7 @@ describe('Toast', () => { cy.uiClickSidebarItem(testChannelName); // # Scroll up so bottom is not visible - scrollUp(); + scrollUpAndPostAMessage(otherUser, testChannelId, oldPostNumber); // # New message toast is present with expected number of messages cy.get('div.toast').should('be.visible'); diff --git a/e2e-tests/cypress/tests/utils/constants.js b/e2e-tests/cypress/tests/utils/constants.js index 5b77d991d9..321e798b74 100644 --- a/e2e-tests/cypress/tests/utils/constants.js +++ b/e2e-tests/cypress/tests/utils/constants.js @@ -2,12 +2,13 @@ // See LICENSE.txt for license information. export const FEEDBACK_EMAIL = 'test@example.com'; -export const ABOUT_LINK = 'https://docs.mattermost.com/pl/about-mattermost'; +export const ABOUT_LINK = 'https://mattermost.com/pl/about-mattermost'; export const ASK_COMMUNITY_LINK = 'https://mattermost.com/pl/default-ask-mattermost-community/'; export const HELP_LINK = 'https://mattermost.com/pl/help/'; export const PRIVACY_POLICY_LINK = 'https://mattermost.com/pl/privacy-policy/'; export const REPORT_A_PROBLEM_LINK = 'https://mattermost.com/pl/report-a-bug'; export const TERMS_OF_SERVICE_LINK = 'https://mattermost.com/pl/terms-of-use/'; +export const MATTERMOST_USER_GUIDE = 'https://docs.mattermost.com/guides/use-mattermost.html'; export const CLOUD = 'Cloud'; export const E20 = 'E20'; @@ -25,7 +26,9 @@ export const SupportSettings = { PRIVACY_POLICY_LINK, REPORT_A_PROBLEM_LINK, TERMS_OF_SERVICE_LINK, + MATTERMOST_USER_GUIDE, }; + export const FixedCloudConfig = { EmailSettings: { FEEDBACK_EMAIL,Heading 4
Italics, Italics, Bold, Bold-italics, Bold-italics,
\nStrikethrough\n:slightly_smiling_face: :slightly_smiling_face: :wink: :scream: :bamboo: :gift_heart: :dolls: