Skip to content

Commit 3eef58d

Browse files
authored
Merge pull request #17039 from IsaSih/capi-modal-overlay-fix
Fixed v2prov-capi.spec.ts - modal overlay plus local distro check
2 parents 7bc0b45 + a36a47f commit 3eef58d

1 file changed

Lines changed: 15 additions & 6 deletions

File tree

cypress/e2e/tests/pages/manager/v2prov-capi.spec.ts

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import ClusterManagerListPagePo from '@/cypress/e2e/po/pages/cluster-manager/cluster-manager-list.po';
22
import HomePagePo from '@/cypress/e2e/po/pages/home.po';
3+
import { qase } from '@/cypress/support/qase';
34

45
import { mockCapiMgmtCluster, mockCapiProvCluster } from '@/cypress/e2e/blueprints/manager/v2prov-capi-cluster-mocks';
56

@@ -30,13 +31,21 @@ describe('Cluster List - v2 Provisioning CAPI Clusters', { tags: ['@manager', '@
3031
clusterList.waitForPage();
3132
});
3233

33-
it('should not allow editing CAPI cluster configs', () => {
34-
clusterList.list().actionMenu(clusterName).getMenuItem('Edit Config').should('not.exist');
34+
qase(18526, it('should not allow editing CAPI cluster configs', () => {
35+
const capiActionMenu = clusterList.list().actionMenu(clusterName);
36+
37+
capiActionMenu.getMenuItem('Edit Config').should('not.exist');
38+
39+
// Close the first row action menu so its overlay does not block subsequent row actions.
40+
clusterList.list().actionMenuClose(clusterName);
41+
cy.get('body').find('[dropdown-menu-collection]:visible').should('have.length', 0);
42+
3543
clusterList.list().actionMenu('local').getMenuItem('Edit Config').should('exist');
36-
});
44+
}));
3745

38-
it('should not report a machine provider for CAPI clusters', () => {
46+
qase(18528, it('should not report a machine provider for CAPI clusters', () => {
3947
clusterList.list().provider(clusterName).should('have.text', ' RKE2');
40-
clusterList.list().provider('local').should('have.text', 'Local K3s');
41-
});
48+
49+
clusterList.list().provider('local').invoke('text').should('match', /^Local (K3s|RKE2)$/);
50+
}));
4251
});

0 commit comments

Comments
 (0)