Skip to content

Commit 39821d5

Browse files
committed
Reuse flashClassMap from just merged ManageIQ#9554
1 parent 4ac6b66 commit 39821d5

File tree

2 files changed

+7
-11
lines changed

2 files changed

+7
-11
lines changed

cypress/e2e/ui/Settings/Application-Settings/edit_collect_logs.cy.js

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* eslint-disable no-undef */
2+
import { flashClassMap } from '../../../../support/assertions/assertion_constants';
23

34
const textConstants = {
45
// Menu options
@@ -31,9 +32,6 @@ const textConstants = {
3132
// Component route url
3233
componentRouteUrl: '/ops/explorer',
3334

34-
// Flash message types
35-
flashTypeSuccess: 'success',
36-
3735
// Flash message text snippets
3836
flashMessageSettingsSaved: 'saved',
3937
flashMessageOperationCanceled: 'cancel',
@@ -53,7 +51,6 @@ const {
5351
zoneAccordItem,
5452
serverAccordItem,
5553
componentRouteUrl,
56-
flashTypeSuccess,
5754
flashMessageSettingsSaved,
5855
flashMessageOperationCanceled,
5956
buttonSelector,
@@ -134,7 +131,7 @@ function resetProtocolDropdown({
134131
cy.wrap($select).select(dropdownBlankValue);
135132
cy.contains(buttonSelector(submitButtonType), saveButton).click();
136133
// Validating confirmation flash message
137-
cy.expect_flash(flashTypeSuccess, flashMessageSettingsSaved);
134+
cy.expect_flash(flashClassMap.success, flashMessageSettingsSaved);
138135
}
139136
}
140137
);
@@ -157,7 +154,7 @@ function cancelButtonValidation() {
157154
.should('be.enabled')
158155
.click();
159156
// Validating confirmation flash message
160-
cy.expect_flash(flashTypeSuccess, flashMessageOperationCanceled);
157+
cy.expect_flash(flashClassMap.success, flashMessageOperationCanceled);
161158
}
162159

163160
function resetButtonValidation() {
@@ -195,7 +192,7 @@ function saveButtonValidation() {
195192
.should('be.enabled')
196193
.click();
197194
// Validating confirmation flash message
198-
cy.expect_flash(flashTypeSuccess, flashMessageSettingsSaved);
195+
cy.expect_flash(flashClassMap.success, flashMessageSettingsSaved);
199196
}
200197

201198
describe('Automate Collect logs Edit form operations', () => {

cypress/e2e/ui/Settings/Application-Settings/settings_access_control.cy.js

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/* eslint-disable no-undef */
2+
import { flashClassMap } from '../../../../support/assertions/assertion_constants';
23

34
const textConstants = {
45
// Menu options
@@ -16,7 +17,6 @@ const textConstants = {
1617
// flash message assertions
1718
flashMessageOperationAdded: 'added',
1819
flashMessageOperationDeleted: 'delete',
19-
flashTypeSuccess: 'success',
2020

2121
// Configuration menu options and browser alert text snippets
2222
deleteItem: 'Delete this item',
@@ -28,7 +28,6 @@ const {
2828
deleteItem,
2929
flashMessageOperationAdded,
3030
flashMessageOperationDeleted,
31-
flashTypeSuccess,
3231
initialTenantDescription,
3332
initialTenantName,
3433
settingsMenuOption,
@@ -53,7 +52,7 @@ describe('Settings > Application Settings > Access Control', () => {
5352
cy.getFormInputFieldById('name').type(initialTenantName);
5453
cy.getFormInputFieldById('description').type(initialTenantDescription);
5554
cy.getFormFooterButtonByType('Add', 'submit').click();
56-
cy.expect_flash(flashTypeSuccess, flashMessageOperationAdded);
55+
cy.expect_flash(flashClassMap.success, flashMessageOperationAdded);
5756
cy.selectAccordionItem([
5857
/^ManageIQ Region/,
5958
'Tenants',
@@ -65,6 +64,6 @@ describe('Settings > Application Settings > Access Control', () => {
6564
confirmTriggerFn: () => cy.toolbar(toolBarConfigMenu, deleteItem),
6665
containsText: deleteItem,
6766
});
68-
cy.expect_flash(flashTypeSuccess, flashMessageOperationDeleted);
67+
cy.expect_flash(flashClassMap.success, flashMessageOperationDeleted);
6968
});
7069
});

0 commit comments

Comments
 (0)