Skip to content

Enhance select accordion item #9616

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 12, 2025
+30 −48
Merged

Enhance select accordion item #9616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a60804c
Injecting API intercept & wait for tree-select into selectAccordionItem
asirvadAbrahamVarghese Sep 12, 2025
89a35cb
Flagging TODOs
asirvadAbrahamVarghese Sep 12, 2025
d3de9c5
Remove explicit tree-select API waits in tests
asirvadAbrahamVarghese Sep 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 4 additions & 10 deletions cypress/e2e/ui/Settings/Application-Settings/edit_collect_logs.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,16 +226,10 @@ describe('Automate Collect logs Edit form operations', () => {
describe('Settings > Application Settings > Diagnostics > Manage IQ Region > Zone > Collect logs > Edit', () => {
beforeEach(() => {
// Select "Zone:" accordion item
cy.interceptApi({
alias: 'treeSelectApi',
urlPattern:
/ops\/tree_select\?id=.*&text=.*Zone.*Default.*Zone.*(current).*/,
triggerFn: () =>
cy.selectAccordionItem([
MANAGEIQ_REGION_ACCORDION_ITEM,
ZONE_ACCORDION_ITEM,
]),
});
cy.selectAccordionItem([
MANAGEIQ_REGION_ACCORDION_ITEM,
ZONE_ACCORDION_ITEM,
]);
// Select collect logs tab and open edit form
goToCollectLogsTabAndOpenEditForm();
});
Expand Down
51 changes: 17 additions & 34 deletions cypress/e2e/ui/validate-intercept-api-command.cy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,11 @@ describe('Validate intercept command', () => {

it('Should register the alias, intercept, wait & validate response status code when an API is fired', () => {
cy.accordion('Diagnostics');
cy.interceptApi({
alias: 'treeSelectApi',
urlPattern: /\/ops\/tree_select\?id=.*&text=.*/,
triggerFn: () => cy.selectAccordionItem([/^ManageIQ Region:/, /^Zone:/]),
onApiResponse: (interception) => {
expect(interception.response.statusCode).to.equal(200);
},
}).then(() => {
// verifies that the alias is set and the request is intercepted & awaited
cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
expect(interceptedAliasesObject).to.have.property('post-treeSelectApi');
});
// Tree select api wait is handled from selectAccordionItem with alias 'treeSelectApi'
cy.selectAccordionItem([/^ManageIQ Region:/, /^Zone:/]);
// verifies that the alias is set and the request is intercepted & awaited
cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
expect(interceptedAliasesObject).to.have.property('post-treeSelectApi');
});
});

Expand All @@ -32,19 +25,14 @@ describe('Validate intercept command', () => {
urlPattern: /\/ops\/accordion_select\?id=.*/,
triggerFn: () => cy.accordion('Diagnostics'),
});
// second api with alias 'treeSelectApi'
cy.interceptApi({
alias: 'treeSelectApi',
urlPattern: /\/ops\/tree_select\?id=.*&text=.*/,
triggerFn: () => cy.selectAccordionItem([/^ManageIQ Region:/, /^Zone:/]),
}).then(() => {
// verifies that both the aliases are set and the request is intercepted & awaited
cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
expect(interceptedAliasesObject).to.include.all.keys(
'post-accordionSelectApi',
'post-treeSelectApi'
);
});
// second api with alias 'treeSelectApi'(Tree select api wait is handled from selectAccordionItem with alias 'treeSelectApi')
cy.selectAccordionItem([/^ManageIQ Region:/, /^Zone:/]);
// verifies that both the aliases are set and the request is intercepted & awaited
cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
expect(interceptedAliasesObject).to.include.all.keys(
'post-accordionSelectApi',
'post-treeSelectApi'
);
});
});

Expand All @@ -59,15 +47,10 @@ describe('Validate intercept command', () => {
expect(Object.keys(interceptedAliasesObject).length).to.equal(1);
});
});
// second first api with alias 'treeSelectApi'
cy.interceptApi({
alias: 'treeSelectApi',
urlPattern: /\/ops\/tree_select\?id=.*&text=.*/,
triggerFn: () => cy.selectAccordionItem([/^ManageIQ Region:/, /^Zone:/]),
}).then(() => {
cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
expect(Object.keys(interceptedAliasesObject).length).to.equal(2);
});
// second api with alias 'treeSelectApi'(Tree select api wait is handled from selectAccordionItem with alias 'treeSelectApi')
cy.selectAccordionItem([/^ManageIQ Region:/, /^Zone:/]);
cy.getInterceptedApiAliases().then((interceptedAliasesObject) => {
expect(Object.keys(interceptedAliasesObject).length).to.equal(2);
});
// third api with a duplicate alias as above 'accordionSelectApi'
cy.interceptApi({
Expand Down
13 changes: 9 additions & 4 deletions cypress/support/commands/explorer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Cypress.Commands.add('selectAccordionItem', (accordionPath) => {
const isClickableNode = accordionPathIndex === accordionPath.length - 1;

for (let i = searchStartIndex; i < listItems.length; i++) {
/* @RemoveLater: Remove logger once the command is confirmed to be stable */
/* TODO: Remove logger once the command is confirmed to be stable */
Cypress.log({
name: 'selectAccordionItem',
message: `Loop index: ${i} & Searching for label: ${accordionLabel}`,
Expand All @@ -65,7 +65,7 @@ Cypress.Commands.add('selectAccordionItem', (accordionPath) => {
}

if (isMatch) {
/* @RemoveLater: Remove logger once the command is confirmed to be stable */
/* TODO: Remove logger once the command is confirmed to be stable */
Cypress.log({
name: 'selectAccordionItem',
message: `Matched "${liText}" at index ${i}`,
Expand All @@ -75,8 +75,13 @@ Cypress.Commands.add('selectAccordionItem', (accordionPath) => {
const currentLiElement = Cypress.$(listItems[i]);
// If it's the last label in the path, then that is the desired item to click
if (isClickableNode) {
// Click the node corresponding to the last label in the given path and terminate
cy.wrap(currentLiElement).click();
// Click the node corresponding to the last label in the given path,
// intercept & wait for the Tree-Select api and then terminate
cy.interceptApi({
alias: 'treeSelectApi',
urlPattern: /\/[^\/]+\/tree_select\?id=.*&text=.*/,
triggerFn: () => cy.wrap(currentLiElement).click(),
});
return;
}

Expand Down