Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into themed-component-regi…
Browse files Browse the repository at this point in the history
…stry-watcher
  • Loading branch information
ybnd committed Oct 16, 2024
2 parents 3482d92 + b1392ff commit 92b45a9
Show file tree
Hide file tree
Showing 55 changed files with 23,071 additions and 16,296 deletions.
195 changes: 195 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
# Enable Dependabot NPM updates for all dependencies on a weekly basis
version: 2
updates:
###############
## Main branch
###############
- package-ecosystem: "npm"
directory: "/"
target-branch: main
schedule:
interval: "weekly"
# Allow up to 10 open PRs for dependencies
open-pull-requests-limit: 10
# Group together Angular package upgrades
groups:
# Group together all minor/patch version updates for Angular in a single PR
angular:
applies-to: version-updates
patterns:
- "@angular*"
update-types:
- "minor"
- "patch"
# Group together all security updates for Angular. Only accept minor/patch types.
angular-security:
applies-to: security-updates
patterns:
- "@angular*"
update-types:
- "minor"
- "patch"
# Group together all minor/patch version updates for NgRx in a single PR
ngrx:
applies-to: version-updates
patterns:
- "@ngrx*"
update-types:
- "minor"
- "patch"
# Group together all security updates for NgRx. Only accept minor/patch types.
ngrx-security:
applies-to: security-updates
patterns:
- "@ngrx*"
update-types:
- "minor"
- "patch"
# Group together all patch version updates for @typescript-eslint in a single PR
typescript-eslint:
applies-to: version-updates
patterns:
- "@typescript-eslint*"
update-types:
- "minor"
- "patch"
# Group together all security updates for @typescript-eslint.
typescript-eslint-security:
applies-to: security-updates
patterns:
- "@typescript-eslint*"
update-types:
- "minor"
- "patch"
ignore:
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
- dependency-name: "*"
update-types: ["version-update:semver-major"]
#####################
## dspace-8_x branch
#####################
- package-ecosystem: "npm"
directory: "/"
target-branch: dspace-8_x
schedule:
interval: "weekly"
# Allow up to 10 open PRs for dependencies
open-pull-requests-limit: 10
# Group together Angular package upgrades
groups:
# Group together all patch version updates for Angular in a single PR
angular:
applies-to: version-updates
patterns:
- "@angular*"
update-types:
- "minor"
- "patch"
# Group together all security updates for Angular. Only accept minor/patch types.
angular-security:
applies-to: security-updates
patterns:
- "@angular*"
update-types:
- "minor"
- "patch"
# Group together all minor/patch version updates for NgRx in a single PR
ngrx:
applies-to: version-updates
patterns:
- "@ngrx*"
update-types:
- "minor"
- "patch"
# Group together all security updates for NgRx. Only accept minor/patch types.
ngrx-security:
applies-to: security-updates
patterns:
- "@ngrx*"
update-types:
- "minor"
- "patch"
# Group together all patch version updates for @typescript-eslint in a single PR
typescript-eslint:
applies-to: version-updates
patterns:
- "@typescript-eslint*"
update-types:
- "minor"
- "patch"
# Group together all security updates for @typescript-eslint.
typescript-eslint-security:
applies-to: security-updates
patterns:
- "@typescript-eslint*"
update-types:
- "minor"
- "patch"
ignore:
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
- dependency-name: "*"
update-types: ["version-update:semver-major"]
#####################
## dspace-7_x branch
#####################
- package-ecosystem: "npm"
directory: "/"
target-branch: dspace-7_x
schedule:
interval: "weekly"
# Allow up to 10 open PRs for dependencies
open-pull-requests-limit: 10
# Group together Angular package upgrades
groups:
# Group together all minor/patch version updates for Angular in a single PR
angular:
applies-to: version-updates
patterns:
- "@angular*"
update-types:
- "minor"
- "patch"
# Group together all security updates for Angular. Only accept minor/patch types.
angular-security:
applies-to: security-updates
patterns:
- "@angular*"
update-types:
- "minor"
- "patch"
# Group together all minor/patch version updates for NgRx in a single PR
ngrx:
applies-to: version-updates
patterns:
- "@ngrx*"
update-types:
- "minor"
- "patch"
# Group together all security updates for NgRx. Only accept minor/patch types.
ngrx-security:
applies-to: security-updates
patterns:
- "@ngrx*"
update-types:
- "minor"
- "patch"
# Group together all patch version updates for @typescript-eslint in a single PR
typescript-eslint:
applies-to: version-updates
patterns:
- "@typescript-eslint*"
update-types:
- "minor"
- "patch"
# Group together all security updates for @typescript-eslint.
typescript-eslint-security:
applies-to: security-updates
patterns:
- "@typescript-eslint*"
update-types:
- "minor"
- "patch"
ignore:
# Ignore all major version updates for all dependencies. We'll only automate minor/patch updates.
- dependency-name: "*"
update-types: ["version-update:semver-major"]
4 changes: 4 additions & 0 deletions cypress.config.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { defineConfig } from 'cypress';

export default defineConfig({
video: true,
videosFolder: 'cypress/videos',
screenshotsFolder: 'cypress/screenshots',
fixturesFolder: 'cypress/fixtures',
Expand All @@ -18,6 +19,7 @@ export default defineConfig({

// Admin account used for administrative tests
DSPACE_TEST_ADMIN_USER: '[email protected]',
DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
// Community/collection/publication used for view/edit tests
DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
Expand All @@ -33,6 +35,8 @@ export default defineConfig({
// Account used to test basic submission process
DSPACE_TEST_SUBMIT_USER: '[email protected]',
DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
// Administrator users group
DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4'
},
e2e: {
// Setup our plugins for e2e tests
Expand Down
48 changes: 48 additions & 0 deletions cypress/e2e/admin-add-new-modals.cy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { testA11y } from 'cypress/support/utils';

describe('Admin Add New Modals', () => {
beforeEach(() => {
// Must login as an Admin for sidebar to appear
cy.visit('/login');
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
});

it('Add new Community modal should pass accessibility tests', () => {
// Pin the sidebar open
cy.get('#sidebar-collapse-toggle').click();

// Click on entry of menu
cy.get('#admin-menu-section-new-title').click();

cy.get('a[data-test="menu.section.new_community"]').click();

// Analyze <ds-create-community-parent-selector> for accessibility
testA11y('ds-create-community-parent-selector');
});

it('Add new Collection modal should pass accessibility tests', () => {
// Pin the sidebar open
cy.get('#sidebar-collapse-toggle').click();

// Click on entry of menu
cy.get('#admin-menu-section-new-title').click();

cy.get('a[data-test="menu.section.new_collection"]').click();

// Analyze <ds-create-collection-parent-selector> for accessibility
testA11y('ds-create-collection-parent-selector');
});

it('Add new Item modal should pass accessibility tests', () => {
// Pin the sidebar open
cy.get('#sidebar-collapse-toggle').click();

// Click on entry of menu
cy.get('#admin-menu-section-new-title').click();

cy.get('a[data-test="menu.section.new_item"]').click();

// Analyze <ds-create-item-parent-selector> for accessibility
testA11y('ds-create-item-parent-selector');
});
});
16 changes: 16 additions & 0 deletions cypress/e2e/admin-curation-tasks.cy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
import { testA11y } from 'cypress/support/utils';

describe('Admin Curation Tasks', () => {
beforeEach(() => {
// Must login as an Admin to see the page
cy.visit('/admin/curation-tasks');
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
});

it('should pass accessibility tests', () => {
// Page must first be visible
cy.get('ds-admin-curation-task').should('be.visible');
// Analyze <ds-admin-curation-task> for accessibility issues
testA11y('ds-admin-curation-task');
});
});
48 changes: 48 additions & 0 deletions cypress/e2e/admin-edit-modals.cy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
import { testA11y } from 'cypress/support/utils';

describe('Admin Edit Modals', () => {
beforeEach(() => {
// Must login as an Admin for sidebar to appear
cy.visit('/login');
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
});

it('Edit Community modal should pass accessibility tests', () => {
// Pin the sidebar open
cy.get('#sidebar-collapse-toggle').click();

// Click on entry of menu
cy.get('#admin-menu-section-edit-title').click();

cy.get('a[data-test="menu.section.edit_community"]').click();

// Analyze <ds-edit-community-selector> for accessibility
testA11y('ds-edit-community-selector');
});

it('Edit Collection modal should pass accessibility tests', () => {
// Pin the sidebar open
cy.get('#sidebar-collapse-toggle').click();

// Click on entry of menu
cy.get('#admin-menu-section-edit-title').click();

cy.get('a[data-test="menu.section.edit_collection"]').click();

// Analyze <ds-edit-collection-selector> for accessibility
testA11y('ds-edit-collection-selector');
});

it('Edit Item modal should pass accessibility tests', () => {
// Pin the sidebar open
cy.get('#sidebar-collapse-toggle').click();

// Click on entry of menu
cy.get('#admin-menu-section-edit-title').click();

cy.get('a[data-test="menu.section.edit_item"]').click();

// Analyze <ds-edit-item-selector> for accessibility
testA11y('ds-edit-item-selector');
});
});
35 changes: 35 additions & 0 deletions cypress/e2e/admin-export-modals.cy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
import { testA11y } from 'cypress/support/utils';

describe('Admin Export Modals', () => {
beforeEach(() => {
// Must login as an Admin for sidebar to appear
cy.visit('/login');
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
});

it('Export metadata modal should pass accessibility tests', () => {
// Pin the sidebar open
cy.get('#sidebar-collapse-toggle').click();

// Click on entry of menu
cy.get('#admin-menu-section-export-title').click();

cy.get('a[data-test="menu.section.export_metadata"]').click();

// Analyze <ds-export-metadata-selector> for accessibility
testA11y('ds-export-metadata-selector');
});

it('Export batch modal should pass accessibility tests', () => {
// Pin the sidebar open
cy.get('#sidebar-collapse-toggle').click();

// Click on entry of menu
cy.get('#admin-menu-section-export-title').click();

cy.get('a[data-test="menu.section.export_batch"]').click();

// Analyze <ds-export-batch-selector> for accessibility
testA11y('ds-export-batch-selector');
});
});
17 changes: 17 additions & 0 deletions cypress/e2e/admin-notifications-publication-claim-page.cy.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { testA11y } from 'cypress/support/utils';

describe('Admin Notifications Publication Claim Page', () => {
beforeEach(() => {
// Must login as an Admin to see the page
cy.visit('/admin/notifications/publication-claim');
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
});

it('should pass accessibility tests', () => {

//Page must first be visible
cy.get('ds-admin-notifications-publication-claim-page').should('be.visible');
// Analyze <ds-admin-notifications-publication-claim-page> for accessibility issues
testA11y('ds-admin-notifications-publication-claim-page');
});
});
Loading

0 comments on commit 92b45a9

Please sign in to comment.