-
Notifications
You must be signed in to change notification settings - Fork 433
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'origin/main' into fix-versioning-button
- Loading branch information
Showing
2,842 changed files
with
74,843 additions
and
51,854 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -33,12 +33,12 @@ jobs: | |
| #CHROME_VERSION: "90.0.4430.212-1" | ||
| # Bump Node heap size (OOM in CI after upgrading to Angular 15) | ||
| NODE_OPTIONS: '--max-old-space-size=4096' | ||
| # Project name to use when running docker-compose prior to e2e tests | ||
| # Project name to use when running "docker compose" prior to e2e tests | ||
| COMPOSE_PROJECT_NAME: 'ci' | ||
| strategy: | ||
| # Create a matrix of Node versions to test against (in parallel) | ||
| matrix: | ||
| node-version: [16.x, 18.x] | ||
| node-version: [18.x, 20.x] | ||
| # Do NOT exit immediately if one matrix job fails | ||
| fail-fast: false | ||
| # These are the actual CI steps to perform per job | ||
|
|
@@ -74,7 +74,7 @@ jobs: | |
| id: yarn-cache-dir-path | ||
| run: echo "dir=$(yarn cache dir)" >> $GITHUB_OUTPUT | ||
| - name: Cache Yarn dependencies | ||
| uses: actions/cache@v3 | ||
| uses: actions/cache@v4 | ||
| with: | ||
| # Cache entire Yarn cache directory (see previous step) | ||
| path: ${{ steps.yarn-cache-dir-path.outputs.dir }} | ||
|
|
@@ -101,19 +101,19 @@ jobs: | |
| # so that it can be shared with the 'codecov' job (see below) | ||
| # NOTE: Angular CLI only supports code coverage for specs. See https://github.com/angular/angular-cli/issues/6286 | ||
| - name: Upload code coverage report to Artifact | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| if: matrix.node-version == '18.x' | ||
| with: | ||
| name: dspace-angular coverage report | ||
| name: coverage-report-${{ matrix.node-version }} | ||
| path: 'coverage/dspace-angular/lcov.info' | ||
| retention-days: 14 | ||
|
|
||
| # Using docker-compose start backend using CI configuration | ||
| # Using "docker compose" start backend using CI configuration | ||
| # and load assetstore from a cached copy | ||
| - name: Start DSpace REST Backend via Docker (for e2e tests) | ||
| run: | | ||
| docker-compose -f ./docker/docker-compose-ci.yml up -d | ||
| docker-compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli | ||
| docker compose -f ./docker/docker-compose-ci.yml up -d | ||
| docker compose -f ./docker/cli.yml -f ./docker/cli.assetstore.yml run --rm dspace-cli | ||
| docker container ls | ||
| # Run integration tests via Cypress.io | ||
|
|
@@ -135,19 +135,19 @@ jobs: | |
| # Cypress always creates a video of all e2e tests (whether they succeeded or failed) | ||
| # Save those in an Artifact | ||
| - name: Upload e2e test videos to Artifacts | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| if: always() | ||
| with: | ||
| name: e2e-test-videos | ||
| name: e2e-test-videos-${{ matrix.node-version }} | ||
| path: cypress/videos | ||
|
|
||
| # If e2e tests fail, Cypress creates a screenshot of what happened | ||
| # Save those in an Artifact | ||
| - name: Upload e2e test failure screenshots to Artifacts | ||
| uses: actions/upload-artifact@v3 | ||
| uses: actions/upload-artifact@v4 | ||
| if: failure() | ||
| with: | ||
| name: e2e-test-screenshots | ||
| name: e2e-test-screenshots-${{ matrix.node-version }} | ||
| path: cypress/screenshots | ||
|
|
||
| - name: Stop app (in case it stays up after e2e tests) | ||
|
|
@@ -182,7 +182,7 @@ jobs: | |
| run: kill -9 $(lsof -t -i:4000) | ||
|
|
||
| - name: Shutdown Docker containers | ||
| run: docker-compose -f ./docker/docker-compose-ci.yml down | ||
| run: docker compose -f ./docker/docker-compose-ci.yml down | ||
|
|
||
| # Codecov upload is a separate job in order to allow us to restart this separate from the entire build/test | ||
| # job above. This is necessary because Codecov uploads seem to randomly fail at times. | ||
|
|
@@ -197,7 +197,7 @@ jobs: | |
|
|
||
| # Download artifacts from previous 'tests' job | ||
| - name: Download coverage artifacts | ||
| uses: actions/download-artifact@v3 | ||
| uses: actions/download-artifact@v4 | ||
|
|
||
| # Now attempt upload to Codecov using its action. | ||
| # NOTE: We use a retry action to retry the Codecov upload if it fails the first time. | ||
|
|
@@ -207,11 +207,12 @@ jobs: | |
| - name: Upload coverage to Codecov.io | ||
| uses: Wandalen/[email protected] | ||
| with: | ||
| action: codecov/codecov-action@v3 | ||
| action: codecov/codecov-action@v4 | ||
| # Ensure codecov-action throws an error when it fails to upload | ||
| # This allows us to auto-restart the action if an error is thrown | ||
| with: | | ||
| fail_ci_if_error: true | ||
| token: ${{ secrets.CODECOV_TOKEN }} | ||
| # Try re-running action 5 times max | ||
| attempt_limit: 5 | ||
| # Run again in 30 seconds | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,28 @@ | ||
| import { Options } from 'cypress-axe'; | ||
| import { testA11y } from 'cypress/support/utils'; | ||
| import { Options } from 'cypress-axe'; | ||
|
|
||
| describe('Admin Sidebar', () => { | ||
| 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')); | ||
| }); | ||
| 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('should be pinnable and pass accessibility tests', () => { | ||
| // Pin the sidebar open | ||
| cy.get('#sidebar-collapse-toggle').click(); | ||
| it('should be pinnable and pass accessibility tests', () => { | ||
| // Pin the sidebar open | ||
| cy.get('#sidebar-collapse-toggle').click(); | ||
|
|
||
| // Click on every expandable section to open all menus | ||
| cy.get('ds-expandable-admin-sidebar-section').click({multiple: true}); | ||
| // Click on every expandable section to open all menus | ||
| cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true }); | ||
|
|
||
| // Analyze <ds-admin-sidebar> for accessibility | ||
| testA11y('ds-admin-sidebar', | ||
| // Analyze <ds-admin-sidebar> for accessibility | ||
| testA11y('ds-admin-sidebar', | ||
| { | ||
| rules: { | ||
| // Currently all expandable sections have nested interactive elements | ||
| // See https://github.com/DSpace/dspace-angular/issues/2178 | ||
| 'nested-interactive': { enabled: false }, | ||
| } | ||
| rules: { | ||
| // Currently all expandable sections have nested interactive elements | ||
| // See https://github.com/DSpace/dspace-angular/issues/2178 | ||
| 'nested-interactive': { enabled: false }, | ||
| }, | ||
| } as Options); | ||
| }); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,14 @@ | ||
| import { testA11y } from 'cypress/support/utils'; | ||
|
|
||
| describe('Breadcrumbs', () => { | ||
| it('should pass accessibility tests', () => { | ||
| // Visit an Item, as those have more breadcrumbs | ||
| cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'))); | ||
| it('should pass accessibility tests', () => { | ||
| // Visit an Item, as those have more breadcrumbs | ||
| cy.visit('/entities/publication/'.concat(Cypress.env('DSPACE_TEST_ENTITY_PUBLICATION'))); | ||
|
|
||
| // Wait for breadcrumbs to be visible | ||
| cy.get('ds-breadcrumbs').should('be.visible'); | ||
| // Wait for breadcrumbs to be visible | ||
| cy.get('ds-breadcrumbs').should('be.visible'); | ||
|
|
||
| // Analyze <ds-breadcrumbs> for accessibility | ||
| testA11y('ds-breadcrumbs'); | ||
| }); | ||
| // Analyze <ds-breadcrumbs> for accessibility | ||
| testA11y('ds-breadcrumbs'); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| import { testA11y } from 'cypress/support/utils'; | ||
|
|
||
| describe('Browse By Author', () => { | ||
| it('should pass accessibility tests', () => { | ||
| cy.visit('/browse/author'); | ||
| it('should pass accessibility tests', () => { | ||
| cy.visit('/browse/author'); | ||
|
|
||
| // Wait for <ds-browse-by-metadata-page> to be visible | ||
| cy.get('ds-browse-by-metadata').should('be.visible'); | ||
| // Wait for <ds-browse-by-metadata-page> to be visible | ||
| cy.get('ds-browse-by-metadata').should('be.visible'); | ||
|
|
||
| // Analyze <ds-browse-by-metadata-page> for accessibility | ||
| testA11y('ds-browse-by-metadata'); | ||
| }); | ||
| // Analyze <ds-browse-by-metadata-page> for accessibility | ||
| testA11y('ds-browse-by-metadata'); | ||
| }); | ||
| }); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| import { testA11y } from 'cypress/support/utils'; | ||
|
|
||
| describe('Browse By Date Issued', () => { | ||
| it('should pass accessibility tests', () => { | ||
| cy.visit('/browse/dateissued'); | ||
| it('should pass accessibility tests', () => { | ||
| cy.visit('/browse/dateissued'); | ||
|
|
||
| // Wait for <ds-browse-by-date-page> to be visible | ||
| cy.get('ds-browse-by-date').should('be.visible'); | ||
| // Wait for <ds-browse-by-date-page> to be visible | ||
| cy.get('ds-browse-by-date').should('be.visible'); | ||
|
|
||
| // Analyze <ds-browse-by-date-page> for accessibility | ||
| testA11y('ds-browse-by-date'); | ||
| }); | ||
| // Analyze <ds-browse-by-date-page> for accessibility | ||
| testA11y('ds-browse-by-date'); | ||
| }); | ||
| }); |
Oops, something went wrong.