Skip to content

Commit 20df163

Browse files
committed
Merge branch 'refs/heads/main' into task/main/CST-18016
2 parents 16eda4f + 4b921a6 commit 20df163

1,032 files changed

Lines changed: 20295 additions & 18899 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.eslintrc.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,8 @@
294294
"rules": {
295295
// Custom DSpace Angular rules
296296
"dspace-angular-html/themed-component-usages": "error",
297-
"dspace-angular-html/no-disabled-attribute-on-button": "error"
297+
"dspace-angular-html/no-disabled-attribute-on-button": "error",
298+
"@angular-eslint/template/prefer-control-flow": "error"
298299
}
299300
},
300301
{

cypress/e2e/community-list.cy.ts

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ describe('Community List Page', () => {
1212
cy.get('[data-test="expand-button"]').click({ multiple: true });
1313

1414
// Analyze <ds-community-list-page> for accessibility issues
15-
testA11y('ds-community-list-page');
15+
testA11y('ds-community-list-page', {
16+
rules: {
17+
// When expanding a cdk node on the community-list page, the 'aria-posinset' property becomes 0.
18+
// 0 is not a valid value for 'aria-posinset' so the test fails.
19+
// see https://github.com/DSpace/dspace-angular/issues/4068
20+
'aria-valid-attr-value': { enabled: false },
21+
},
22+
});
1623
});
1724
});

cypress/e2e/submission.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ describe('New Submission page', () => {
217217
});
218218

219219
// Close popup window
220-
cy.get('ds-dynamic-lookup-relation-modal button.close').click();
220+
cy.get('ds-dynamic-lookup-relation-modal button.btn-close').click();
221221

222222
// Back on the form, click the discard button to remove new submission
223223
// Clicking it will display a confirmation, which we will confirm with another click

0 commit comments

Comments
 (0)