Skip to content

Commit 5395669

Browse files
kaiarrowoodkaiarrowood
authored
fix(entities): form state data-testids [khcp-13000] (#1576)
Update entity form action data-testid's to include form state (`create`/`edit`). Part of [KHCP-13000](https://konghq.atlassian.net/browse/KHCP-13000).
1 parent 0e7bf19 commit 5395669

File tree

16 files changed

+639
-637
lines changed

16 files changed

+639
-637
lines changed

‎packages/entities/entities-certificates/src/components/CACertificateForm.cy.ts

+44-44
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ describe('<CACertificateForm />', () => {
7171
cy.get('.kong-ui-entities-ca-certificates-form').should('be.visible')
7272
cy.get('.kong-ui-entities-ca-certificates-form form').should('be.visible')
7373
// button state
74-
cy.getTestId('ca_certificate-form-cancel').should('be.visible')
75-
cy.getTestId('ca_certificate-form-submit').should('be.visible')
76-
cy.getTestId('ca_certificate-form-cancel').should('be.enabled')
77-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
74+
cy.getTestId('ca_certificate-create-form-cancel').should('be.visible')
75+
cy.getTestId('ca_certificate-create-form-submit').should('be.visible')
76+
cy.getTestId('ca_certificate-create-form-cancel').should('be.enabled')
77+
cy.getTestId('ca_certificate-create-form-submit').should('be.disabled')
7878
// form fields
7979
cy.getTestId('ca-certificate-form-cert').should('be.visible')
8080
cy.getTestId('ca-certificate-form-cert-digest').should('be.visible')
@@ -90,16 +90,16 @@ describe('<CACertificateForm />', () => {
9090

9191
cy.get('.kong-ui-entities-ca-certificates-form').should('be.visible')
9292
// default button state
93-
cy.getTestId('ca_certificate-form-cancel').should('be.visible')
94-
cy.getTestId('ca_certificate-form-submit').should('be.visible')
95-
cy.getTestId('ca_certificate-form-cancel').should('be.enabled')
96-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
93+
cy.getTestId('ca_certificate-create-form-cancel').should('be.visible')
94+
cy.getTestId('ca_certificate-create-form-submit').should('be.visible')
95+
cy.getTestId('ca_certificate-create-form-cancel').should('be.enabled')
96+
cy.getTestId('ca_certificate-create-form-submit').should('be.disabled')
9797
// enables save when required fields have values
9898
cy.getTestId('ca-certificate-form-cert').type(caCertificate1.cert)
99-
cy.getTestId('ca_certificate-form-submit').should('be.enabled')
99+
cy.getTestId('ca_certificate-create-form-submit').should('be.enabled')
100100
// disables save when required field is cleared
101101
cy.getTestId('ca-certificate-form-cert').clear()
102-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
102+
cy.getTestId('ca_certificate-create-form-submit').should('be.disabled')
103103
})
104104

105105
it('should show edit form', () => {
@@ -115,10 +115,10 @@ describe('<CACertificateForm />', () => {
115115
cy.wait('@getCertificate')
116116
cy.get('.kong-ui-entities-ca-certificates-form').should('be.visible')
117117
// button state
118-
cy.getTestId('ca_certificate-form-cancel').should('be.visible')
119-
cy.getTestId('ca_certificate-form-submit').should('be.visible')
120-
cy.getTestId('ca_certificate-form-cancel').should('be.enabled')
121-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
118+
cy.getTestId('ca_certificate-edit-form-cancel').should('be.visible')
119+
cy.getTestId('ca_certificate-edit-form-submit').should('be.visible')
120+
cy.getTestId('ca_certificate-edit-form-cancel').should('be.enabled')
121+
cy.getTestId('ca_certificate-edit-form-submit').should('be.disabled')
122122
// form fields
123123
cy.getTestId('ca-certificate-form-cert').should('have.value', caCertificate1.cert)
124124
})
@@ -136,16 +136,16 @@ describe('<CACertificateForm />', () => {
136136
cy.wait('@getCertificate')
137137
cy.get('.kong-ui-entities-ca-certificates-form').should('be.visible')
138138
// default button state
139-
cy.getTestId('ca_certificate-form-cancel').should('be.visible')
140-
cy.getTestId('ca_certificate-form-submit').should('be.visible')
141-
cy.getTestId('ca_certificate-form-cancel').should('be.enabled')
142-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
139+
cy.getTestId('ca_certificate-edit-form-cancel').should('be.visible')
140+
cy.getTestId('ca_certificate-edit-form-submit').should('be.visible')
141+
cy.getTestId('ca_certificate-edit-form-cancel').should('be.enabled')
142+
cy.getTestId('ca_certificate-edit-form-submit').should('be.disabled')
143143
// enables save when form has changes
144144
cy.getTestId('ca-certificate-form-cert-digest').type('edited')
145-
cy.getTestId('ca_certificate-form-submit').should('be.enabled')
145+
cy.getTestId('ca_certificate-edit-form-submit').should('be.enabled')
146146
// disables save when form changes are undone
147147
cy.getTestId('ca-certificate-form-cert-digest').clear()
148-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
148+
cy.getTestId('ca_certificate-edit-form-submit').should('be.disabled')
149149
})
150150

151151
it('should handle error state - failed to load CA Certificate', () => {
@@ -172,8 +172,8 @@ describe('<CACertificateForm />', () => {
172172
// error state is displayed
173173
cy.getTestId('form-fetch-error').should('be.visible')
174174
// buttons and form hidden
175-
cy.getTestId('ca_certificate-form-cancel').should('not.exist')
176-
cy.getTestId('ca_certificate-form-submit').should('not.exist')
175+
cy.getTestId('ca_certificate-edit-form-cancel').should('not.exist')
176+
cy.getTestId('ca_certificate-edit-form-submit').should('not.exist')
177177
cy.get('.kong-ui-entities-ca-certificates-form form').should('not.exist')
178178
})
179179

@@ -255,10 +255,10 @@ describe('<CACertificateForm />', () => {
255255
cy.get('.kong-ui-entities-ca-certificates-form').should('be.visible')
256256
cy.get('.kong-ui-entities-ca-certificates-form form').should('be.visible')
257257
// button state
258-
cy.getTestId('ca_certificate-form-cancel').should('be.visible')
259-
cy.getTestId('ca_certificate-form-submit').should('be.visible')
260-
cy.getTestId('ca_certificate-form-cancel').should('be.enabled')
261-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
258+
cy.getTestId('ca_certificate-create-form-cancel').should('be.visible')
259+
cy.getTestId('ca_certificate-create-form-submit').should('be.visible')
260+
cy.getTestId('ca_certificate-create-form-cancel').should('be.enabled')
261+
cy.getTestId('ca_certificate-create-form-submit').should('be.disabled')
262262
// form fields
263263
cy.getTestId('ca-certificate-form-cert').should('be.visible')
264264
cy.getTestId('ca-certificate-form-cert-digest').should('be.visible')
@@ -273,16 +273,16 @@ describe('<CACertificateForm />', () => {
273273
})
274274
cy.get('.kong-ui-entities-ca-certificates-form').should('be.visible')
275275
// default button state
276-
cy.getTestId('ca_certificate-form-cancel').should('be.visible')
277-
cy.getTestId('ca_certificate-form-submit').should('be.visible')
278-
cy.getTestId('ca_certificate-form-cancel').should('be.enabled')
279-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
276+
cy.getTestId('ca_certificate-create-form-cancel').should('be.visible')
277+
cy.getTestId('ca_certificate-create-form-submit').should('be.visible')
278+
cy.getTestId('ca_certificate-create-form-cancel').should('be.enabled')
279+
cy.getTestId('ca_certificate-create-form-submit').should('be.disabled')
280280
// enables save when required fields have values
281281
cy.getTestId('ca-certificate-form-cert').type(caCertificate1.cert)
282-
cy.getTestId('ca_certificate-form-submit').should('be.enabled')
282+
cy.getTestId('ca_certificate-create-form-submit').should('be.enabled')
283283
// disables save when required field is cleared
284284
cy.getTestId('ca-certificate-form-cert').clear()
285-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
285+
cy.getTestId('ca_certificate-create-form-submit').should('be.disabled')
286286
})
287287

288288
it('should show edit form', () => {
@@ -298,10 +298,10 @@ describe('<CACertificateForm />', () => {
298298
cy.wait('@getCertificate')
299299
cy.get('.kong-ui-entities-ca-certificates-form').should('be.visible')
300300
// button state
301-
cy.getTestId('ca_certificate-form-cancel').should('be.visible')
302-
cy.getTestId('ca_certificate-form-submit').should('be.visible')
303-
cy.getTestId('ca_certificate-form-cancel').should('be.enabled')
304-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
301+
cy.getTestId('ca_certificate-edit-form-cancel').should('be.visible')
302+
cy.getTestId('ca_certificate-edit-form-submit').should('be.visible')
303+
cy.getTestId('ca_certificate-edit-form-cancel').should('be.enabled')
304+
cy.getTestId('ca_certificate-edit-form-submit').should('be.disabled')
305305
// form fields
306306
cy.getTestId('ca-certificate-form-cert').should('have.value', caCertificate1.cert)
307307
})
@@ -319,16 +319,16 @@ describe('<CACertificateForm />', () => {
319319
cy.wait('@getCertificate')
320320
cy.get('.kong-ui-entities-ca-certificates-form').should('be.visible')
321321
// default button state
322-
cy.getTestId('ca_certificate-form-cancel').should('be.visible')
323-
cy.getTestId('ca_certificate-form-submit').should('be.visible')
324-
cy.getTestId('ca_certificate-form-cancel').should('be.enabled')
325-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
322+
cy.getTestId('ca_certificate-edit-form-cancel').should('be.visible')
323+
cy.getTestId('ca_certificate-edit-form-submit').should('be.visible')
324+
cy.getTestId('ca_certificate-edit-form-cancel').should('be.enabled')
325+
cy.getTestId('ca_certificate-edit-form-submit').should('be.disabled')
326326
// enables save when form has changes
327327
cy.getTestId('ca-certificate-form-cert-digest').type('edited')
328-
cy.getTestId('ca_certificate-form-submit').should('be.enabled')
328+
cy.getTestId('ca_certificate-edit-form-submit').should('be.enabled')
329329
// disables save when form changes are undone
330330
cy.getTestId('ca-certificate-form-cert-digest').clear()
331-
cy.getTestId('ca_certificate-form-submit').should('be.disabled')
331+
cy.getTestId('ca_certificate-edit-form-submit').should('be.disabled')
332332
})
333333

334334
it('should handle error state - failed to load CA Certificate', () => {
@@ -355,8 +355,8 @@ describe('<CACertificateForm />', () => {
355355
// error state is displayed
356356
cy.getTestId('form-fetch-error').should('be.visible')
357357
// buttons and form hidden
358-
cy.getTestId('ca_certificate-form-cancel').should('not.exist')
359-
cy.getTestId('ca_certificate-form-submit').should('not.exist')
358+
cy.getTestId('ca_certificate-create-form-cancel').should('not.exist')
359+
cy.getTestId('ca_certificate-create-form-submit').should('not.exist')
360360
cy.get('.kong-ui-entities-ca-certificates-form form').should('not.exist')
361361
})
362362

0 commit comments

Comments
 (0)