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: make code compatible with Rancher 2.11 #1679

Merged
merged 1 commit into from
Feb 19, 2025
Merged

ci/ui: make code compatible with Rancher 2.11 #1679

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
2 changes: 1 addition & 1 deletion tests/cypress/latest/e2e/unit_tests/advanced_filtering.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ filterTests(['main'], () => {
cy.clickNavMenu(['Inventory of Machines']);
cy.get('[width="30"] > .checkbox-outer-container > .checkbox-container > .checkbox-custom').click();
cy.clickButton('Actions');
if (!isRancherManagerVersion('2.10')) {
if (isRancherManagerVersion('2.8') || isRancherManagerVersion('2.9')) {
cy.get('.tooltip-inner > :nth-child(1) > .list-unstyled > :nth-child(3)').click();
} else {
cy.get('.v-popper__inner').contains('Delete').click();
Expand Down
20 changes: 14 additions & 6 deletions tests/cypress/latest/e2e/unit_tests/deploy_app.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ filterTests(['main'], () => {

qase(31,
it('Deploy Alerting Drivers application', () => {
let myAppToInstall;
isRancherManagerVersion('2.11') ? myAppToInstall = 'Cerbos' : myAppToInstall = 'Alerting Drivers';
cypressLib.checkClusterStatus(clusterName, 'Active', 600000);
cypressLib.burgerMenuToggle();
// eslint-disable-next-line cypress/no-unnecessary-waiting
Expand All @@ -44,19 +46,25 @@ filterTests(['main'], () => {
}
cy.get('.nav').contains('Apps').click();
cy.contains('Charts').click();
cy.contains('Alerting Drivers', { timeout: 30000 }).click();
cy.contains('.name-logo-install', 'Alerting Drivers', { timeout: 30000 });
cy.contains(myAppToInstall, { timeout: 30000 }).click();
cy.contains('.name-logo-install', myAppToInstall, { timeout: 30000 });
cy.clickButton('Install');
cy.contains('.outer-container > .header', 'Alerting Drivers');
cy.contains('.outer-container > .header', myAppToInstall);
cy.clickButton('Next');
cy.clickButton('Install');
cy.contains('SUCCESS: helm install', { timeout: 120000 });
cy.reload();
cy.contains(new RegExp('Deployed.*rancher-alerting-drivers'))
if (isRancherManagerVersion('2.11')) {
cy.contains(new RegExp('Deployed.*cerbos'));
} else {
cy.contains(new RegExp('Deployed.*rancher-alerting-drivers'))
}
}));

qase(32,
it('Remove Alerting Drivers application', () => {
let myAppToInstall;
isRancherManagerVersion('2.11') ? myAppToInstall = 'cerbos' : myAppToInstall = 'rancher-alerting-drivers';
cypressLib.checkClusterStatus(clusterName, 'Active', 600000);
if (!isRancherManagerVersion('2.8')) {
cy.get('.main-panel').contains(clusterName).click();
Expand All @@ -66,12 +74,12 @@ filterTests(['main'], () => {
cy.get('.nav').contains('Apps').click();
cy.contains('Installed Apps').click();
cy.contains('.title', 'Installed Apps', { timeout: 20000 });
cy.contains('rancher-alerting-drivers');
cy.contains(myAppToInstall);
cy.get('[width="30"] > .checkbox-outer-container').click();
cy.get('.outlet').getBySel('sortable-table-promptRemove').click();
cy.confirmDelete();
cy.contains('SUCCESS: helm uninstall', { timeout: 60000 });
cy.contains('.apps', 'rancher-alerting-drivers').should('not.exist');
cy.contains('.apps', myAppToInstall).should('not.exist');
}));
});
});
8 changes: 7 additions & 1 deletion tests/cypress/latest/e2e/unit_tests/first_connection.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ limitations under the License.
import filterTests from '~/support/filterTests.js';
import * as cypressLib from '@rancher-ecp-qa/cypress-library';
import { qase } from 'cypress-qase-reporter/dist/mocha';
import { isRancherManagerVersion } from '~/support/utils';

filterTests(['main', 'upgrade'], () => {
Cypress.config();
Expand All @@ -29,7 +30,12 @@ filterTests(['main', 'upgrade'], () => {
cy.login();
cy.visit('/');
cy.getBySel('nav_header_showUserMenu').click();
cy.getBySel('user-menu-dropdown').contains('Preferences').click();
// HTML selector user-menu-dropdown is not in 2.11 anymore
if (isRancherManagerVersion('2.11')) {
cy.contains('Preferences').click();
} else {
cy.getBySel('user-menu-dropdown').contains('Preferences').click();
}
cy.clickButton('Include Prerelease Versions');
cypressLib.burgerMenuToggle();
cy.getBySel('side-menu').contains('Home').click();
Expand Down
1 change: 0 additions & 1 deletion tests/cypress/latest/e2e/unit_tests/seed_image.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ filterTests(['main'], () => {
}
// The following line will replace the confition just above when we will remove 2.8 tests
//cy.verifyDownload(isBootType('iso') ? '.iso' : '.raw', { contains: true, timeout: 300000, interval: 5000 });
// Check we can download the checksum file (only in dev UI for Rancher 2.9 / 2.10)
if (!utils.isRancherManagerVersion('2.8') && utils.isUIVersion('dev')) {
cy.getBySel('download-checksum-btn-list').click();
cy.verifyDownload('.sh256', { contains: true, timeout: 60000, interval: 5000 });
Expand Down
6 changes: 3 additions & 3 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 @@ -31,10 +31,10 @@ describe('UI extension upgrade tests', () => {

filterTests(['upgrade'], () => {
// 1 - Enable only with K3S because still too much flaky with RKE2
// 2 - TODO: Remove rancher 2-10 condition later
// UI extension upgrade cannot be upgraded with rancher manager 2.10 yet
// 2 - TODO: Remove rancher 2-11 condition later
// UI extension upgrade cannot be upgraded with rancher manager 2.11 yet
// because we have only one version so far
if (utils.isK8sVersion('k3s') && !utils.isRancherManagerVersion('2.10')) {
if (utils.isK8sVersion('k3s') && !utils.isRancherManagerVersion('2.11')) {
it('Add elemental-ui dev repo', () => {
cypressLib.addRepository('elemental-ui', 'https://github.com/rancher/elemental-ui.git', 'git', 'gh-pages');
});
Expand Down
4 changes: 2 additions & 2 deletions tests/cypress/latest/support/elemental.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ export class Elemental {
expect($lis).to.have.length(7);
// There is a bug with Dashboard entry in rancher 2.10
// https://github.com/rancher/elemental-ui/issues/230
if (!isRancherManagerVersion('2.10')) {
if (isRancherManagerVersion('2.9')) {
expect($lis.eq(0)).to.contain('Dashboard');
}
expect($lis.eq(1)).to.contain('Registration Endpoints');
Expand Down Expand Up @@ -93,7 +93,7 @@ export class Elemental {
cy.clickButton('Install');
cy.contains('SUCCESS: helm', { timeout: 120000 });
cy.reload();
if (!isRancherManagerVersion('2.10')) {
if (isRancherManagerVersion('2.9')) {
// eslint-disable-next-line cypress/unsafe-to-chain-command
cy.contains('Only User Namespaces').click().type('cattle-elemental-system{enter}{esc}');
cy.get('.outlet').contains('Deployed elemental-operator cattle-elemental-system', { timeout: 120000 });
Expand Down
Loading