Skip to content

Commit 586199d

Browse files
atarix83atarix83
committed
Merge remote-tracking branch 'bitbucket4science/task/dspace-cris-2024_02_x/DSC-2510' into task/dspace-cris-2024_02_x/DSC-2510
2 parents 12cdcef + d5bbf93 commit 586199d

File tree

13 files changed

+42
-46
lines changed

13 files changed

+42
-46
lines changed

‎.github/workflows/build.yml‎

Lines changed: 21 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -203,79 +203,72 @@ jobs:
203203
# If it does, then SSR is working.
204204
- name: Verify SSR on a Community page
205205
run: |
206-
result=$(wget -O- -q http://127.0.0.1:4000/communities/0958c910-2037-42a9-81c7-dca80e3892b4)
206+
result=$(wget -O- -q http://127.0.0.1:4000/communities/a30b75e4-1682-4b4d-85fd-a47fc78dbcf6)
207207
echo "$result"
208-
echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Publications
208+
echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep "CRIS Community"
209209
210-
# Get a specific collection in our test data and verify that the "<h1>" tag includes "Articles" (the collection name).
210+
# Get a specific collection in our test data and verify that the "<h1>" tag includes "Publications" (the collection name).
211211
# If it does, then SSR is working.
212212
- name: Verify SSR on a Collection page
213213
run: |
214-
result=$(wget -O- -q http://127.0.0.1:4000/collections/282164f5-d325-4740-8dd1-fa4d6d3e7200)
214+
result=$(wget -O- -q http://127.0.0.1:4000/collections/caf04bfa-b2f6-40d3-90d2-aa0b86d92f8d)
215215
echo "$result"
216-
echo "$result" | grep -oE "<h1 [^>]*>[^><]*</h1>" | grep Articles
216+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Publications"
217217
218218
# Get a specific publication in our test data and verify that the <meta name="title"> tag includes
219219
# the title of this publication. If it does, then SSR is working.
220220
- name: Verify SSR on a Publication page
221221
run: |
222-
result=$(wget -O- -q http://127.0.0.1:4000/entities/publication/6160810f-1e53-40db-81ef-f6621a727398)
222+
result=$(wget -O- -q http://127.0.0.1:4000/entities/publication/1df533fd-5385-4820-babd-b5fabdb82101)
223223
echo "$result"
224-
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "An Economic Model of Mortality Salience"
224+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "test publication with pdf version 1"
225225
226226
# Get a specific person in our test data and verify that the <meta name="title"> tag includes
227227
# the name of the person. If it does, then SSR is working.
228228
- name: Verify SSR on a Person page
229229
run: |
230-
result=$(wget -O- -q http://127.0.0.1:4000/entities/person/b1b2c768-bda1-448a-a073-fc541e8b24d9)
230+
result=$(wget -O- -q http://127.0.0.1:4000/entities/person/98cea993-d448-4200-99d5-f6fab8967bf8)
231231
echo "$result"
232-
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Simmons, Cameron"
232+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Submitter Dspace"
233233
234234
# Get a specific project in our test data and verify that the <meta name="title"> tag includes
235235
# the name of the project. If it does, then SSR is working.
236236
- name: Verify SSR on a Project page
237237
run: |
238-
result=$(wget -O- -q http://127.0.0.1:4000/entities/project/46ccb608-a74c-4bf6-bc7a-e29cc7defea9)
238+
result=$(wget -O- -q http://127.0.0.1:4000/entities/project/1e3451e4-60d7-46a8-962e-5b94b62c63ff)
239239
echo "$result"
240-
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "University Research Fellowship"
240+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Test DSC-1819"
241241
242242
# Get a specific orgunit in our test data and verify that the <meta name="title"> tag includes
243243
# the name of the orgunit. If it does, then SSR is working.
244244
- name: Verify SSR on an OrgUnit page
245245
run: |
246-
result=$(wget -O- -q http://127.0.0.1:4000/entities/orgunit/9851674d-bd9a-467b-8d84-068deb568ccf)
246+
result=$(wget -O- -q http://127.0.0.1:4000/entities/orgunit/6d4abaee-eedb-458d-a29b-35db82037dfa)
247247
echo "$result"
248-
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Law and Development"
248+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "4Science"
249249
250250
# Get a specific journal in our test data and verify that the <meta name="title"> tag includes
251251
# the name of the journal. If it does, then SSR is working.
252252
- name: Verify SSR on a Journal page
253253
run: |
254-
result=$(wget -O- -q http://127.0.0.1:4000/entities/journal/d4af6c3e-53d0-4757-81eb-566f3b45d63a)
254+
result=$(wget -O- -q http://127.0.0.1:4000/entities/journal/f05c4530-b1b8-4459-a048-ea1c60089a1e)
255255
echo "$result"
256-
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology"
256+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Journal 4S"
257257
258-
# Get a specific journal volume in our test data and verify that the <meta name="title"> tag includes
259-
# the name of the volume. If it does, then SSR is working.
260-
- name: Verify SSR on a Journal Volume page
258+
# Get a specific funding in our test data and verify that the <meta name="title"> tag includes
259+
# the name of the funding. If it does, then SSR is working.
260+
- name: Verify SSR on a Funding page
261261
run: |
262-
result=$(wget -O- -q http://127.0.0.1:4000/entities/journalvolume/07c6249f-4bf7-494d-9ce3-6ffdb2aed538)
262+
result=$(wget -O- -q http://127.0.0.1:4000/entities/funding/640d35ba-6172-44c0-9e11-bf5da417cdc8)
263263
echo "$result"
264-
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology Volume 28 (2017)"
264+
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "test funding"
265265
266-
# Get a specific journal issue in our test data and verify that the <meta name="title"> tag includes
267-
# the name of the issue. If it does, then SSR is working.
268-
- name: Verify SSR on a Journal Issue page
269-
run: |
270-
result=$(wget -O- -q http://127.0.0.1:4000/entities/journalissue/44c29473-5de2-48fa-b005-e5029aa1a50b)
271-
echo "$result"
272-
echo "$result" | grep -oE "<meta name=\"title\" [^>]*>" | grep "Environmental &amp; Architectural Phenomenology Vol. 28, No. 1"
273266
274267
# Verify 301 Handle redirect behavior
275268
# Note: /handle/123456789/260 is the same test Publication used by our e2e tests
276269
- name: Verify 301 redirect from '/handle' URLs
277270
run: |
278-
result=$(wget --server-response --quiet http://127.0.0.1:4000/handle/123456789/260 2>&1 | head -1 | awk '{print $2}')
271+
result=$(wget --server-response --quiet http://127.0.0.1:4000/handle/123456789/71 2>&1 | head -1 | awk '{print $2}')
279272
echo "$result"
280273
[[ "$result" -eq "301" ]]
281274

‎.github/workflows/docker.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ on:
1010
push:
1111
branches:
1212
- main-cris
13-
- 'dspace-cris-**'
13+
- 'dspace-cris-*_02_x'
1414
tags:
15-
- 'dspace-cris-*.*.*'
15+
- 'dspace-cris-**'
1616
pull_request:
1717

1818
permissions:

‎cypress.config.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ export default defineConfig({
6161
'cypress/e2e/search-page.cy.ts',
6262
]
6363
},
64-
defaultCommandTimeout: 10000,
65-
requestTimeout: 20000,
64+
defaultCommandTimeout: 15000,
65+
requestTimeout: 30000,
6666
});

‎cypress/e2e/end-user-agreement.cy.ts‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@ describe('End User Agreement', () => {
88
cy.get('ds-end-user-agreement').should('be.visible');
99

1010
// Analyze <ds-end-user-agreement> for accessibility
11-
testA11y('ds-end-user-agreement');
11+
testA11y({
12+
include: ['ds-end-user-agreement'],
13+
exclude: ['ds-markdown-viewer'],
14+
});
1215
});
1316
});

‎cypress/e2e/health-page.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ beforeEach(() => {
1010

1111
describe('Health Page > Status Tab', () => {
1212
it('should pass accessibility tests', () => {
13-
cy.intercept('GET', '*/server/actuator/health').as('status');
13+
cy.intercept('GET', '**/server/actuator/health').as('status');
1414
cy.wait('@status');
1515

1616
cy.get('a[data-test="health-page.status-tab"]').click();
@@ -36,7 +36,7 @@ describe('Health Page > Status Tab', () => {
3636

3737
describe('Health Page > Info Tab', () => {
3838
it('should pass accessibility tests', () => {
39-
cy.intercept('GET', '*/server/actuator/info').as('info');
39+
cy.intercept('GET', '**/server/actuator/info').as('info');
4040
cy.wait('@info');
4141

4242
cy.get('a[data-test="health-page.info-tab"]').click();

‎cypress/e2e/login-modal.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ const page = {
2525
},
2626
submitLogoutByPressingButton() {
2727
// This is the POST command that will actually log us out
28-
cy.intercept('POST', '*/server/api/authn/logout').as('logout');
28+
cy.intercept('POST', '**/server/api/authn/logout').as('logout');
2929
// Click logout button
3030
cy.get('[data-test="logout-button"]').click();
3131
// Wait until above POST command responds before continuing

‎cypress/e2e/my-dspace.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ describe('My DSpace page', () => {
8787
cy.get('[data-dismiss="alert"]').click({ multiple: true });
8888

8989
// This is the GET command that will actually run the search
90-
cy.intercept('GET', '*/server/api/discover/search/objects*').as('search-results');
90+
cy.intercept('GET', '**/server/api/discover/search/objects*').as('search-results');
9191
// On MyDSpace, find the submission we just created via its ID
9292
cy.get('[data-test="search-box"]').type(id);
9393
cy.get('[data-test="search-button"]').click();

‎cypress/e2e/search-navbar.cy.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ describe('Search from Navigation Bar', () => {
2020
it('should go to search page with correct query if submitted (from home)', () => {
2121
cy.visit('/');
2222
// This is the GET command that will actually run the search
23-
cy.intercept('GET', '*/server/api/discover/search/objects*').as('search-results');
23+
cy.intercept('GET', '**/server/api/discover/search/objects*').as('search-results');
2424
// Run the search
2525
page.fillOutQueryInNavBar(query);
2626
page.submitQueryByPressingEnter();
@@ -35,7 +35,7 @@ describe('Search from Navigation Bar', () => {
3535
it('should go to search page with correct query if submitted (from search)', () => {
3636
cy.visit('/search');
3737
// This is the GET command that will actually run the search
38-
cy.intercept('GET', '*/server/api/discover/search/objects*').as('search-results');
38+
cy.intercept('GET', '**/server/api/discover/search/objects*').as('search-results');
3939
// Run the search
4040
page.fillOutQueryInNavBar(query);
4141
page.submitQueryByPressingEnter();
@@ -50,7 +50,7 @@ describe('Search from Navigation Bar', () => {
5050
it('should allow user to also submit query by clicking icon', () => {
5151
cy.visit('/');
5252
// This is the GET command that will actually run the search
53-
cy.intercept('GET', '*/server/api/discover/search/objects*').as('search-results');
53+
cy.intercept('GET', '**/server/api/discover/search/objects*').as('search-results');
5454
// Run the search
5555
page.fillOutQueryInNavBar(query);
5656
page.submitQueryByPressingIcon();

‎cypress/e2e/submission.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ describe('New Submission page', () => {
9797
cy.get('[data-dismiss="alert"]').click({ multiple: true });
9898

9999
// This is the GET command that will actually run the search
100-
cy.intercept('GET', '*/server/api/discover/search/objects*').as('search-results');
100+
cy.intercept('GET', '**/server/api/discover/search/objects*').as('search-results');
101101
// On MyDSpace, find the submission we just saved via its ID
102102
cy.get('[data-test="search-box"]').type(id);
103103
cy.get('[data-test="search-button"]').click();
@@ -131,7 +131,7 @@ describe('New Submission page', () => {
131131
cy.get('ds-uploader').trigger('dragover');
132132

133133
// This is the POST command that will upload the file
134-
cy.intercept('POST', '*/server/api/submission/workspaceitems/*').as('upload');
134+
cy.intercept('POST', '**/server/api/submission/workspaceitems/*').as('upload');
135135

136136
// Upload our DSpace logo via drag & drop onto submission form
137137
// cy.get('div#section_upload')

‎docker/cli.assetstore.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
dspace-cli:
1717
environment:
1818
# This assetstore zip is available from https://github.com/DSpace-Labs/AIP-Files/releases/tag/demo-entities-data
19-
- LOADASSETS=https://github.com/DSpace-Labs/AIP-Files/releases/download/demo-entities-data/assetstore.tar.gz
19+
- LOADASSETS=https://github.com/4Science/DSpace-CRIS-Files/releases/download/cris-2024.02.00/assetstore.tar.gz
2020
entrypoint:
2121
- /bin/bash
2222
- '-c'

0 commit comments

Comments
 (0)