Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[#2718] Migrate cookie consent from Klaro to Orejime #3199

Merged
merged 14 commits into from
Nov 8, 2024
Merged

[#2718] Migrate cookie consent from Klaro to Orejime #3199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8406905
[CST-15593] migrate from klaro to orejime
Jul 15, 2024
7966efc
Merge remote-tracking branch 'origin/main' into task/main/CST-15593
Sep 16, 2024
a9da80c
[CST-15593] run npm i for orejime
Sep 16, 2024
58c5d74
[CST-15593] fix orejime startup error
Sep 16, 2024
80e1dae
[CST-15593] allow orejime to start if privacy statement is disabled
Sep 16, 2024
e2dc89c
[CST-15595] fix tests
Sep 20, 2024
a2193a1
Merge branch 'main' into task/main/CST-15593
Sep 27, 2024
ad7bbb8
Merge remote-tracking branch 'github/main' into task/main/CST-15593
Sep 30, 2024
8c70ee8
Merge branch 'main' into task/main/CST-15593
Oct 24, 2024
9eaaab5
Merge remote-tracking branch 'github/main' into task/main/CST-15593
Oct 30, 2024
0ab4d90
[CST-15593] fix orejime cookie name, a11y issues and package-lock
Oct 31, 2024
e516ae8
[CST-15593] go back to orejime-anonymous cookie
Oct 31, 2024
6257718
[CST-15593] improve tests reliability
Oct 31, 2024
5bd99a1
[CST-15593] fix authenticated orejime cookie encoding
Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cypress/e2e/admin-add-new-modals.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ describe('Admin Add New Modals', () => {

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

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

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

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

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

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

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

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

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

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

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

Expand Down
6 changes: 3 additions & 3 deletions cypress/e2e/admin-edit-modals.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('Admin Edit Modals', () => {

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

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

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

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

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

// Click on entry of menu
cy.get('#admin-menu-section-edit-title').click();
Expand Down
4 changes: 2 additions & 2 deletions cypress/e2e/admin-export-modals.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('Admin Export Modals', () => {

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

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

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

// Click on entry of menu
cy.get('#admin-menu-section-export-title').click();
Expand Down
2 changes: 1 addition & 1 deletion cypress/e2e/admin-sidebar.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ describe('Admin Sidebar', () => {

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

// Click on every expandable section to open all menus
cy.get('ds-expandable-admin-sidebar-section').click({ multiple: true });
Expand Down
4 changes: 2 additions & 2 deletions cypress/support/e2e.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ before(() => {

// Runs once before the first test in each "block"
beforeEach(() => {
// Pre-agree to all Klaro cookies by setting the klaro-anonymous cookie
// Pre-agree to all Orejime cookies by setting the orejime-anonymous cookie
// This just ensures it doesn't get in the way of matching other objects in the page.
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}');
cy.setCookie('orejime-anonymous', '{"authentication":true,"preferences":true,"acknowledgement":true,"google-analytics":true}');

// Remove any CSRF cookies saved from prior tests
cy.clearCookie(DSPACE_XSRF_COOKIE);
Expand Down
Loading
Loading