Skip to content

Commit e4cdd73

Browse files
authored
Merge pull request DSpace#3199 from 4Science/task/main/CST-15593
[DSpace#2718] Migrate cookie consent from Klaro to Orejime
2 parents 2c7e30c + 5bd99a1 commit e4cdd73

51 files changed

Lines changed: 599 additions & 643 deletions

Some content is hidden

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

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ describe('Admin Add New Modals', () => {
99

1010
it('Add new Community modal should pass accessibility tests', () => {
1111
// Pin the sidebar open
12-
cy.get('#sidebar-collapse-toggle').click();
12+
cy.get('[data-test="sidebar-collapse-toggle"]').click();
1313

1414
// Click on entry of menu
15-
cy.get('#admin-menu-section-new-title').click();
15+
cy.get('[data-test="admin-menu-section-new-title"]').click();
1616

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

@@ -22,10 +22,10 @@ describe('Admin Add New Modals', () => {
2222

2323
it('Add new Collection modal should pass accessibility tests', () => {
2424
// Pin the sidebar open
25-
cy.get('#sidebar-collapse-toggle').click();
25+
cy.get('[data-test="sidebar-collapse-toggle"]').click();
2626

2727
// Click on entry of menu
28-
cy.get('#admin-menu-section-new-title').click();
28+
cy.get('[data-test="admin-menu-section-new-title"]').click();
2929

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

@@ -35,10 +35,10 @@ describe('Admin Add New Modals', () => {
3535

3636
it('Add new Item modal should pass accessibility tests', () => {
3737
// Pin the sidebar open
38-
cy.get('#sidebar-collapse-toggle').click();
38+
cy.get('[data-test="sidebar-collapse-toggle"]').click();
3939

4040
// Click on entry of menu
41-
cy.get('#admin-menu-section-new-title').click();
41+
cy.get('[data-test="admin-menu-section-new-title"]').click();
4242

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

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('Admin Edit Modals', () => {
99

1010
it('Edit Community modal should pass accessibility tests', () => {
1111
// Pin the sidebar open
12-
cy.get('#sidebar-collapse-toggle').click();
12+
cy.get('[data-test="sidebar-collapse-toggle"]').click();
1313

1414
// Click on entry of menu
1515
cy.get('#admin-menu-section-edit-title').click();
@@ -22,7 +22,7 @@ describe('Admin Edit Modals', () => {
2222

2323
it('Edit Collection modal should pass accessibility tests', () => {
2424
// Pin the sidebar open
25-
cy.get('#sidebar-collapse-toggle').click();
25+
cy.get('[data-test="sidebar-collapse-toggle"]').click();
2626

2727
// Click on entry of menu
2828
cy.get('#admin-menu-section-edit-title').click();
@@ -35,7 +35,7 @@ describe('Admin Edit Modals', () => {
3535

3636
it('Edit Item modal should pass accessibility tests', () => {
3737
// Pin the sidebar open
38-
cy.get('#sidebar-collapse-toggle').click();
38+
cy.get('[data-test="sidebar-collapse-toggle"]').click();
3939

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ describe('Admin Export Modals', () => {
99

1010
it('Export metadata modal should pass accessibility tests', () => {
1111
// Pin the sidebar open
12-
cy.get('#sidebar-collapse-toggle').click();
12+
cy.get('[data-test="sidebar-collapse-toggle"]').click();
1313

1414
// Click on entry of menu
1515
cy.get('#admin-menu-section-export-title').click();
@@ -22,7 +22,7 @@ describe('Admin Export Modals', () => {
2222

2323
it('Export batch modal should pass accessibility tests', () => {
2424
// Pin the sidebar open
25-
cy.get('#sidebar-collapse-toggle').click();
25+
cy.get('[data-test="sidebar-collapse-toggle"]').click();
2626

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

cypress/e2e/admin-sidebar.cy.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ describe('Admin Sidebar', () => {
1010

1111
it('should be pinnable and pass accessibility tests', () => {
1212
// Pin the sidebar open
13-
cy.get('#sidebar-collapse-toggle').click();
13+
cy.get('[data-test="sidebar-collapse-toggle"]').click();
1414

1515
// Click on every expandable section to open all menus
1616
cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true });

cypress/support/e2e.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ before(() => {
5454

5555
// Runs once before the first test in each "block"
5656
beforeEach(() => {
57-
// Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
57+
// Pre-agree to all Orejime cookies by setting the orejime-anonymous cookie
5858
// This just ensures it doesn't get in the way of matching other objects in the page.
59-
cy.setCookie('klaro-anonymous', '{%22authentication%22:true%2C%22preferences%22:true%2C%22acknowledgement%22:true%2C%22google-analytics%22:true%2C%22google-recaptcha%22:true}');
59+
cy.setCookie('orejime-anonymous', '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true}');
6060

6161
// Remove any CSRF cookies saved from prior tests
6262
cy.clearCookie(DSPACE_XSRF_COOKIE);

0 commit comments

Comments
 (0)