Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/deploy_app.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ filterTests(['main'], () => {
cy.get('.nav').contains('Apps').click();
cy.contains('Charts').click();
cy.contains(myAppToInstall, { timeout: 30000 }).click();
if (isRancherManagerVersion('2.13')) {
if (isRancherManagerVersion('2.13') || isRancherManagerVersion('2.14')) {
cy.getBySel('chart-header-title').should('contain.text', myAppToInstall);
cy.getBySel('btn-chart-install').click();
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ filterTests(['main', 'upgrade'], () => {
cy.contains('Extensions')
.click();
cy.contains('elemental');
if (isRancherManagerVersion('2.13')) {
if (isRancherManagerVersion('2.13') || isRancherManagerVersion('2.14')) {
cy.get('[data-testid="item-card-cluster/rancher-ui-plugin-charts/elemental"]').within(() => {
cy.get('[data-testid="rc-item-card-action"]')
//.getBySel('rc-item-card-action')
Expand All @@ -68,7 +68,7 @@ filterTests(['main', 'upgrade'], () => {
cy.contains('Installing');
cy.contains('Extensions changed - reload required', { timeout: 40000 });
cy.clickButton('Reload');
if (isRancherManagerVersion('2.13')) {
if (isRancherManagerVersion('2.13') || isRancherManagerVersion('2.14')) {
cy.getBySel('btn-installed')
.click();
cy.getBySel('item-card-header-title')
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('Elemental operator upgrade tests', () => {
it('Upgrade Elemental operator', () => {
cy.contains('local').click();
cy.get('.nav').contains('Apps').click();
if (utils.isRancherManagerVersion('2.12')|| (utils.isRancherManagerVersion('2.13'))) {
if (utils.isRancherManagerVersion('2.12')|| (utils.isRancherManagerVersion('2.13') || (utils.isRancherManagerVersion('2.14')))) {
cy.get('[data-testid="item-card-cluster/elemental-operator/elemental-operator"]').click()
} else {
cy.get('.color1').contains('Elemental').click()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ describe('UI extension upgrade tests', () => {

qase(56,
it('Upgrade Elemental UI extension', () => {
if (utils.isRancherManagerVersion('v2.13')) {
if (utils.isRancherManagerVersion('v2.13') || utils.isRancherManagerVersion('v2.14')) {
cy.visit('c/local/uiplugins#installed');
cy.wait(5000); // eslint-disable-line cypress/no-unnecessary-waiting
cy.get('[data-testid="item-card-cluster/elemental-ui/elemental"]').click();
Expand Down
2 changes: 1 addition & 1 deletion tests/cypress/latest/e2e/unit_tests/upgrade.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ describe('Upgrade tests', () => {
cy.getBySel('cluster-target').click();
// As there is already an upgrade group targeting the cluster,
// the cluster should not be available in the dropdown
if (utils.isRancherManagerVersion('v2.13')) {
if (utils.isRancherManagerVersion('v2.13') || utils.isRancherManagerVersion('v2.14')) {
cy.get('.no-options-slot').should('contain', 'No options');
} else {
cy.get('#vs4__listbox').should('not.contain', clusterName);
Expand Down
7 changes: 5 additions & 2 deletions tests/cypress/latest/support/elemental.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ export class Elemental {
// Make sure we get all menus
checkElementalNav(): void {
// Open advanced accordion
if (isRancherManagerVersion('2.12') || isRancherManagerVersion('2.13')) {
if (isRancherManagerVersion('2.12') || isRancherManagerVersion('2.13') || isRancherManagerVersion('2.14')) {
cy.get('.accordion-item > .icon').eq(0).click();
} else {
cy.get('div.header > i').eq(0).click();
Expand Down Expand Up @@ -59,7 +59,10 @@ export class Elemental {
cy.get('.nav').contains('Apps').click();

if (isCypressTag('main') && !isOperatorVersion('marketplace')) {
if (isRancherManagerVersion('2.12')|| (isRancherManagerVersion('2.13'))) {
if (isRancherManagerVersion('2.14')) {
cy.getBySel("filter-panel-filter-group").contains('elemental-operator').click();
}
if (isRancherManagerVersion('2.12') || (isRancherManagerVersion('2.13') || (isRancherManagerVersion('2.14')))) {
cy.get('[data-testid="item-card-cluster/elemental-operator/elemental-operator"]').click()
} else {
cy.get('.color1').contains('Elemental').click()
Expand Down
Loading