From 55c0e43726b678d24e381d4322c043dc1c797d0c Mon Sep 17 00:00:00 2001 From: Aman Juneja Date: Wed, 22 Nov 2023 13:50:50 +0530 Subject: [PATCH 1/6] Create bulk-edit-filter-section-user-Filter-page.cy.js --- ...edit-filter-section-user-Filter-page.cy.js | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js diff --git a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js new file mode 100644 index 0000000000..feb5947d44 --- /dev/null +++ b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js @@ -0,0 +1,33 @@ +import permissions from '../../../support/dictionary/permissions'; +import TopMenu from '../../../support/fragments/topMenu'; +import BulkEditSearchPane from '../../../support/fragments/bulk-edit/bulk-edit-search-pane'; +import users from '../../../support/fragments/users/users'; + +let user; +describe('bulk-edit', () => { + before('create test users', () => { + cy.createTempUser([ + permissions.bulkEditLogsView.gui, + permissions.bulkEditCsvView.gui, + permissions.bulkEditView.gui, + ]).then((userProperties) => { + user = userProperties; + cy.login(user.username, user.password, { + path: TopMenu.bulkEditPath, + waiter: BulkEditSearchPane.waitLoading, + }); + }); + }); + + after('delete test data', () => { + cy.getAdminToken(); + users.deleteViaApi(user.userId); + }); + it('Filters section: Users filter', () => { + BulkEditSearchPane.openLogsSearch(); + BulkEditSearchPane.verifyLogsPane(); + BulkEditSearchPane.checkHoldingsCheckbox(); + BulkEditSearchPane.checkItemsCheckbox(); + BulkEditSearchPane.checkUsersCheckbox(); + }); +}); From 0cae6cf32798a1cdb1cc129d4d13290e7ff0115d Mon Sep 17 00:00:00 2001 From: Aman Juneja Date: Wed, 22 Nov 2023 15:25:15 +0530 Subject: [PATCH 2/6] Update bulk-edit-filter-section-user-Filter-page.cy.js --- .../other/bulk-edit-filter-section-user-Filter-page.cy.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js index feb5947d44..378c0fb2ab 100644 --- a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js +++ b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js @@ -2,6 +2,7 @@ import permissions from '../../../support/dictionary/permissions'; import TopMenu from '../../../support/fragments/topMenu'; import BulkEditSearchPane from '../../../support/fragments/bulk-edit/bulk-edit-search-pane'; import users from '../../../support/fragments/users/users'; +import { Permissions } from '../../../support/dictionary'; let user; describe('bulk-edit', () => { @@ -23,11 +24,13 @@ describe('bulk-edit', () => { cy.getAdminToken(); users.deleteViaApi(user.userId); }); + it('Filters section: Users filter', () => { BulkEditSearchPane.openLogsSearch(); BulkEditSearchPane.verifyLogsPane(); BulkEditSearchPane.checkHoldingsCheckbox(); BulkEditSearchPane.checkItemsCheckbox(); BulkEditSearchPane.checkUsersCheckbox(); + BulkEditSearchPane.verifyLogsTableHeaders(); }); }); From de0870fcb7cb6c3b8ca06537a10acb9a662498c0 Mon Sep 17 00:00:00 2001 From: Aman Juneja Date: Wed, 22 Nov 2023 17:46:45 +0530 Subject: [PATCH 3/6] Filter search - User Filter --- ...edit-filter-section-user-Filter-page.cy.js | 4 ++++ .../bulk-edit/bulk-edit-search-pane.js | 23 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js index 378c0fb2ab..91516d7d1b 100644 --- a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js +++ b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js @@ -32,5 +32,9 @@ describe('bulk-edit', () => { BulkEditSearchPane.checkItemsCheckbox(); BulkEditSearchPane.checkUsersCheckbox(); BulkEditSearchPane.verifyLogsTableHeaders(); + BulkEditSearchPane.searchAndSelectUser('ADMINISTRATOR, DIKU'); + BulkEditSearchPane.xAppearsNextToUser(); + BulkEditSearchPane.resetAllBtnIsDisabled(false); + BulkEditSearchPane.clickOnXAppearsNextToUser(); }); }); diff --git a/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js b/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js index b6d46b52d2..2b2b49ceaa 100644 --- a/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js +++ b/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js @@ -15,11 +15,15 @@ import { MultiColumnListRow, TextField, Image, + TextInput, + SelectionList, + IconButton, } from '../../../../interactors'; import { ListRow } from '../../../../interactors/multi-column-list'; const bulkEditIcon = Image({ alt: 'View and manage bulk edit' }); const logsStartDateAccordion = Accordion('Started'); +const logsUsersAccordion = Accordion('User'); const logsEndDateAccordion = Accordion('Ended'); const applyBtn = Button('Apply'); const logsResultPane = Pane({ id: 'bulk-edit-logs-pane' }); @@ -47,6 +51,8 @@ const logsStatusesAccordion = Accordion('Statuses'); const saveAndClose = Button('Save and close'); const textFildTo = TextField('To'); const textFildFrom = TextField('From'); +const buttonChooseUser = Button('Select control\nChoose user'); +const xIconButtonUser = IconButton('Clear selected filters for "[object Object]"'); const confirmChanges = Button('Confirm changes'); const triggerBtn = DropdownMenu().find(Button('File that was used to trigger the bulk edit')); const errorsEncounteredBtn = DropdownMenu().find( @@ -82,6 +88,14 @@ export default { cy.expect(searchButton.has({ disabled: isDisabled })); }, + xAppearsNextToUser() { + cy.expect(xIconButtonUser.exists()); + }, + + clickOnXAppearsNextToUser() { + cy.do(xIconButtonUser.click()); + }, + resetAllBtnIsDisabled(isDisabled) { cy.expect(resetAllButton.has({ disabled: isDisabled })); }, @@ -911,6 +925,15 @@ export default { ]); }, + searchAndSelectUser(name) { + cy.do([ + logsUsersAccordion.clickHeader(), + logsUsersAccordion.find(buttonChooseUser).click(), + SelectionList().filter(name), + SelectionList().select(including(name)), // selects the option from filtered list + ]); + }, + fillLogsEndDate(fromDate, toDate) { cy.do([ logsEndDateAccordion.clickHeader(), From 36e46cd3b171b8c534591d28cdd254da916db0af Mon Sep 17 00:00:00 2001 From: Aman Juneja Date: Wed, 22 Nov 2023 18:11:16 +0530 Subject: [PATCH 4/6] Filter search - User Filter --- ...edit-filter-section-user-Filter-page.cy.js | 4 ++++ .../bulk-edit/bulk-edit-search-pane.js | 23 +++++++++++++------ 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js index 91516d7d1b..f44e89aaa5 100644 --- a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js +++ b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js @@ -32,9 +32,13 @@ describe('bulk-edit', () => { BulkEditSearchPane.checkItemsCheckbox(); BulkEditSearchPane.checkUsersCheckbox(); BulkEditSearchPane.verifyLogsTableHeaders(); + BulkEditSearchPane.clickUserAccordion(); + BulkEditSearchPane.clickChooseUserUnderUserAccordion(); BulkEditSearchPane.searchAndSelectUser('ADMINISTRATOR, DIKU'); BulkEditSearchPane.xAppearsNextToUser(); BulkEditSearchPane.resetAllBtnIsDisabled(false); BulkEditSearchPane.clickOnXAppearsNextToUser(); + BulkEditSearchPane.clickChooseUserUnderUserAccordion(); + BulkEditSearchPane.searchUser('AJDKSF'); }); }); diff --git a/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js b/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js index 2b2b49ceaa..fdc5a4fd12 100644 --- a/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js +++ b/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js @@ -93,7 +93,7 @@ export default { }, clickOnXAppearsNextToUser() { - cy.do(xIconButtonUser.click()); + cy.get('[icon="times-circle-solid"]').eq(1).click(); }, resetAllBtnIsDisabled(isDisabled) { @@ -925,13 +925,22 @@ export default { ]); }, + clickUserAccordion() { + cy.do(logsUsersAccordion.clickHeader()); + }, + + clickChooseUserUnderUserAccordion() { + cy.do(logsUsersAccordion.find(buttonChooseUser).click()); + }, + + searchUser(name) { + SelectionList().filter(name); + cy.get('[placeholder="Filter options list"]').type(name); + cy.contains('List is empty').should('be.visible'); + cy.contains('No matching option').should('be.visible'); + }, searchAndSelectUser(name) { - cy.do([ - logsUsersAccordion.clickHeader(), - logsUsersAccordion.find(buttonChooseUser).click(), - SelectionList().filter(name), - SelectionList().select(including(name)), // selects the option from filtered list - ]); + cy.do([SelectionList().filter(name), SelectionList().select(including(name))]); }, fillLogsEndDate(fromDate, toDate) { From 36197fa4d855acea56dff8f644d963443be5ee08 Mon Sep 17 00:00:00 2001 From: Aman Juneja Date: Wed, 22 Nov 2023 20:55:55 +0530 Subject: [PATCH 5/6] Filter search - User Filter --- .../other/bulk-edit-filter-section-user-Filter-page.cy.js | 1 - cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js | 1 - 2 files changed, 2 deletions(-) diff --git a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js index f44e89aaa5..e5f5946cdd 100644 --- a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js +++ b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js @@ -2,7 +2,6 @@ import permissions from '../../../support/dictionary/permissions'; import TopMenu from '../../../support/fragments/topMenu'; import BulkEditSearchPane from '../../../support/fragments/bulk-edit/bulk-edit-search-pane'; import users from '../../../support/fragments/users/users'; -import { Permissions } from '../../../support/dictionary'; let user; describe('bulk-edit', () => { diff --git a/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js b/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js index fdc5a4fd12..9da727e25a 100644 --- a/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js +++ b/cypress/support/fragments/bulk-edit/bulk-edit-search-pane.js @@ -15,7 +15,6 @@ import { MultiColumnListRow, TextField, Image, - TextInput, SelectionList, IconButton, } from '../../../../interactors'; From 1ac4ad287910b0efc58285a9c38c4f9f54b13f12 Mon Sep 17 00:00:00 2001 From: Aman Juneja Date: Thu, 23 Nov 2023 11:41:16 +0530 Subject: [PATCH 6/6] Filter search - User Filter --- .../other/bulk-edit-filter-section-user-Filter-page.cy.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js index e5f5946cdd..48fd44e2cd 100644 --- a/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js +++ b/cypress/e2e/bulk-edit/other/bulk-edit-filter-section-user-Filter-page.cy.js @@ -33,7 +33,7 @@ describe('bulk-edit', () => { BulkEditSearchPane.verifyLogsTableHeaders(); BulkEditSearchPane.clickUserAccordion(); BulkEditSearchPane.clickChooseUserUnderUserAccordion(); - BulkEditSearchPane.searchAndSelectUser('ADMINISTRATOR, DIKU'); + BulkEditSearchPane.searchAndSelectUser('Test_All'); BulkEditSearchPane.xAppearsNextToUser(); BulkEditSearchPane.resetAllBtnIsDisabled(false); BulkEditSearchPane.clickOnXAppearsNextToUser();