Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@
export enum helmActions {
upgrade = 'Upgrade',
rollback = 'Rollback',
deleteHelmRelease = 'Delete Helm Release',
deleteHelmRelease = 'Delete Helm release',
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ export const pageTitle = {
CreateChecluster: 'Create CheCluster',
CreateEventSource: 'Create Event Source',
CreateHelmChartRepository: 'Create Helm Chart Repository',
CreateHelmRelease: 'Create Helm Release',
CreateHelmRelease: 'Create Helm release',
CreateKnativeEventing: 'Create KnativeEventing',
CreateKnativeKafka: 'Create KnativeKafka',
CreateKnativeServing: 'Create KnativeServing',
Expand All @@ -33,8 +33,8 @@ export const pageTitle = {
GitOPs: 'GitOps',
Helm: 'Helm',
HelmCharts: 'Helm Charts',
HelmReleaseDetails: 'Helm Release details',
HelmReleases: 'Helm Releases',
HelmReleaseDetails: 'Helm release details',
HelmReleases: 'Helm releases',
InstalledOperators: 'Installed Operators',
InstallOperator: 'Install Operator',
KnativeEventings: 'KnativeEventings',
Expand All @@ -60,8 +60,8 @@ export const pageTitle = {
ShipwrightBuild: 'ShipwrightBuild',
Templates: 'Templates',
TriggerTemplateDetails: 'TriggerTemplate details',
upgradeHelmRelease: 'Upgrade Helm Release',
UpgradeHelmRelease: 'Upgrade Helm Release',
upgradeHelmRelease: 'Upgrade Helm release',
UpgradeHelmRelease: 'Upgrade Helm release',
UploadJarFile: 'Upload JAR file',
YAML: 'Import YAML',
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ export const adminNavigationMenu = {

export const messages = {
helm: {
noHelmReleasesFound: 'No Helm Releases found',
noHelmReleasesFound: 'No Helm releases found',
},
addFlow: {
gitUrlValidated: 'Validated',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ export enum displayOptions {
PodCount = 'Pod Count',
Labels = 'Labels',
ApplicationGroupings = 'Application Groupings',
HelmReleases = 'Helm Releases',
HelmReleases = 'Helm releases',
KnativeServices = 'Knative Services',
}

Expand All @@ -30,7 +30,7 @@ export enum nodeActions {
DeleteService = 'Delete Service',
EditService = 'Edit Service',
EditHealthChecks = 'Edit Health Checks',
HelmReleases = 'Helm Releases',
HelmReleases = 'Helm releases',
SetTrafficDistribution = 'Set traffic distribution',
AddSubscription = 'Add Subscription',
EditInMemoryChannel = 'Edit InMemoryChannel',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const helmPO = {
failedCheckbox: '[data-ouia-component-id="DataViewCheckboxFilter-filter-item-failed"] input',
otherCheckbox: '[data-ouia-component-id="DataViewCheckboxFilter-filter-item-other"] input',
details: {
title: '[data-test-section-heading="Helm Release Details"]',
title: '[data-test-section-heading="Helm release details"]',
},
upgradeHelmRelease: {
replicaCount: '#root_replicaCount',
Expand All @@ -42,6 +42,6 @@ export const helmPO = {
helmActions: {
upgrade: '[data-test-action="Upgrade"]',
rollBack: '[data-test-action="Rollback"]',
deleteHelmRelease: '[data-test-action="Delete Helm Release"]',
deleteHelmRelease: '[data-test-action="Delete Helm release"]',
},
};
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
export const messages = {
noHelmReleasesFound: 'No Helm Releases found',
noHelmReleasesFound: 'No Helm releases found',
};
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { helmPO } from '@console/dev-console/integration-tests/support/pageObjec
const actions = [helmActions.upgrade, helmActions.rollback, helmActions.deleteHelmRelease];

export const helmDetailsPage = {
verifyTitle: () => cy.byTestSectionHeading('Helm Release details').should('be.visible'),
verifyTitle: () => cy.byTestSectionHeading('Helm release details').should('be.visible'),
verifyHelmReleaseStatus: () => cy.get('[data-test="status-text"]').should('be.visible'),
verifyResourcesTab: () => cy.get(helmPO.resourcesTab).should('be.visible'),
verifyReleaseNotesTab: () => cy.get(helmPO.revisionHistoryTab).should('be.visible'),
Expand All @@ -23,12 +23,12 @@ export const helmDetailsPage = {
cy.get('dl dt').contains(fieldName).next('dd').should('contain.text', fieldValue);
},
uninstallHelmRelease: () => {
cy.byLegacyTestID('modal-title').should('contain.text', 'Delete Helm Release?');
cy.byLegacyTestID('modal-title').should('contain.text', 'Delete Helm release?');
cy.byTestID('confirm-action').click({ force: true });
modal.shouldBeClosed();
},
enterReleaseNameInUninstallPopup: (releaseName: string = 'nodejs-release') => {
modal.modalTitleShouldContain('Delete Helm Release?');
modal.modalTitleShouldContain('Delete Helm release?');
cy.byTestID('resource-name').should('have.text', releaseName);
cy.get(helmPO.uninstallHelmRelease.releaseName).type(releaseName);
},
Expand All @@ -48,7 +48,7 @@ export const helmDetailsPage = {
clickHelmActionButton: () => cy.byTestID('console-select-menu-toggle').click(),
verifyActionsInCreateMenu: () => {
cy.byTestID('console-select-item').contains('Repository').should('exist');
cy.byTestID('console-select-item').contains('Helm Release').should('exist');
cy.byTestID('console-select-item').contains('Helm release').should('exist');
},
clickCreateMenu: (createMenuOption: string) => {
cy.byTestID('console-select-menu-toggle').click();
Expand All @@ -59,7 +59,7 @@ export const helmDetailsPage = {
cy.byTestID(`chartRepositoryTitle-${repoName}`).click(),
clickCreateHelmRelease: () => {
cy.byTestID('console-select-menu-toggle').click();
cy.byTestID('console-select-item').contains('Helm Release').click();
cy.byTestID('console-select-item').contains('Helm release').click();
},
clickCreateRepository: () => {
cy.byTestID('console-select-menu-toggle').click();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ export const helmPage = {
case helmActions.rollback:
cy.get(helmPO.helmActions.rollBack).click();
break;
case 'Delete Helm Release':
case 'Delete Helm release':
case helmActions.deleteHelmRelease:
cy.get(helmPO.helmActions.deleteHelmRelease).click();
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { warningModal } from '@console/cypress-integration-tests/views/warning-m
import { helmPO } from '@console/dev-console/integration-tests/support/pageObjects/helm-po';

export const upgradeHelmRelease = {
verifyTitle: () => cy.get('h1').contains('Upgrade Helm Release').should('be.visible'),
verifyTitle: () => cy.get('h1').contains('Upgrade Helm release').should('be.visible'),
updateReplicaCount: (replicaCount: string = '2') =>
cy.get(helmPO.upgradeHelmRelease.replicaCount).clear().type(replicaCount),
upgradeChartVersion: () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ Given('user is at the Helm page', () => {

Given('user is at the Helm Release tab in admin perspective', () => {
cy.clickNavLink(navPaths.helm);
cy.byLegacyTestID('horizontal-link-Helm Releases').should('exist').click({ force: true });
cy.byLegacyTestID('horizontal-link-Helm releases').should('exist').click({ force: true });
});

When('user selects checkbox for the Deployed Helm charts', (workloadName: string) => {
Expand Down Expand Up @@ -138,7 +138,7 @@ Then('user will see the Release Notes tab', () => {
});

Then(
'user will see the Actions drop down menu with options Upgrade, Rollback, and Delete Helm Release',
'user will see the Actions drop down menu with options Upgrade, Rollback, and Delete Helm release',
() => {
helmDetailsPage.verifyActionsDropdown();
helmDetailsPage.clickActionMenu();
Expand Down Expand Up @@ -214,7 +214,7 @@ Then('user is redirected to Repositories tab', () => {
});

Then('user is able to see Helm Releases and Repositories Tabs', () => {
helmDetailsPage.checkHelmTab('Helm Releases');
helmDetailsPage.checkHelmTab('Helm releases');
helmDetailsPage.checkHelmTab('Repositories');
});

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ Then(
},
);

Then('user is able to see the context menu with actions Upgrade and Delete Helm Release', () => {
Then('user is able to see the context menu with actions Upgrade and Delete Helm release', () => {
cy.get('div.odc-topology-context-menu').should('be.visible');
cy.byTestActionID('Upgrade').should('be.visible');
cy.byTestActionID('Delete Helm Release').should('be.visible');
cy.byTestActionID('Delete Helm release').should('be.visible');
});

Given('user is on the topology sidebar of the helm release {string}', (helmReleaseName: string) => {
Expand All @@ -64,7 +64,7 @@ Then(
Then(
'user is able to see the actions dropdown menu with actions Upgrade and Uninstall Helm Release',
() => {
const actions = ['Upgrade', 'Uninstall Helm Release'];
const actions = ['Upgrade', 'Uninstall Helm release'];
cy.byLegacyTestID('action-items')
.children()
.each(($ele) => {
Expand All @@ -84,7 +84,7 @@ Given('user is able to see {string} in helm page in admin view', (helmRelease: s

When('user clicks on the Helm Release tab in admin perspective', () => {
cy.clickNavLink(navPaths.helm);
cy.byLegacyTestID('horizontal-link-Helm Releases').should('exist').click({ force: true });
cy.byLegacyTestID('horizontal-link-Helm releases').should('exist').click({ force: true });
});

Then('user will be redirected to Helm Releases page under Helm tab', () => {
Expand All @@ -96,7 +96,7 @@ When('user clicks on the Kebab menu', () => {
});

Then(
'user is able to see kebab menu with actions Upgrade, Rollback and Delete Helm Release',
'user is able to see kebab menu with actions Upgrade, Rollback and Delete Helm release',
() => {
topologySidePane.verifyActions(
helmActions.upgrade,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ export const topologyPage = {
break;
case displayOptions.HelmReleases:
cy.get('label[class$="menu__item"]')
.contains('Helm Releases')
.contains('Helm releases')
.within(() => {
cy.get('[type="checkbox"]').check();
});
Expand Down