Skip to content

Commit 74e6d57

Browse files
authored
Merge pull request #5453 from tdonohue/bump_cypress
[Port dspace-8_x] Bump to Cypress v14
2 parents 950313f + c6544ac commit 74e6d57

File tree

3 files changed

+92
-34
lines changed

3 files changed

+92
-34
lines changed

cypress/e2e/item-edit.cy.ts

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ describe('Edit Item > Edit Metadata tab', () => {
2323
// <ds-edit-item-page> tag must be loaded
2424
cy.get('ds-edit-item-page').should('be.visible');
2525

26+
// wait for all the tabs to be rendered on this page
27+
cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
28+
cy.wrap($row).find('a[role="tab"]').should('be.visible');
29+
});
30+
2631
// wait for all the ds-dso-edit-metadata-value components to be rendered
2732
cy.get('ds-dso-edit-metadata-value div[role="row"]').each(($row: HTMLDivElement) => {
2833
cy.wrap($row).find('div[role="cell"]').should('be.visible');
@@ -46,6 +51,11 @@ describe('Edit Item > Status tab', () => {
4651
// <ds-item-status> tag must be loaded
4752
cy.get('ds-item-status').should('be.visible');
4853

54+
// wait for all the tabs to be rendered on this page
55+
cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
56+
cy.wrap($row).find('a[role="tab"]').should('be.visible');
57+
});
58+
4959
// Analyze for accessibility issues
5060
testA11y('ds-item-status');
5161
});
@@ -64,6 +74,10 @@ describe('Edit Item > Bitstreams tab', () => {
6474
// <ds-item-bitstreams> tag must be loaded
6575
cy.get('ds-item-bitstreams').should('be.visible');
6676

77+
// wait for all the tabs to be rendered on this page
78+
cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
79+
cy.wrap($row).find('a[role="tab"]').should('be.visible');
80+
});
6781
// Table of item bitstreams must also be loaded
6882
cy.get('div.item-bitstreams').should('be.visible');
6983

@@ -93,6 +107,11 @@ describe('Edit Item > Curate tab', () => {
93107
// <ds-item-curate> tag must be loaded
94108
cy.get('ds-item-curate').should('be.visible');
95109

110+
// wait for all the tabs to be rendered on this page
111+
cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
112+
cy.wrap($row).find('a[role="tab"]').should('be.visible');
113+
});
114+
96115
// Analyze for accessibility issues
97116
testA11y('ds-item-curate');
98117
});
@@ -111,6 +130,11 @@ describe('Edit Item > Relationships tab', () => {
111130
// <ds-item-relationships> tag must be loaded
112131
cy.get('ds-item-relationships').should('be.visible');
113132

133+
// wait for all the tabs to be rendered on this page
134+
cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
135+
cy.wrap($row).find('a[role="tab"]').should('be.visible');
136+
});
137+
114138
// Analyze for accessibility issues
115139
testA11y('ds-item-relationships');
116140
});
@@ -129,6 +153,11 @@ describe('Edit Item > Version History tab', () => {
129153
// <ds-item-version-history> tag must be loaded
130154
cy.get('ds-item-version-history').should('be.visible');
131155

156+
// wait for all the tabs to be rendered on this page
157+
cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
158+
cy.wrap($row).find('a[role="tab"]').should('be.visible');
159+
});
160+
132161
// Analyze for accessibility issues
133162
testA11y('ds-item-version-history');
134163
});
@@ -147,6 +176,11 @@ describe('Edit Item > Access Control tab', () => {
147176
// <ds-item-access-control> tag must be loaded
148177
cy.get('ds-item-access-control').should('be.visible');
149178

179+
// wait for all the tabs to be rendered on this page
180+
cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
181+
cy.wrap($row).find('a[role="tab"]').should('be.visible');
182+
});
183+
150184
// Analyze for accessibility issues
151185
testA11y('ds-item-access-control');
152186
});
@@ -165,6 +199,11 @@ describe('Edit Item > Collection Mapper tab', () => {
165199
// <ds-item-collection-mapper> tag must be loaded
166200
cy.get('ds-item-collection-mapper').should('be.visible');
167201

202+
// wait for all the tabs to be rendered on this page
203+
cy.get('ds-edit-item-page ul[role="tablist"]').each(($row: HTMLUListElement) => {
204+
cy.wrap($row).find('a[role="tab"]').should('be.visible');
205+
});
206+
168207
// Analyze entire page for accessibility issues
169208
testA11y('ds-item-collection-mapper');
170209

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
"copy-webpack-plugin": "^6.4.1",
159159
"cross-env": "^7.0.3",
160160
"csstype": "^3.2.3",
161-
"cypress": "^13.17.0",
161+
"cypress": "^14.5.4",
162162
"cypress-axe": "^1.7.0",
163163
"deep-freeze": "0.0.1",
164164
"eslint": "^8.39.0",

yarn.lock

Lines changed: 52 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1492,25 +1492,25 @@
14921492
resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.2.0.tgz#2cbcf822bf3764c9658c4d2e568bd0c0cb748016"
14931493
integrity sha512-+OJ9konv95ClSTOJCmMZqpd5+YGsB2S+x6w3E1oaM8UuR5j8nTNHYSz8c9BEPGDOCMQYIEEGlVPj/VY64iTbGw==
14941494

1495-
"@cypress/request@^3.0.6":
1496-
version "3.0.6"
1497-
resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.6.tgz#f5580add6acee0e183b4d4e07eff4f31327ae12b"
1498-
integrity sha512-fi0eVdCOtKu5Ed6+E8mYxUF6ZTFJDZvHogCBelM0xVXmrDEkyM22gRArQzq1YcHPm1V47Vf/iAD+WgVdUlJCGg==
1495+
"@cypress/request@^3.0.9":
1496+
version "3.0.10"
1497+
resolved "https://registry.yarnpkg.com/@cypress/request/-/request-3.0.10.tgz#e09c695e8460a82acafe6cfaf089cf2ca06dc054"
1498+
integrity sha512-hauBrOdvu08vOsagkZ/Aju5XuiZx6ldsLfByg1htFeldhex+PeMrYauANzFsMJeAA0+dyPLbDoX2OYuvVoLDkQ==
14991499
dependencies:
15001500
aws-sign2 "~0.7.0"
15011501
aws4 "^1.8.0"
15021502
caseless "~0.12.0"
15031503
combined-stream "~1.0.6"
15041504
extend "~3.0.2"
15051505
forever-agent "~0.6.1"
1506-
form-data "~4.0.0"
1506+
form-data "~4.0.4"
15071507
http-signature "~1.4.0"
15081508
is-typedarray "~1.0.0"
15091509
isstream "~0.1.2"
15101510
json-stringify-safe "~5.0.1"
15111511
mime-types "~2.1.19"
15121512
performance-now "^2.1.0"
1513-
qs "6.13.0"
1513+
qs "~6.14.1"
15141514
safe-buffer "^5.1.2"
15151515
tough-cookie "^5.0.0"
15161516
tunnel-agent "^0.6.0"
@@ -4181,10 +4181,10 @@ chrome-trace-event@^1.0.2:
41814181
resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz#05bffd7ff928465093314708c93bdfa9bd1f0f5b"
41824182
integrity sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==
41834183

4184-
ci-info@^4.0.0:
4185-
version "4.1.0"
4186-
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.1.0.tgz#92319d2fa29d2620180ea5afed31f589bc98cf83"
4187-
integrity sha512-HutrvTNsF48wnxkzERIXOe5/mlcfFcbfCmwcg6CJnizbSue78AbDt+1cgl26zwn61WFxhcPykPfZrbqjGmBb4A==
4184+
ci-info@^4.1.0:
4185+
version "4.4.0"
4186+
resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-4.4.0.tgz#7d54eff9f54b45b62401c26032696eb59c8bd18c"
4187+
integrity sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==
41884188

41894189
classnames@^2.2.6:
41904190
version "2.5.1"
@@ -4215,14 +4215,14 @@ cli-spinners@^2.5.0:
42154215
resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41"
42164216
integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg==
42174217

4218-
cli-table3@~0.6.1:
4219-
version "0.6.5"
4220-
resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.5.tgz#013b91351762739c16a9567c21a04632e449bf2f"
4221-
integrity sha512-+W/5efTR7y5HRD7gACw9yQjqMVvEMLBHmboM/kPWam+H+Hmyrgjh6YncVKK122YZkXrLudzTuAukUw9FnMf7IQ==
4218+
cli-table3@0.6.1:
4219+
version "0.6.1"
4220+
resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.1.tgz#36ce9b7af4847f288d3cdd081fbd09bf7bd237b8"
4221+
integrity sha512-w0q/enDHhPLq44ovMGdQeeDLvwxwavsJX7oQGYt/LrBlYsyaxyDnp6z3QzFut/6kLLKnlcUVJLrpB7KBfgG/RA==
42224222
dependencies:
42234223
string-width "^4.2.0"
42244224
optionalDependencies:
4225-
"@colors/colors" "1.5.0"
4225+
colors "1.4.0"
42264226

42274227
cli-truncate@^2.1.0:
42284228
version "2.1.0"
@@ -4303,7 +4303,7 @@ colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16:
43034303
resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a"
43044304
integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==
43054305

4306-
colors@^1.4.0:
4306+
colors@1.4.0, colors@^1.4.0:
43074307
version "1.4.0"
43084308
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
43094309
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
@@ -4670,12 +4670,12 @@ cypress-axe@^1.7.0:
46704670
resolved "https://registry.yarnpkg.com/cypress-axe/-/cypress-axe-1.7.0.tgz#258c007db13c637eaffec1cf2765090b521c07a0"
46714671
integrity sha512-zzJpvAAjauEB3GZl0KYXb8i3w6MztWAt2WM3czYTFyNVC30alDmqCm9E7GwZ4bgkldZJlmHakaVEyu73R5St4w==
46724672

4673-
cypress@^13.17.0:
4674-
version "13.17.0"
4675-
resolved "https://registry.yarnpkg.com/cypress/-/cypress-13.17.0.tgz#34c3d68080c4497eace0f353bd1629587a5f600d"
4676-
integrity sha512-5xWkaPurwkIljojFidhw8lFScyxhtiFHl/i/3zov+1Z5CmY4t9tjIdvSXfu82Y3w7wt0uR9KkucbhkVvJZLQSA==
4673+
cypress@^14.5.4:
4674+
version "14.5.4"
4675+
resolved "https://registry.yarnpkg.com/cypress/-/cypress-14.5.4.tgz#d821fbb6220c3328e7413acc7724b75319c9e64d"
4676+
integrity sha512-0Dhm4qc9VatOcI1GiFGVt8osgpPdqJLHzRwcAB5MSD/CAAts3oybvPUPawHyvJZUd8osADqZe/xzMsZ8sDTjXw==
46774677
dependencies:
4678-
"@cypress/request" "^3.0.6"
4678+
"@cypress/request" "^3.0.9"
46794679
"@cypress/xvfb" "^1.2.4"
46804680
"@types/sinonjs__fake-timers" "8.1.1"
46814681
"@types/sizzle" "^2.3.2"
@@ -4686,9 +4686,9 @@ cypress@^13.17.0:
46864686
cachedir "^2.3.0"
46874687
chalk "^4.1.0"
46884688
check-more-types "^2.24.0"
4689-
ci-info "^4.0.0"
4689+
ci-info "^4.1.0"
46904690
cli-cursor "^3.1.0"
4691-
cli-table3 "~0.6.1"
4691+
cli-table3 "0.6.1"
46924692
commander "^6.2.1"
46934693
common-tags "^1.8.0"
46944694
dayjs "^1.10.4"
@@ -4701,6 +4701,7 @@ cypress@^13.17.0:
47014701
figures "^3.2.0"
47024702
fs-extra "^9.1.0"
47034703
getos "^3.2.1"
4704+
hasha "5.2.2"
47044705
is-installed-globally "~0.4.0"
47054706
lazy-ass "^1.6.0"
47064707
listr2 "^3.8.3"
@@ -4712,7 +4713,7 @@ cypress@^13.17.0:
47124713
process "^0.11.10"
47134714
proxy-from-env "1.0.0"
47144715
request-progress "^3.0.0"
4715-
semver "^7.5.3"
4716+
semver "^7.7.1"
47164717
supports-color "^8.1.1"
47174718
tmp "~0.2.3"
47184719
tree-kill "1.2.2"
@@ -6141,7 +6142,7 @@ forever-agent@~0.6.1:
61416142
resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"
61426143
integrity sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==
61436144

6144-
form-data@~4.0.0:
6145+
form-data@~4.0.4:
61456146
version "4.0.5"
61466147
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.5.tgz#b49e48858045ff4cbf6b03e1805cebcad3679053"
61476148
integrity sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==
@@ -6522,6 +6523,14 @@ has-tostringtag@^1.0.0, has-tostringtag@^1.0.2:
65226523
dependencies:
65236524
has-symbols "^1.0.3"
65246525

6526+
hasha@5.2.2:
6527+
version "5.2.2"
6528+
resolved "https://registry.yarnpkg.com/hasha/-/hasha-5.2.2.tgz#a48477989b3b327aea3c04f53096d816d97522a1"
6529+
integrity sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==
6530+
dependencies:
6531+
is-stream "^2.0.0"
6532+
type-fest "^0.8.0"
6533+
65256534
hasown@^2.0.0, hasown@^2.0.1, hasown@^2.0.2:
65266535
version "2.0.2"
65276536
resolved "https://registry.yarnpkg.com/hasown/-/hasown-2.0.2.tgz#003eaf91be7adc372e84ec59dc37252cedb80003"
@@ -9593,20 +9602,20 @@ qjobs@^1.2.0:
95939602
resolved "https://registry.yarnpkg.com/qjobs/-/qjobs-1.2.0.tgz#c45e9c61800bd087ef88d7e256423bdd49e5d071"
95949603
integrity sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==
95959604

9596-
qs@6.13.0:
9597-
version "6.13.0"
9598-
resolved "https://registry.yarnpkg.com/qs/-/qs-6.13.0.tgz#6ca3bd58439f7e245655798997787b0d88a51906"
9599-
integrity sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==
9600-
dependencies:
9601-
side-channel "^1.0.6"
9602-
96039605
qs@~6.14.0:
96049606
version "6.14.1"
96059607
resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.1.tgz#a41d85b9d3902f31d27861790506294881871159"
96069608
integrity sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==
96079609
dependencies:
96089610
side-channel "^1.1.0"
96099611

9612+
qs@~6.14.1:
9613+
version "6.14.2"
9614+
resolved "https://registry.yarnpkg.com/qs/-/qs-6.14.2.tgz#b5634cf9d9ad9898e31fba3504e866e8efb6798c"
9615+
integrity sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==
9616+
dependencies:
9617+
side-channel "^1.1.0"
9618+
96109619
queue-microtask@^1.2.2:
96119620
version "1.2.3"
96129621
resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
@@ -10446,6 +10455,11 @@ semver@^7.0.0, semver@^7.1.1, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semve
1044610455
resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143"
1044710456
integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==
1044810457

10458+
semver@^7.7.1:
10459+
version "7.7.4"
10460+
resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.4.tgz#28464e36060e991fa7a11d0279d2d3f3b57a7e8a"
10461+
integrity sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==
10462+
1044910463
semver@~7.0.0:
1045010464
version "7.0.0"
1045110465
resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
@@ -10606,7 +10620,7 @@ side-channel-weakmap@^1.0.2:
1060610620
object-inspect "^1.13.3"
1060710621
side-channel-map "^1.0.1"
1060810622

10609-
side-channel@^1.0.4, side-channel@^1.0.6:
10623+
side-channel@^1.0.4:
1061010624
version "1.0.6"
1061110625
resolved "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.6.tgz#abd25fb7cd24baf45466406b1096b7831c9215f2"
1061210626
integrity sha512-fDW/EZ6Q9RiO8eFG8Hj+7u/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglA==
@@ -11354,6 +11368,11 @@ type-fest@^0.21.3:
1135411368
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
1135511369
integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
1135611370

11371+
type-fest@^0.8.0:
11372+
version "0.8.1"
11373+
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
11374+
integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
11375+
1135711376
type-fest@^2.3.3:
1135811377
version "2.19.0"
1135911378
resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b"

0 commit comments

Comments
 (0)