Skip to content

Commit d8d7836

Browse files
committed
mgr/dashboard: fix rgw and osd regression in e2e
use aria-label as the selector in tests. data-testid is not supported through this carbon cds-checkbox input so we can't use it regression started after started after ceph#61319 and https://github.com/ceph/ceph/pull/61478/files#diff-7bd2a1f48bd2a7bcebb744eb04d84706087b6b3c2651c4b1ad085b4b6e03fc6d where multi-select is removed Fixes: https://tracker.ceph.com/issues/68871 Signed-off-by: Nizamudeen A <[email protected]>
1 parent aeee649 commit d8d7836

25 files changed

+75
-70
lines changed

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/images.e2e-spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('Images page', () => {
1818
after(() => {
1919
// Deletes images test pool
2020
pools.navigateTo();
21-
pools.delete(poolName, null, null, true);
21+
pools.delete(poolName, null, null, true, false, false, true);
2222
pools.navigateTo();
2323
pools.existTableCell(poolName, false);
2424
});
@@ -58,7 +58,7 @@ describe('Images page', () => {
5858
});
5959

6060
it('should delete image', () => {
61-
images.delete(newImageName, null, null, true);
61+
images.delete(newImageName, null, null, true, false, false, true);
6262
});
6363
});
6464

src/pybind/mgr/dashboard/frontend/cypress/e2e/block/mirroring.e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ describe('Mirroring page', () => {
112112

113113
afterEach(() => {
114114
pools.navigateTo();
115-
pools.delete(poolName, null, null, true);
115+
pools.delete(poolName, null, null, true, false, false, true);
116116
});
117117
});
118118
});

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/hosts.po.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ export class HostsPageHelper extends PageHelper {
6565
}
6666

6767
remove(hostname: string) {
68-
super.delete(hostname, this.columnIndex.hostname, 'hosts', true, false, true);
68+
super.delete(hostname, this.columnIndex.hostname, 'hosts', true, false, true, true);
6969
}
7070

7171
// Add or remove labels on a host, then verify labels in the table

src/pybind/mgr/dashboard/frontend/cypress/e2e/cluster/logs.e2e-spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ describe('Logs page', () => {
5454

5555
it('should delete pool and check audit logs reacted', () => {
5656
pools.navigateTo();
57-
pools.delete(poolname, null, null, true);
57+
pools.delete(poolname, null, null, true, false, false, true);
5858
logs.checkAuditForPoolFunction(poolname, 'delete', hour, minute);
5959
});
6060
});

src/pybind/mgr/dashboard/frontend/cypress/e2e/common/forms-helper.feature.po.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,10 @@ Then('I check the tick box in carbon modal', () => {
7474
cy.get('cds-modal input#confirmation_input').click({ force: true });
7575
});
7676

77+
Then('I confirm the resource {string}', (name: string) => {
78+
cy.get('cds-modal input#resource_name').type(name);
79+
});
80+
7781
And('I confirm to {string}', (action: string) => {
7882
cy.contains('cd-modal button', action).click();
7983
cy.get('cd-modal').should('not.exist');

src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/filesystems.e2e-spec.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@ Feature: CephFS Management
2626
And I select a row "test_cephfs"
2727
And I click on "Remove" button from the table actions
2828
Then I should see the carbon modal
29-
And I check the tick box in carbon modal
29+
And I confirm the resource "test_cephfs"
3030
And I click on "Remove File System" button
3131
Then I should not see a row with "test_cephfs"

src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/snapshots.e2e-spec.feature

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Feature: CephFS Snapshot Management
6060
And I go to the "Subvolumes" tab
6161
And I select a row "test_clone" in the expanded row
6262
And I click on "Remove" button from the table actions in the expanded row
63-
And I check the tick box in carbon modal
63+
And I confirm the resource "test_clone"
6464
And I click on "Remove Subvolume" button
6565
Then I wait for "5" seconds
6666
And I should not see a row with "test_clone" in the expanded row
@@ -71,7 +71,7 @@ Feature: CephFS Snapshot Management
7171
And I go to the "Snapshots" tab
7272
And I select a row "test_snapshot" in the expanded row
7373
And I click on "Remove" button from the table actions in the expanded row
74-
And I check the tick box in carbon modal
74+
And I confirm the resource "test_snapshot"
7575
And I click on "Remove Snapshot" button
7676
Then I should not see a row with "test_snapshot" in the expanded row
7777

@@ -81,7 +81,7 @@ Feature: CephFS Snapshot Management
8181
And I go to the "Subvolumes" tab
8282
When I select a row "test_subvolume" in the expanded row
8383
And I click on "Remove" button from the table actions in the expanded row
84-
And I check the tick box in carbon modal
84+
And I confirm the resource "test_subvolume"
8585
And I click on "Remove Subvolume" button
8686
Then I should not see a row with "test_subvolume" in the expanded row
8787

@@ -90,6 +90,6 @@ Feature: CephFS Snapshot Management
9090
And I select a row "test_cephfs"
9191
And I click on "Remove" button from the table actions
9292
Then I should see the carbon modal
93-
And I check the tick box in carbon modal
93+
And I confirm the resource "test_cephfs"
9494
And I click on "Remove File System" button
9595
Then I should not see a row with "test_cephfs"

src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolume-groups.e2e-spec.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Feature: CephFS Subvolume Group management
3737
And I go to the "Subvolume groups" tab
3838
When I select a row "test_subvolume_group" in the expanded row
3939
And I click on "Remove" button from the table actions in the expanded row
40-
And I check the tick box in carbon modal
40+
And I confirm the resource "test_subvolume_group"
4141
And I click on "Remove subvolume group" button
4242
Then I should not see a row with "test_subvolume_group" in the expanded row
4343

@@ -46,6 +46,6 @@ Feature: CephFS Subvolume Group management
4646
And I select a row "test_cephfs"
4747
And I click on "Remove" button from the table actions
4848
Then I should see the carbon modal
49-
And I check the tick box in carbon modal
49+
And I confirm the resource "test_cephfs"
5050
And I click on "Remove File System" button
5151
Then I should not see a row with "test_cephfs_edit"

src/pybind/mgr/dashboard/frontend/cypress/e2e/filesystems/subvolumes.e2e-spec.feature

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ Feature: CephFS Subvolume management
3737
And I go to the "Subvolumes" tab
3838
When I select a row "test_subvolume" in the expanded row
3939
And I click on "Remove" button from the table actions in the expanded row
40-
And I check the tick box in carbon modal
40+
And I confirm the resource "test_subvolume"
4141
And I click on "Remove Subvolume" button
4242
Then I should not see a row with "test_subvolume" in the expanded row
4343

@@ -46,6 +46,6 @@ Feature: CephFS Subvolume management
4646
And I select a row "test_cephfs"
4747
And I click on "Remove" button from the table actions
4848
Then I should see the carbon modal
49-
And I check the tick box in carbon modal
49+
And I confirm the resource "test_cephfs"
5050
And I click on "Remove File System" button
5151
Then I should not see a row with "test_cephfs_edit"

src/pybind/mgr/dashboard/frontend/cypress/e2e/orchestrator/workflow/02-create-cluster-add-host.feature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ Feature: Cluster expansion host addition
2929
When I select a row "<hostname>"
3030
And I click on "Remove" button from the table actions
3131
Then I should see the carbon modal
32-
And I check the tick box in carbon modal
32+
And I confirm the resource "<hostname>"
3333
And I click on "Remove Host" button
3434
And I should not see a row with "<hostname>"
3535

0 commit comments

Comments
 (0)