Cypress/E2E: Apply temp fix to dnd e2e (#8158)

Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
mattermost · May 31, 2021 · 713e2e7 · 713e2e7
1 parent bb673fb
commit 713e2e7
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 9 deletions.
diff --git a/e2e/cypress/integration/accessibility/accessibility_dropdowns_spec.js b/e2e/cypress/integration/accessibility/accessibility_dropdowns_spec.js
@@ -178,7 +178,7 @@ describe('Verify Accessibility Support in Dropdown Menus', () => {
             {id: 'status-menu-custom-status', label: 'Custom Status dialog'},
             {id: 'status-menu-online', label: 'online'},
             {id: 'status-menu-away', label: 'away'},
-            {id: 'status-menu-dnd_menuitem', label: 'do not disturb. disables all notifications'},
+            {id: 'status-menu-dnd', label: 'do not disturb. disables all notifications'},
             {id: 'status-menu-offline', label: 'offline'},
         ];
 

diff --git a/e2e/cypress/integration/account_settings/display/theme/custom_theme_sidebar_styles_spec.js b/e2e/cypress/integration/account_settings/display/theme/custom_theme_sidebar_styles_spec.js
@@ -105,7 +105,7 @@ describe('Custom Theme - Sidebar Styles', () => {
         cy.get('.away--icon').should('have.css', 'fill', rgbArrayToString(themeRgbColor.awayIndicator));
 
         // # Set user status to do not disturb
-        cy.uiOpenDndStatusSubMenu().find('#dndTime-30mins_menuitem').click();
+        cy.uiOpenSetStatusMenu('Do Not Disturb');
 
         // * Check Do Not Disturb Indicator color
         cy.get('.dnd--icon').should('have.css', 'fill', rgbArrayToString(themeRgbColor.dndIndicator));

diff --git a/e2e/cypress/integration/menus/status_dropdown_spec.js b/e2e/cypress/integration/menus/status_dropdown_spec.js
@@ -16,7 +16,7 @@ describe('Status dropdown menu', () => {
     const statusTestCases = [
         {id: 'status-menu-online', icon: 'online--icon', text: 'Online'},
         {id: 'status-menu-away', icon: 'away--icon', text: 'Away'},
-        {id: 'status-menu-dnd_menuitem', icon: 'dnd--icon', text: 'Do Not Disturb'},
+        {id: 'status-menu-dnd', icon: 'dnd--icon', text: 'Do Not Disturb'},
         {id: 'status-menu-offline', text: 'Offline'},
     ];
 
@@ -100,11 +100,7 @@ function stepThroughStatuses(statusTestCases = []) {
     // * Verify the user's status icon changes correctly every time
     statusTestCases.forEach((tc) => {
         // # Open status menu and click option
-        if (tc.text === 'Do Not Disturb') {
-            cy.uiOpenDndStatusSubMenu().find('#dndTime-30mins_menuitem').click();
-        } else {
-            cy.uiOpenSetStatusMenu(tc.text);
-        }
+        cy.uiOpenSetStatusMenu(tc.text);
 
         // # Verify correct status icon is shown on user's profile picture
         cy.get('.MenuWrapper.status-dropdown-menu svg').should('have.attr', 'aria-label', `${tc.text} Icon`);

diff --git a/e2e/cypress/support/ui/menu.js b/e2e/cypress/support/ui/menu.js
@@ -71,7 +71,7 @@ Cypress.Commands.add('uiOpenDndStatusSubMenu', () => {
     cy.get('.MenuWrapper.status-dropdown-menu .Menu__content.dropdown-menu').should('be.visible');
 
     // # Hover over Do Not Disturb option
-    cy.get('.MenuWrapper.status-dropdown-menu .Menu__content.dropdown-menu li#status-menu-dnd_menuitem').trigger('mouseover');
+    cy.get('.MenuWrapper.status-dropdown-menu .Menu__content.dropdown-menu li#status-menu-dnd').trigger('mouseover');
 
     return cy.get('#status-menu-dnd');
 });