Skip to content

Commit 651a1ae

Browse files
tdonohuetdonohue
authored
Merge pull request #5937 from dspace-unimr/fix/ds-5875-remove-deprecated-cypress-env
Updated e2e tests
2 parents 5c4b56f + a784158 commit 651a1ae

47 files changed

Lines changed: 204 additions & 106 deletions

Some content is hidden

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

‎cypress.config.ts‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,29 +19,31 @@ export default defineConfig({
1919

2020
// Admin account used for administrative tests
2121
DSPACE_TEST_ADMIN_USER: 'dspacedemo+admin@gmail.com',
22-
DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
2322
DSPACE_TEST_ADMIN_PASSWORD: 'dspace',
24-
// Community/collection/publication used for view/edit tests
25-
DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
26-
DSPACE_TEST_COLLECTION: '282164f5-d325-4740-8dd1-fa4d6d3e7200',
27-
DSPACE_TEST_ENTITY_PUBLICATION: '6160810f-1e53-40db-81ef-f6621a727398',
28-
// Search term (should return results) used in search tests
29-
DSPACE_TEST_SEARCH_TERM: 'test',
30-
// Main Collection used for submission tests. Should be able to accept normal Item objects
31-
DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection',
32-
DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144',
33-
// Collection used for Person entity submission tests. MUST be configured with EntityType=Person.
34-
DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
3523
// Account used to test basic submission process
3624
DSPACE_TEST_SUBMIT_USER: 'dspacedemo+submit@gmail.com',
37-
DSPACE_TEST_SUBMIT_USER_UUID: '914955b1-cf2e-4884-8af7-a166aa24cf73',
3825
DSPACE_TEST_SUBMIT_USER_PASSWORD: 'dspace',
39-
// Administrator users group
40-
DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4',
41-
//Collection to send and test workflow item
42-
DSPACE_TEST_SUBMIT_WORKFLOW_COLLECTION_NAME: '1-step Workflow collection',
4326
},
4427
e2e: {
28+
expose: {
29+
// Administrator users group
30+
DSPACE_ADMINISTRATOR_GROUP: 'e59f5659-bff9-451e-b28f-439e7bd467e4',
31+
//Collection to send and test workflow item
32+
DSPACE_TEST_SUBMIT_WORKFLOW_COLLECTION_NAME: '1-step Workflow collection',
33+
// Community/collection/publication used for view/edit tests
34+
DSPACE_TEST_COMMUNITY: '0958c910-2037-42a9-81c7-dca80e3892b4',
35+
DSPACE_TEST_COLLECTION: '282164f5-d325-4740-8dd1-fa4d6d3e7200',
36+
DSPACE_TEST_ENTITY_PUBLICATION: '6160810f-1e53-40db-81ef-f6621a727398',
37+
// Search term (should return results) used in search tests
38+
DSPACE_TEST_SEARCH_TERM: 'test',
39+
// Main Collection used for submission tests. Should be able to accept normal Item objects
40+
DSPACE_TEST_SUBMIT_COLLECTION_NAME: 'Sample Collection',
41+
DSPACE_TEST_SUBMIT_COLLECTION_UUID: '9d8334e9-25d3-4a67-9cea-3dffdef80144',
42+
// Collection used for Person entity submission tests. MUST be configured with EntityType=Person.
43+
DSPACE_TEST_SUBMIT_PERSON_COLLECTION_NAME: 'People',
44+
DSPACE_TEST_SUBMIT_USER_UUID: '914955b1-cf2e-4884-8af7-a166aa24cf73',
45+
DSPACE_TEST_ADMIN_USER_UUID: '335647b6-8a52-4ecb-a8c1-7ebabb199bda',
46+
},
4547
// Setup our plugins for e2e tests
4648
setupNodeEvents(on, config) {
4749
return require('./cypress/plugins/index.ts')(on, config);

‎cypress/e2e/admin-add-new-modals.cy.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ describe('Admin Add New Modals', () => {
44
beforeEach(() => {
55
// Must login as an Admin for sidebar to appear
66
cy.visit('/login');
7-
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
7+
cy.env(['DSPACE_TEST_ADMIN_USER', 'DSPACE_TEST_ADMIN_PASSWORD']).then(({ DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD }) => {
8+
cy.loginViaForm(DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD);
9+
});
810
});
911

1012
it('Add new Community modal should pass accessibility tests', () => {

‎cypress/e2e/admin-curation-tasks.cy.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ describe('Admin Curation Tasks', () => {
44
beforeEach(() => {
55
// Must login as an Admin to see the page
66
cy.visit('/admin/curation-tasks');
7-
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
7+
cy.env(['DSPACE_TEST_ADMIN_USER', 'DSPACE_TEST_ADMIN_PASSWORD']).then(({ DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD }) => {
8+
cy.loginViaForm(DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD);
9+
});
810
});
911

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

‎cypress/e2e/admin-edit-modals.cy.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ describe('Admin Edit Modals', () => {
44
beforeEach(() => {
55
// Must login as an Admin for sidebar to appear
66
cy.visit('/login');
7-
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
7+
cy.env(['DSPACE_TEST_ADMIN_USER', 'DSPACE_TEST_ADMIN_PASSWORD']).then(({ DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD }) => {
8+
cy.loginViaForm(DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD);
9+
});
810
});
911

1012
it('Edit Community modal should pass accessibility tests', () => {

‎cypress/e2e/admin-export-modals.cy.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ describe('Admin Export Modals', () => {
44
beforeEach(() => {
55
// Must login as an Admin for sidebar to appear
66
cy.visit('/login');
7-
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
7+
cy.env(['DSPACE_TEST_ADMIN_USER', 'DSPACE_TEST_ADMIN_PASSWORD']).then(({ DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD }) => {
8+
cy.loginViaForm(DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD);
9+
});
810
});
911

1012
it('Export metadata modal should pass accessibility tests', () => {

‎cypress/e2e/admin-notifications-publication-claim-page.cy.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ describe('Admin Notifications Publication Claim Page', () => {
44
beforeEach(() => {
55
// Must login as an Admin to see the page
66
cy.visit('/admin/notifications/publication-claim');
7-
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
7+
cy.env(['DSPACE_TEST_ADMIN_USER', 'DSPACE_TEST_ADMIN_PASSWORD']).then(({ DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD }) => {
8+
cy.loginViaForm(DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD);
9+
});
810
});
911

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

‎cypress/e2e/admin-search-page.cy.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ describe('Admin Search Page', () => {
44
beforeEach(() => {
55
// Must login as an Admin to see the page
66
cy.visit('/admin/search');
7-
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
7+
cy.env(['DSPACE_TEST_ADMIN_USER', 'DSPACE_TEST_ADMIN_PASSWORD']).then(({ DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD }) => {
8+
cy.loginViaForm(DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD);
9+
});
810
});
911

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

‎cypress/e2e/admin-sidebar.cy.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ describe('Admin Sidebar', () => {
44
beforeEach(() => {
55
// Must login as an Admin for sidebar to appear
66
cy.visit('/login');
7-
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
7+
cy.env(['DSPACE_TEST_ADMIN_USER', 'DSPACE_TEST_ADMIN_PASSWORD']).then(({ DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD }) => {
8+
cy.loginViaForm(DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD);
9+
});
810
});
911

1012
it('should be pinnable and pass accessibility tests', () => {

‎cypress/e2e/admin-workflow-page.cy.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ describe('Admin Workflow Page', () => {
44
beforeEach(() => {
55
// Must login as an Admin to see the page
66
cy.visit('/admin/workflow');
7-
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
7+
cy.env(['DSPACE_TEST_ADMIN_USER', 'DSPACE_TEST_ADMIN_PASSWORD']).then(({ DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD }) => {
8+
cy.loginViaForm(DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD);
9+
});
810
});
911

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

‎cypress/e2e/audit-overview-page.cy.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@ describe('Audit Overview Page', () => {
44
beforeEach(() => {
55
// Must login as an Admin to see the page
66
cy.visit('/auditlogs');
7-
cy.loginViaForm(Cypress.env('DSPACE_TEST_ADMIN_USER'), Cypress.env('DSPACE_TEST_ADMIN_PASSWORD'));
7+
cy.env(['DSPACE_TEST_ADMIN_USER', 'DSPACE_TEST_ADMIN_PASSWORD']).then(({ DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD }) => {
8+
cy.loginViaForm(DSPACE_TEST_ADMIN_USER, DSPACE_TEST_ADMIN_PASSWORD);
9+
});;
810
});
911

1012
it('page structure should be correct and should pass accessibility tests', () => {

0 commit comments

Comments
 (0)