Skip to content

Commit 5974af6

Browse files
leecalcoteleecalcote
authored
Merge pull request meshery#13211 from THEBOSS0369/data-testid
Added Data Test IDs in components for Playwright E2E Tests Verifications
2 parents 4796887 + df6e123 commit 5974af6

File tree

6 files changed

+65
-9
lines changed

6 files changed

+65
-9
lines changed

‎ui/components/DatabaseSummary.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -154,6 +154,7 @@ const DatabaseSummary = (props) => {
154154
<Button
155155
type="submit"
156156
variant="contained"
157+
data-testid="database-reset-button"
157158
color="primary"
158159
size="medium"
159160
disabled={!CAN(keys.RESET_DATABASE.action, keys.RESET_DATABASE.subject)}

‎ui/components/MeshAdapterConfigComponent.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -495,6 +495,7 @@ const MeshAdapterConfigComponent = (props) => {
495495
<Button
496496
type="submit"
497497
variant="contained"
498+
data-testid="adapter-undeploy-button"
498499
color="primary"
499500
size="large"
500501
onClick={handleAdapterUndeploy}
@@ -511,6 +512,7 @@ const MeshAdapterConfigComponent = (props) => {
511512
<Button
512513
type="submit"
513514
variant="contained"
515+
data-testid="adapter-connect-button"
514516
color="primary"
515517
size="large"
516518
onClick={handleSubmit}
@@ -530,6 +532,7 @@ const MeshAdapterConfigComponent = (props) => {
530532
value={selectedAvailableAdapter}
531533
// placeholder={'Mesh Adapter URL'}
532534
label="Available Adapters"
535+
data-testid="adapters-available-label"
533536
error={selectedAvailableAdapterError}
534537
/>
535538
</Grid>
@@ -550,6 +553,7 @@ const MeshAdapterConfigComponent = (props) => {
550553
<Button
551554
type="submit"
552555
variant="contained"
556+
data-testid="adapter-deploy-button"
553557
color="primary"
554558
size="large"
555559
onClick={handleAdapterDeploy}

‎ui/components/MesheryMetrics.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ function MesheryMetrics({
5656
</Typography>
5757
<Button
5858
aria-label="Add Grafana Charts"
59+
data-testid="configure-metrics-button"
5960
variant="contained"
6061
color="primary"
6162
size="large"

‎ui/components/MesherySettings.js‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,12 @@ const MesherySettings = (props) => {
269269
// disabled={!CAN(keys.VIEW_OVERVIEW.action, keys.VIEW_OVERVIEW.subject)}
270270
/>
271271
</CustomTooltip>
272-
<CustomTooltip title="Connect Meshery Adapters" placement="top" value={ADAPTERS}>
272+
<CustomTooltip
273+
title="Connect Meshery Adapters"
274+
data-testid="settings-tab-adapters"
275+
placement="top"
276+
value={ADAPTERS}
277+
>
273278
<Tab
274279
icon={<FontAwesomeIcon icon={faMendeley} style={iconMedium} />}
275280
label="Adapters"
@@ -287,6 +292,7 @@ const MesherySettings = (props) => {
287292
<Tab
288293
icon={<FontAwesomeIcon icon={faPoll} style={iconMedium} />}
289294
label="Metrics"
295+
data-testid="settings-tab-metrics"
290296
// tab="tabMetrics"
291297
value={METRICS}
292298
disabled={!CAN(keys.VIEW_METRICS.action, keys.VIEW_METRICS.subject)}
@@ -296,6 +302,7 @@ const MesherySettings = (props) => {
296302
<Tab
297303
icon={<FontAwesomeIcon icon={faFileInvoice} style={iconMedium} />}
298304
label="Registry"
305+
data-testid="settings-tab-registry"
299306
// tab="registry"
300307
value={REGISTRY}
301308
disabled={!CAN(keys.VIEW_REGISTRY.action, keys.VIEW_REGISTRY.subject)}
@@ -306,6 +313,7 @@ const MesherySettings = (props) => {
306313
<Tab
307314
icon={<FontAwesomeIcon icon={faDatabase} style={iconMedium} />}
308315
label="Reset"
316+
data-testid="settings-tab-reset"
309317
// tab="systemReset"
310318
value={RESET}
311319
// disabled={!CAN(keys.VIEW_SYSTEM_RESET.action, keys.VIEW_SYSTEM_RESET.subject)} TODO: uncomment when key get seeded

‎ui/components/telemetry/grafana/GrafanaConfigComponent.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,7 @@ function GrafanaConfigComponent({
7575
}))}
7676
value={grafanaURL}
7777
label="Grafana Base URL"
78+
data-testid="grafana-base-url"
7879
error={urlError}
7980
placeholder="Address of Grafana Server"
8081
noOptionsMessage="No Grafana servers discovered"
@@ -85,6 +86,7 @@ function GrafanaConfigComponent({
8586
<TextField
8687
id="grafanaAPIKey"
8788
name="grafanaAPIKey"
89+
data-testid="grafana-api-key"
8890
label="API Key"
8991
fullWidth
9092
value={grafanaAPIKey}

‎ui/pages/extensions.js‎

Lines changed: 48 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,12 @@ const MeshMapSignUpcard = ({ classes, hasAccessToMeshMap = false }) => {
2929
<UsesSistent>
3030
<Grid item {...LARGE_6_MED_12_GRID_STYLE}>
3131
<CardContainer>
32-
<Typography className={classes.frontContent} variant="h5" component="div">
32+
<Typography
33+
className={classes.frontContent}
34+
data-testid="kanvas-signup-heading"
35+
variant="h5"
36+
component="div"
37+
>
3338
Kanvas
3439
</Typography>
3540

@@ -43,6 +48,7 @@ const MeshMapSignUpcard = ({ classes, hasAccessToMeshMap = false }) => {
4348
<div style={{ textAlign: 'right' }}>
4449
<Button
4550
variant="contained"
51+
data-testid="kanvas-signup-btn"
4652
disabled={hasAccessToMeshMap}
4753
onClick={(e) => handleSignUp(e)}
4854
>
@@ -66,6 +72,7 @@ const MeshMapSnapShotLogo = () => {
6672
maxWidth: '220px',
6773
maxHeight: '150px',
6874
}}
75+
data-testid="kanvas-snapshot-image"
6976
src="/static/img/meshmap-snapshot-logo.svg"
7077
/>
7178
);
@@ -81,11 +88,16 @@ const MeshMapSnapShotCard = ({ classes, githubActionEnabled = false }) => {
8188
<UsesSistent>
8289
<Grid item {...LARGE_6_MED_12_GRID_STYLE}>
8390
<CardContainer>
84-
<Typography className={classes.frontContent} variant="h5" component="div">
91+
<Typography
92+
className={classes.frontContent}
93+
data-testid="kanvas-snapshot-heading"
94+
variant="h5"
95+
component="div"
96+
>
8597
GitHub Action: Kanvas Snapshot
8698
</Typography>
8799

88-
<FrontSideDescription variant="body">
100+
<FrontSideDescription data-testid="kanvas-snapshot-description" variant="body">
89101
<MeshMapSnapShotLogo />
90102
Connect Kanvas to your GitHub repo and see changes pull request-to-pull request. Get
91103
snapshots of your infrastructure directly in your PRs.
@@ -95,6 +107,7 @@ const MeshMapSnapShotCard = ({ classes, githubActionEnabled = false }) => {
95107
<Button
96108
variant="contained"
97109
color="primary"
110+
data-testid="kanvas-snapshot-enable-btn"
98111
disabled={githubActionEnabled}
99112
onClick={(e) => handleEnable(e)}
100113
>
@@ -135,7 +148,12 @@ const MesheryPerformanceAction = ({ classes, githubActionEnabled = false }) => {
135148
<UsesSistent>
136149
<Grid item {...LARGE_6_MED_12_GRID_STYLE}>
137150
<CardContainer>
138-
<Typography className={classes.frontContent} variant="h5" component="div">
151+
<Typography
152+
className={classes.frontContent}
153+
data-testid="performance-analysis-heading"
154+
variant="h5"
155+
component="div"
156+
>
139157
GitHub Action: Performance Analysis
140158
</Typography>
141159

@@ -148,6 +166,7 @@ const MesheryPerformanceAction = ({ classes, githubActionEnabled = false }) => {
148166
<div style={{ textAlign: 'right' }}>
149167
<Button
150168
variant="contained"
169+
data-testid="performance-analysis-enable-btn"
151170
disabled={githubActionEnabled}
152171
onClick={(e) => handleEnable(e)}
153172
>
@@ -185,7 +204,12 @@ const MesheryDockerExtension = ({ classes }) => {
185204
<UsesSistent>
186205
<Grid item {...LARGE_6_MED_12_GRID_STYLE}>
187206
<CardContainer>
188-
<Typography className={classes.frontContent} variant="h5" component="div">
207+
<Typography
208+
className={classes.frontContent}
209+
data-testid="docker-extension-heading"
210+
variant="h5"
211+
component="div"
212+
>
189213
Meshery Docker Extension
190214
</Typography>
191215

@@ -197,7 +221,12 @@ const MesheryDockerExtension = ({ classes }) => {
197221
</FrontSideDescription>
198222
{
199223
<div style={{ textAlign: 'right' }}>
200-
<Button variant="contained" color="primary" onClick={(e) => handleDownload(e)}>
224+
<Button
225+
variant="contained"
226+
color="primary"
227+
data-testid="docker-extension-download-btn"
228+
onClick={(e) => handleDownload(e)}
229+
>
201230
Download
202231
</Button>
203232
</div>
@@ -245,7 +274,12 @@ const MesheryDesignEmbedExtension = ({ classes }) => {
245274
</FrontSideDescription>
246275
{
247276
<div style={{ textAlign: 'right' }}>
248-
<Button variant="contained" color="primary" onClick={(e) => handleLearnMore(e)}>
277+
<Button
278+
variant="contained"
279+
color="primary"
280+
data-testid="design-embed-learn-more-btn"
281+
onClick={(e) => handleLearnMore(e)}
282+
>
249283
Learn More
250284
</Button>
251285
</div>
@@ -334,12 +368,18 @@ const Extensions = ({ classes, toggleCatalogContent, capabilitiesRegistry }) =>
334368
<WrappedMesheryEmbedDesignExtension />
335369
<Grid item {...INITIAL_GRID_SIZE}>
336370
<CardContainer>
337-
<Typography className={classes.frontContent} variant="h5" component="div">
371+
<Typography
372+
className={classes.frontContent}
373+
data-testid="catalog-section-heading"
374+
variant="h5"
375+
component="div"
376+
>
338377
{'Meshery Catalog'}
339378
</Typography>
340379

341380
<FrontSideDescription variant="body">
342381
<CatalogIcon
382+
data-testid="catalog-toggle-switch"
343383
style={{
344384
paddingRight: '1rem',
345385
height: '80px',

0 commit comments

Comments
 (0)