From 2f975ed6278b66b62d37ff2ca04f135edb2f8679 Mon Sep 17 00:00:00 2001 From: Yuliia Naumenko Date: Tue, 5 Jan 2021 16:13:49 -0800 Subject: [PATCH] resolved merge conflicts (#87391) --- .../apps/triggers_actions_ui/alerts_list.ts | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) 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 index 4961f842628ba..bc005ccfcde81 100644 --- 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 @@ -5,7 +5,6 @@ */ import uuid from 'uuid'; -import { times } from 'lodash'; import expect from '@kbn/expect'; import { FtrProviderContext } from '../../ftr_provider_context'; @@ -350,18 +349,13 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await deleteAlerts([createdAlert.id]); }); - it.skip('should delete all selection', async () => { + it('should delete all selection', async () => { const namePrefix = generateUniqueKey(); - let count = 0; - const createdAlertsFirstPage = await Promise.all( - times(2, () => createAlert({ name: `${namePrefix}-0${count++}` })) - ); + const createdAlert = await createAlert({ name: `${namePrefix}-1` }); await refreshAlertsList(); await pageObjects.triggersActionsUI.searchAlerts(namePrefix); - for (const createdAlert of createdAlertsFirstPage) { - await testSubjects.click(`checkboxSelectRow-${createdAlert.id}`); - } + await testSubjects.click(`checkboxSelectRow-${createdAlert.id}`); await testSubjects.click('bulkAction'); @@ -370,9 +364,9 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => { await testSubjects.click('deleteIdsConfirmation > confirmModalConfirmButton'); await testSubjects.missingOrFail('deleteIdsConfirmation'); - await retry.tryForTime(30000, async () => { + await retry.try(async () => { const toastTitle = await pageObjects.common.closeToast(); - expect(toastTitle).to.eql('Deleted 2 alerts'); + expect(toastTitle).to.eql('Deleted 1 alert'); }); await pageObjects.triggersActionsUI.searchAlerts(namePrefix);