fixed tests

elastic · Jul 9, 2021 · e33c076 · e33c076
1 parent 5ebebbb
commit e33c076
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 31 deletions.
diff --git a/...ns/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx b/...ns/triggers_actions_ui/public/application/sections/alerts_list/components/alerts_list.tsx
@@ -446,7 +446,7 @@ export const AlertsList: React.FunctionComponent = () => {
             <EuiFlexItem grow={false}>
               <div>
                 {item.muteAll ? (
-                  <EuiBadge color="hollow">
+                  <EuiBadge data-test-subj="mutedActionsBadge" color="hollow">
                     <FormattedMessage
                       id="xpack.triggersActionsUI.sections.alertsList.alertsListTable.columns.mutedBadge"
                       defaultMessage="Muted"

diff --git a/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts_list.ts b/x-pack/test/functional_with_es_ssl/apps/triggers_actions_ui/alerts_list.ts
@@ -213,8 +213,8 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
       await retry.tryForTime(30000, async () => {
         await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
-        await testSubjects.find('unmuteIconButton');
-        expect(await testSubjects.find('unmuteIconButton')).length(1);
+        const muteBadge = await testSubjects.find('mutedActionsBadge');
+        expect(await muteBadge.isDisplayed()).to.eql(true);
       });
     });
 
@@ -230,8 +230,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       await testSubjects.click('muteButton');
       await retry.tryForTime(30000, async () => {
         await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
-        await testSubjects.find('muteIconButton');
-        expect(await testSubjects.find('muteIconButton')).length(1);
+        await testSubjects.missingOrFail('mutedActionsBadge');
       });
     });
 
@@ -274,11 +273,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
       await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
 
-      await testSubjects.click('collapsedItemActions');
-
-      const muteSwitch = await testSubjects.find('muteSwitch');
-      const isChecked = await muteSwitch.getAttribute('aria-checked');
-      expect(isChecked).to.eql('true');
+      await retry.tryForTime(30000, async () => {
+        await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
+        const muteBadge = await testSubjects.find('mutedActionsBadge');
+        expect(await muteBadge.isDisplayed()).to.eql(true);
+      });
     });
 
     it('should unmute all selection', async () => {
@@ -297,13 +296,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       // Mute all button shows after clicking unmute all
       await testSubjects.existOrFail('muteAll');
 
-      await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
-
-      await testSubjects.click('collapsedItemActions');
-
-      const muteSwitch = await testSubjects.find('muteSwitch');
-      const isChecked = await muteSwitch.getAttribute('aria-checked');
-      expect(isChecked).to.eql('false');
+      await retry.tryForTime(30000, async () => {
+        await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
+        await testSubjects.missingOrFail('mutedActionsBadge');
+      });
     });
 
     it('should disable all selection', async () => {
@@ -320,13 +316,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       // Enable all button shows after clicking disable all
       await testSubjects.existOrFail('enableAll');
 
-      await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
-
-      await testSubjects.click('collapsedItemActions');
-
-      const disableSwitch = await testSubjects.find('disableSwitch');
-      const isChecked = await disableSwitch.getAttribute('aria-checked');
-      expect(isChecked).to.eql('true');
+      await pageObjects.triggersActionsUI.ensureRuleActionToggleApplied(
+        createdAlert.name,
+        'enableSwitch',
+        'false'
+      );
     });
 
     it('should enable all selection', async () => {
@@ -345,13 +339,11 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       // Disable all button shows after clicking enable all
       await testSubjects.existOrFail('disableAll');
 
-      await pageObjects.triggersActionsUI.searchAlerts(createdAlert.name);
-
-      await testSubjects.click('collapsedItemActions');
-
-      const disableSwitch = await testSubjects.find('disableSwitch');
-      const isChecked = await disableSwitch.getAttribute('aria-checked');
-      expect(isChecked).to.eql('false');
+      await pageObjects.triggersActionsUI.ensureRuleActionToggleApplied(
+        createdAlert.name,
+        'enableSwitch',
+        'true'
+      );
     });
 
     it('should delete all selection', async () => {