Skip to content
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

ci/ui: clean code for 1.3.0 UI #1200

Merged
merged 1 commit into from
Feb 9, 2024
+15 −25
Merged

ci/ui: clean code for 1.3.0 UI #1200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions tests/cypress/latest/e2e/unit_tests/upgrade-ui-extension.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,12 @@ describe('UI extension upgrade tests', () => {
.click();
cy.getBySel('install-ext-modal-install-btn')
.click();
cy.contains('Extensions changed - reload required', {timeout: 100000});
cy.clickButton('Reload');
// Sometimes the reload button is not displayed and it breaks the test...
// Adding a sleep command waiting a more elegant solution
//cy.contains('Extensions changed - reload required', {timeout: 100000});
//cy.clickButton('Reload');
// eslint-disable-next-line cypress/no-unnecessary-waiting
cy.wait(120000);
cy.reload();
cy.getBySel('extension-card-uninstall-btn-elemental')
})
Expand Down
32 changes: 9 additions & 23 deletions tests/cypress/latest/support/commands.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ Cypress.Commands.add('createMachReg', (
checkIsoBuilding=false,
customCloudConfig='',
checkDefaultCloudConfig=true ) => {
let selector
cy.clickNavMenu(["Dashboard"]);
cy.getBySel('button-create-registration-endpoint')
.click();
Expand Down Expand Up @@ -118,14 +117,8 @@ Cypress.Commands.add('createMachReg', (
// cy.getBySel('select-os-version-build-media')
// .click();
//}
// Next if condition will be removed once ui extension 1.3.0 is released
if (utils.isUIVersion('stable')) {
cy.getBySel('select-os-version-build-iso')
.click();
} else {
cy.getBySel('select-os-version-build-media')
.click();
}
cy.getBySel('select-os-version-build-media')
.click();
// Never build from dev ISO in upgrade scenario
if (utils.isCypressTag('upgrade')) {
// Stable operator version is hardcoded for now
Expand All @@ -148,20 +141,19 @@ Cypress.Commands.add('createMachReg', (
cy.contains('ISO x86_64 (unstable)')
.click();
}
utils.isUIVersion('stable') ? selector="iso" : selector="media";
cy.getBySel(`build-${selector}-btn`)
cy.getBySel(`build-media-btn`)
.click();
cy.getBySel(`build-${selector}-btn`)
cy.getBySel(`build-media-btn`)
.get('.icon-spin');
// Download button is disabled while ISO is building
cy.getBySel(`download-${selector}-btn`).should(($input) => {
cy.getBySel(`download-media-btn`).should(($input) => {
expect($input).to.have.attr('disabled')
})
// Download button is enabled once ISO building done
cy.getBySel(`download-${selector}-btn`, { timeout: 600000 }).should(($input) => {
cy.getBySel(`download-media-btn`, { timeout: 600000 }).should(($input) => {
expect($input).to.not.have.attr('disabled')
})
cy.getBySel(`download-${selector}-btn`)
cy.getBySel(`download-media-btn`)
.click()
cy.verifyDownload('.iso', { contains:true, timeout: 180000, interval: 5000 });
}
Expand Down Expand Up @@ -238,14 +230,8 @@ Cypress.Commands.add('addMachInvLabel', (labelName, labelValue, useHardwareLabel
cy.get('[data-testid="add-label-mach-inv"] > .footer > .btn')
.click();
cy.get(`[data-testid="add-label-mach-inv"] > .kv-container > :nth-child(${nthChildIndex}) > input`).type(key);
// Following condition could be removed when we will release next Elemental UI (> 1.2.0)
if (utils.isUIVersion('dev')) {
cy.get(`[data-testid="add-label-mach-inv"] > .kv-container > :nth-child(${nthChildIndex + 1})
> .value-container > [data-testid="text-area-auto-grow"]`).type(hwLabels[key], {parseSpecialCharSequences: false});
} else {
cy.get(`[data-testid="add-label-mach-inv"] > .kv-container > :nth-child(${nthChildIndex + 1})
> .no-resize`).type(hwLabels[key], {parseSpecialCharSequences: false});
};
cy.get(`[data-testid="add-label-mach-inv"] > .kv-container > :nth-child(${nthChildIndex + 1})
> .value-container > [data-testid="text-area-auto-grow"]`).type(hwLabels[key], {parseSpecialCharSequences: false});
nthChildIndex += 3;
};
};
Expand Down
Loading