Skip to content

Commit a243f06

Browse files
Merge pull request #692 from etmurasaki/OU-1130-auto-dev
NO-JIRA: automation - dev user scenarios fixes with namespace level changes
2 parents d693b90 + aaa9a10 commit a243f06

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

web/cypress/support/monitoring/00.bvt_monitoring_namespace.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ export function testBVTMonitoringTestsNamespace(perspective: PerspectiveConfig)
9292

9393
cy.log('5.3 silence alert page');
9494
commonPages.titleShouldHaveText('Silence alert');
95-
commonPages.projectDropdownShouldExist();
95+
commonPages.projectDropdownShouldNotExist();
9696

9797
// Launches create silence form
9898
silenceAlertPage.silenceAlertSectionDefault();

web/cypress/support/monitoring/04.reg_alerts_namespace.cy.ts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ export function testAlertsRegressionNamespace(perspective: PerspectiveConfig) {
4949
cy.log('2.1 use sidebar nav to go to Observe > Alerting');
5050
nav.tabs.switchTab('Silences');
5151
silencesListPage.createSilence();
52-
commonPages.projectDropdownShouldExist();
5352
cy.log('https://issues.redhat.com/browse/OU-1109 - [Namespace-level] - Dev user - Create a silence - namespace label does not have a value');
54-
silenceAlertPage.assertNamespaceLabelNamespaceValueDisabled('namespace', `${WatchdogAlert.NAMESPACE}`, true);
53+
silenceAlertPage.assertLabelNameLabelValueRegExNegMatcher('namespace', `${WatchdogAlert.NAMESPACE}`, false, false);
5554
silenceAlertPage.assertCommentNoError();
5655
silenceAlertPage.clickSubmit();
5756
silenceAlertPage.assertCommentWithError();
@@ -127,13 +126,12 @@ export function testAlertsRegressionNamespace(perspective: PerspectiveConfig) {
127126
cy.log('3.10 Recreate silence');
128127
silenceDetailsPage.recreateSilence(false);
129128
commonPages.titleShouldHaveText('Recreate silence');
130-
commonPages.projectDropdownShouldExist();
129+
commonPages.projectDropdownShouldNotExist();
131130
silenceAlertPage.silenceAlertSectionDefault();
132131
silenceAlertPage.durationSectionDefault();
133132
silenceAlertPage.alertLabelsSectionDefault();
134133
silenceAlertPage.assertLabelNameLabelValueRegExNegMatcher('alertname', `${WatchdogAlert.ALERTNAME}`, false, false);
135134
cy.log('https://issues.redhat.com/browse/OU-1109 - [Namespace-level] - Dev user - Create a silence - namespace label does not have a value');
136-
silenceAlertPage.assertNamespaceLabelNamespaceValueDisabled('namespace', `${WatchdogAlert.NAMESPACE}`, true);
137135
silenceAlertPage.assertLabelNameLabelValueRegExNegMatcher('namespace', `${WatchdogAlert.NAMESPACE}`, false, false);
138136
silenceAlertPage.assertLabelNameLabelValueRegExNegMatcher('prometheus', 'openshift-monitoring/k8s', false, false);
139137
silenceAlertPage.clickSubmit();
@@ -147,13 +145,13 @@ export function testAlertsRegressionNamespace(perspective: PerspectiveConfig) {
147145
silencesListPage.filter.byName( `${WatchdogAlert.ALERTNAME}`);
148146
silencesListPage.rows.editSilence();
149147
commonPages.titleShouldHaveText('Edit silence');
148+
commonPages.projectDropdownShouldNotExist();
150149
silenceAlertPage.silenceAlertSectionDefault();
151150
silenceAlertPage.editAlertWarning();
152151
silenceAlertPage.editDurationSectionDefault();
153152
silenceAlertPage.alertLabelsSectionDefault();
154153
silenceAlertPage.assertLabelNameLabelValueRegExNegMatcher('alertname', `${WatchdogAlert.ALERTNAME}`, false, false);
155154
cy.log('https://issues.redhat.com/browse/OU-1109 - [Namespace-level] - Dev user - Create a silence - namespace label does not have a value');
156-
silenceAlertPage.assertNamespaceLabelNamespaceValueDisabled('namespace', `${WatchdogAlert.NAMESPACE}`, true);
157155
silenceAlertPage.assertLabelNameLabelValueRegExNegMatcher('namespace', `${WatchdogAlert.NAMESPACE}`, false, false);
158156
silenceAlertPage.assertLabelNameLabelValueRegExNegMatcher('prometheus', 'openshift-monitoring/k8s', false, false);
159157
silenceAlertPage.clickSubmit();

0 commit comments

Comments
 (0)