graphdb-workbench-tests 3.3.1 → 3.3.2-RC2

package/e2e-legacy/home/cookie-policy/cookie-policy.spec.js

@@ -0,0 +1,182 @@
+import HomeSteps from '../../../steps/home-steps';
+import {SecurityStubs} from '../../../stubs/security-stubs';
+import {SettingsSteps} from '../../../steps/setup/settings-steps';
+import {LicenseStubs} from '../../../stubs/license-stubs';
+import {CookiePolicyModalSteps} from '../../../steps/cookie-policy/cookie-policy-modal.steps';
+import {MainMenuSteps} from '../../../steps/main-menu-steps.js';
+import {CookieConsentBannerSteps} from '../../../steps/cookie-policy/cookie-consent-banner-steps.js';
+
+Cypress.env('set_default_user_data', false);
+
+describe('Cookie policy', () => {
+    beforeEach(() => {
+        cy.setCookieConsent(undefined);
+        cy.viewport(1280, 1000);
+        LicenseStubs.stubFreeLicense();
+    });
+
+    afterEach(() => {
+        cy.setCookieConsent(undefined);
+    });
+
+    it('should have default state when security is OFF', () => {
+        // Given GDB security is OFF
+        // When I open home page
+        HomeSteps.visitInProdMode();
+        // Then I expect to see cookie consent banner
+        CookieConsentBannerSteps.getCookieConsentBanner().should('be.visible');
+        // When I click on the cookie policy link in the banner
+        CookieConsentBannerSteps.clickCookiePolicyLink();
+        // Then I see the cookie policy
+        CookiePolicyModalSteps.getDialogComponent().and('be.visible');
+        CookiePolicyModalSteps.getBody().should('be.visible');
+        // And I expect to see that analytic and third party cookies are allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(true, true);
+        // When I close the cookie policy modal
+        CookiePolicyModalSteps.closeDialog();
+        // Then I expect the cookie policy modal to be closed
+        CookiePolicyModalSteps.getDialogComponent().should('not.exist');
+        // When I open my settings page
+        SettingsSteps.visitInProdMode();
+        // Then I expect to see cookie policy button in My settings widget
+        SettingsSteps.getCookiePolicyButton().and('be.visible');
+        // When I click on the cookie policy button in My settings widget
+        SettingsSteps.clickCookiePolicyLink();
+        // Then I see the cookie policy
+        CookiePolicyModalSteps.getDialogComponent().and('be.visible');
+        CookiePolicyModalSteps.getBody().should('be.visible');
+        // And I expect to see that analytic and third party cookies are allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(true, true);
+        // When I close the cookie policy modal
+        CookiePolicyModalSteps.closeDialog();
+        // Then I expect the cookie policy modal to be closed
+        CookiePolicyModalSteps.getDialogComponent().should('not.exist');
+    });
+
+    it('should give consent for default cookie policy when security is OFF', () => {
+        // Given GDB security is OFF
+        // When I open home page
+        HomeSteps.visitInProdMode();
+        // Then I expect to see cookie consent banner
+        CookieConsentBannerSteps.getCookieConsentBanner().should('be.visible');
+        // When I click OK in the cookie consent banner
+        SecurityStubs.spyOnUserUpdate('admin');
+        CookieConsentBannerSteps.giveCookieConsent();
+        // Then I expect to save cookie consent in user settings
+        validateUserUpdateWithCookieConsent();
+        // And I expect the banner to be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // And I expect GA tracking script to be added to the head
+        validateGATracking();
+        // When I open another page
+        MainMenuSteps.clickOnMenuImport();
+        cy.url().should('include', '/import');
+        // Then I expect the banner to be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I reload the page
+        cy.reload();
+        // Then I expect the banner to be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+    });
+
+    it('should update cookie policy and give consent when security is OFF', () => {
+        // Given GDB security is OFF
+        // When I open home page
+        HomeSteps.visitInProdMode();
+        // Then I expect to see cookie consent banner
+        CookieConsentBannerSteps.getCookieConsentBanner().should('be.visible');
+        // When I click on the cookie policy link in the banner
+        CookieConsentBannerSteps.clickCookiePolicyLink();
+        // Then I see the cookie policy
+        CookiePolicyModalSteps.getDialogComponent().should('be.visible');
+        CookiePolicyModalSteps.validateCookiePolicyDialog(true, true);
+        // When I toggle off the analytics cookie checkbox
+        CookiePolicyModalSteps.toggleStatisticCookies();
+        // And I close the dialog
+        CookiePolicyModalSteps.closeDialog();
+        CookiePolicyModalSteps.getDialog().should('not.exist');
+        // When I reopen the cookie policy dialog using the button in the banner
+        CookieConsentBannerSteps.clickCookiePolicyLink();
+        // And I expect to see that analytic cookies are not allowed and third party cookies are allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, true);
+        // When I close the cookie policy dialog
+        CookiePolicyModalSteps.closeDialog();
+        // And I open my settings page
+        MainMenuSteps.clickOnMySettings();
+        // Then I expect to see cookie policy button in My settings widget
+        SettingsSteps.getCookiePolicyButton().and('be.visible');
+        // When I click on the cookie policy button in My settings widget
+        SettingsSteps.clickCookiePolicyLink();
+        // Then I see the cookie policy
+        CookiePolicyModalSteps.getDialogComponent().should('be.visible');
+        // And I expect to see that analytic cookies are not allowed and third party cookies are allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, true);
+        // When I toggle off the third party cookies checkbox
+        CookiePolicyModalSteps.toggleThirdPartyCookies();
+        // And I close the cookie policy dialog
+        CookiePolicyModalSteps.closeDialog();
+        // When I reopen the cookie policy dialog using the button in my settings widget
+        SettingsSteps.clickCookiePolicyLink();
+        // And I expect to see that analytic cookies are not allowed and third party cookies are not allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, false);
+        CookiePolicyModalSteps.closeDialog();
+        // When I reload the page
+        cy.reload();
+        // And I reopen the cookie policy dialog using the button in my settings widget
+        SettingsSteps.clickCookiePolicyLink();
+        // And I expect to see that analytic cookies are not allowed and third party cookies are not allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, false);
+        // When I close the cookie policy dialog
+        CookiePolicyModalSteps.closeDialog();
+        // And I click OK in the cookie consent banner
+        CookieConsentBannerSteps.giveCookieConsent();
+        // Then I expect the banner to be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I reload the page
+        cy.reload();
+        // Then I expect the banner to be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+    });
+});
+
+function validateUserUpdateWithCookieConsent() {
+    cy.wait('@updateUser').then((xhr) => {
+        expect(xhr.request.body.appSettings).to.include({
+            DEFAULT_INFERENCE: true,
+            DEFAULT_VIS_GRAPH_SCHEMA: true,
+            DEFAULT_SAMEAS: true,
+            IGNORE_SHARED_QUERIES: false,
+            EXECUTE_COUNT: true
+        });
+
+        // Assert COOKIE_CONSENT properties, excluding updatedAt
+        expect(xhr.request.body.appSettings.COOKIE_CONSENT).to.include({
+            policyAccepted: true
+        });
+
+        // Assert that updatedAt is present, is a number, and is a reasonable timestamp
+        const updatedAt = xhr.request.body.appSettings.COOKIE_CONSENT.updatedAt;
+        expect(updatedAt).to.exist;
+        expect(updatedAt).to.be.a('number');
+
+        // Check that updatedAt is within 1 hour of the current time
+        const oneHourInMilliseconds = 60 * 60 * 1000;
+        const now = Date.now();
+        expect(updatedAt).to.be.within(now - oneHourInMilliseconds, now + oneHourInMilliseconds);
+    });
+}
+
+function validateGATracking() {
+    // Check if the GA tracking script is set correctly in the head
+    cy.document()
+        .get('head script')
+        .should("have.attr", "src")
+        .should('include', 'https://www.googletagmanager.com/gtm.js?id=GTM-WBP6C6Z4');
+
+    // Check if the installation ID cookie is set correctly
+    cy.getCookie('_wb').then((cookie) => {
+        expect(cookie).to.exist;
+        // Check the cookie structure: WB1.<installationId>.<timestamp>
+        expect(cookie.value).to.match(/^WB1\.[a-zA-Z0-9\-]+\.\d+$/);
+    });
+}

package/e2e-legacy/import/import-server-files.spec.js

@@ -127,7 +127,9 @@ describe('Import server files', () => {
         ImportResourceMessageDialog.getDialog().should('be.visible');
 
         // with full error message
-        ImportResourceMessageDialog.getMessage().should('have.value', 'RDF Parse Error: The element type "ex:looooooooooooooooooooooooooooooooongTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame" must be terminated by the matching end-tag "</ex:looooooooooooooooooooooooooooooooongTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame>". [line 9, column 6]');
+        ImportResourceMessageDialog
+            .getMessage()
+            .should('contain.text', 'RDF Parse Error: The element type "ex:looooooooooooooooooooooooooooooooongTaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabNaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaame" must be terminated by the matching end-tag');
 
         // When I click on corner close button.
         ImportResourceMessageDialog.close();

package/e2e-legacy/repository/repositories.spec.js

@@ -102,7 +102,7 @@ describe('Repositories', () => {
         // Check the repo is present in the list of repos and we are not yet connected to it
         RepositorySteps.getRepositoryFromList(repositoryId)
             .should('be.visible')
-            .find('.ri-link-unlink')
+            .find('.icon-connection-off')
             .should('be.visible');
 
         // Verify it's configuration can be downloaded
@@ -121,7 +121,10 @@ describe('Repositories', () => {
         cy.get('.onto-dropdown-menu-item')
             .contains(repositoryId)
             .first()
-            .scrollIntoView()
+            .scrollIntoView();
+        cy.get('.onto-dropdown-menu-item')
+            .contains(repositoryId)
+            .first()
             .click();
 
         // Should visualize the selected repo

package/e2e-legacy/repository/url-with-repository-id-parameter.spec.js

@@ -3,6 +3,8 @@ import HomeSteps from '../../steps/home-steps.js';
 import {RepositoryErrorsWidgetSteps} from '../../steps/widgets/repository-errors-widget-steps.js';
 import {RepositorySteps} from '../../steps/repository-steps.js';
 import {RepositorySelectorSteps} from '../../steps/repository-selector-steps.js';
+import {ErrorPageSteps} from '../../steps/error-page-steps.js';
+import {MainMenuSteps} from '../../steps/main-menu-steps.js';
 
 describe('URL with Repository ID parameter', () => {
     let repositoryId;
@@ -152,4 +154,27 @@ describe('URL with Repository ID parameter', () => {
             cy.url().should('include', 'repositoryId=' + repositoryId);
         });
     });
+
+    describe('When navigating between legacy and new workbench', () => {
+        beforeEach(() => {
+            repositoryId = 'repository-in-url-' + Date.now();
+            cy.createRepository({id: repositoryId});
+            cy.presetRepository(repositoryId);
+        })
+
+        afterEach(() => {
+            cy.deleteRepository(repositoryId);
+        });
+
+        it('should preserve repositoryId parameter when navigating from 404 (new workbench) to legacy page', () => {
+            // Given I am on the 404 page which is in the new workbench
+            ErrorPageSteps.visit404();
+            ErrorPageSteps.get404Page().should('be.visible');
+            cy.url().should('not.include', 'repositoryId=');
+            // When I navigate to some legacy page
+            MainMenuSteps.clickOnSparqlMenu();
+            // Then repositoryId parameter should be preserved in the URL
+            cy.url().should('include', `repositoryId=${repositoryId}`);
+        });
+    });
 });

package/e2e-legacy/setup/users-and-access/user-and-access.spec.js

@@ -6,6 +6,7 @@ import {ToasterSteps} from '../../../steps/toaster-steps';
 import HomeSteps from '../../../steps/home-steps';
 import {LoginSteps} from '../../../steps/login-steps';
 import {MainMenuSteps} from '../../../steps/main-menu-steps';
+import {SecurityStubs} from '../../../stubs/security-stubs.js';
 
 describe('User and Access', () => {
 
@@ -102,6 +103,41 @@ describe('User and Access', () => {
             UserAndAccessSteps.addTextToCustomRoleField('{backspace}');
             // Then the error should not be visible
             UserAndAccessSteps.getCustomRoleFieldError().should('not.be.visible');
+
+            // When I create the user with a valid custom role
+            UserAndAccessSteps.clickWriteAccessAny();
+            SecurityStubs.spyOnUserCreate()
+            UserAndAccessSteps.confirmUserCreate();
+            // Then the user should be created with that custom role
+            cy.wait('@create-user').its('request.body').then((body) => {
+                expect(body).to.deep.eq({
+                    "password": "password",
+                    "grantedAuthorities": [
+                        "ROLE_USER",
+                        "CUSTOM_AA",
+                        "WRITE_REPO_*",
+                        "READ_REPO_*"
+                    ],
+                    "appSettings": {
+                        "DEFAULT_VIS_GRAPH_SCHEMA": true,
+                        "DEFAULT_INFERENCE": true,
+                        "DEFAULT_SAMEAS": true,
+                        "IGNORE_SHARED_QUERIES": false,
+                        "EXECUTE_COUNT": true
+                    }
+                })
+            });
+
+            cy.url().should('include', '/users');
+            UserAndAccessSteps.findUserInTable(user).should('be.visible');
+            UserAndAccessSteps.getUserCustomRoles('@user')
+                .should('have.length', 1)
+                .eq(0).and('have.text', 'AA');
+            // And when I open the edit page for that user, the custom role should be visible in the field without the prefix
+            UserAndAccessSteps.openEditUserPage(user);
+            UserAndAccessSteps.getCustomRoleField().find('.tag-item span')
+                .should('have.length', 1)
+                .eq(0).and('have.text', 'AA');
         });
 
         it('Adding a role with a CUSTOM_ prefix shows a warning message', () => {

package/e2e-security/repository/url-with-repository-id-parameter.spec.js

@@ -0,0 +1,57 @@
+import {RepositorySelectorSteps} from '../../steps/repository-selector-steps.js';
+import {LoginSteps} from '../../steps/login-steps.js';
+import {UserAndAccessSteps} from '../../steps/setup/user-and-access-steps.js';
+import HomeSteps from '../../steps/home-steps.js';
+
+describe('URL with Repository ID parameter', () => {
+    let repositoryId;
+
+    beforeEach(() => {
+        repositoryId = 'repository-in-url-' + Date.now();
+        cy.createRepository({id: repositoryId});
+        cy.presetRepository(repositoryId);
+    })
+
+    afterEach(() => {
+        cy.loginAsAdmin();
+        cy.switchOffSecurity(true);
+        cy.deleteRepository(repositoryId);
+    });
+
+    it('should set repositoryId in url after enable security->login', () => {
+        enableSecurity(repositoryId);
+        // When user logs in again
+        LoginSteps.loginWithUser('admin', 'root');
+        // Then repositoryId parameter should be present in the URL and repository should be selected in the selector
+        UserAndAccessSteps.getUsersCatalogContainer().should('be.visible');
+        cy.url().should('include', 'repositoryId=' + repositoryId);
+        RepositorySelectorSteps.getSelectedRepository().should('contain', repositoryId);
+    });
+
+    it('should set repositoryId in ur after first login', () => {
+        // Given security is on
+        cy.switchOnSecurity();
+        // And I log in with user admin
+        LoginSteps.visitLoginPage();
+        LoginSteps.loginWithUser('admin', 'root');
+        // Then repositoryId parameter should be present in the URL and repository should be selected in the selector
+        HomeSteps.getView().should('be.visible');
+        cy.url().should('include', 'repositoryId=' + repositoryId);
+        RepositorySelectorSteps.getSelectedRepository().should('contain', repositoryId);
+    });
+});
+
+function enableSecurity(repositoryId) {
+    // Given security is off
+    // When user visits user and access page
+    UserAndAccessSteps.visit();
+    // Then url should contain repositoryId parameter and repository should be selected in the selector
+    cy.url().should('include', 'repositoryId=' + repositoryId);
+    RepositorySelectorSteps.getSelectedRepository().should('contain', repositoryId);
+    // When user toggles security on
+    UserAndAccessSteps.toggleSecurity();
+    // Then user should be logged out and login page should be shown
+    LoginSteps.getLoginPage().should('be.visible');
+    // And repositoryId parameter should not be present in the URL
+    cy.url().should('not.include', 'repositoryId=');
+}

package/e2e-security/setup/home/cookie-policy.spec.js

@@ -2,7 +2,12 @@ import {UserAndAccessSteps} from "../../../steps/setup/user-and-access-steps";
 import {LicenseStubs} from "../../../stubs/license-stubs";
 import {LoginSteps} from "../../../steps/login-steps";
 import {ModalDialogSteps} from "../../../steps/modal-dialog-steps";
-import HomeSteps from "../../../steps/home-steps";
+import {MainMenuSteps} from '../../../steps/main-menu-steps.js';
+import {CookieConsentBannerSteps} from '../../../steps/cookie-policy/cookie-consent-banner-steps.js';
+import ImportSteps from '../../../steps/import/import-steps.js';
+import {CookiePolicyModalSteps} from '../../../steps/cookie-policy/cookie-policy-modal.steps.js';
+import {SettingsSteps} from '../../../steps/setup/settings-steps.js';
+import {HeaderSteps} from '../../../steps/header-steps.js';
 
 Cypress.env('set_default_user_data', false);
 
@@ -15,7 +20,7 @@ describe('Cookie policy', () => {
             cy.switchOffFreeAccess(true);
             cy.switchOffSecurity(true);
         });
-        cy.setDefaultUserData(false);
+        cy.setDefaultUserData(undefined);
         LicenseStubs.stubFreeLicense();
         repository = 'cypress-test-cookie-policy-security-' + Date.now();
         cy.createRepository({id: repository});
@@ -26,10 +31,231 @@ describe('Cookie policy', () => {
         cy.loginAsAdmin().then(() => {
             cy.switchOffFreeAccess(true);
             cy.switchOffSecurity(true);
-            cy.setDefaultUserData();
+            cy.setDefaultUserData(undefined);
         });
     });
 
+    // Scenario 5
+    it('should hide cookie consent banner when security is ON and user is logged out', () => {
+        // Given I open user and access page in prod mode
+        UserAndAccessSteps.visitInProdMode();
+        // Then the cookie policy banner should be visible
+        CookieConsentBannerSteps.getCookieConsentBanner().should('exist').and('be.visible');
+        // When I enable security
+        UserAndAccessSteps.toggleSecurity();
+        // Then I should be logged out
+        LoginSteps.getLoginPage().should('be.visible');
+        // And the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I login with admin
+        LoginSteps.loginWithUser('admin', 'root');
+        // Then the cookie policy banner should be visible
+        UserAndAccessSteps.getUsersTable().should('be.visible');
+        CookieConsentBannerSteps.getCookieConsentBanner().should('exist').and('be.visible');
+    });
+
+    // Scenario 6
+    it('should give cookie consent when security is ON', () => {
+        // Given I open user and access page in prod mode
+        UserAndAccessSteps.visitInProdMode();
+        // When I enable security
+        UserAndAccessSteps.toggleSecurity();
+        // Then I should be logged out
+        LoginSteps.getLoginPage().should('be.visible');
+        // When I login with admin
+        LoginSteps.loginWithUser('admin', 'root');
+        // Then I should see the users and access page
+        UserAndAccessSteps.getUsersTable().should('be.visible');
+        // Then the cookie policy banner should be visible
+        CookieConsentBannerSteps.getCookieConsentBanner().should('be.visible');
+        // When I click OK in the cookie consent banner
+        CookieConsentBannerSteps.giveCookieConsent();
+        // Then the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I open another page
+        MainMenuSteps.clickOnMenuImport();
+        ImportSteps.getView().should('be.visible');
+        // Then the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I reload the page
+        cy.reload();
+        // Then the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+    });
+
+    // Scenario 7
+    it('should update cookie policy and give cookie consent when security is ON', () => {
+        // Given I open user and access page in prod mode
+        UserAndAccessSteps.visitInProdMode();
+        // And I enable security
+        UserAndAccessSteps.toggleSecurity();
+        // And I login with admin
+        LoginSteps.loginWithUser('admin', 'root');
+        // When I click on the cookie policy link in the banner
+        CookieConsentBannerSteps.clickCookiePolicyLink();
+        // Then I see the cookie policy
+        CookiePolicyModalSteps.getDialogComponent().should('be.visible');
+        CookiePolicyModalSteps.validateCookiePolicyDialog(true, true);
+        // When I toggle off the analytics cookie checkbox
+        CookiePolicyModalSteps.toggleStatisticCookies();
+        // And I close the dialog
+        CookiePolicyModalSteps.closeDialog();
+        CookiePolicyModalSteps.getDialog().should('not.exist');
+        // When I reload the page
+        cy.reload();
+        // Then I expect to see that analytic cookies are not allowed and third party cookies are allowed
+        CookieConsentBannerSteps.clickCookiePolicyLink();
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, true);
+        // And I close the cookie policy dialog
+        CookiePolicyModalSteps.closeDialog();
+        // When I open my settings page
+        MainMenuSteps.clickOnMySettings();
+        // And I open cookie policy modal using the button in the my settings widget
+        SettingsSteps.clickCookiePolicyLink();
+        // Then I should see the cookie policy
+        CookiePolicyModalSteps.getDialogComponent().should('be.visible');
+        // And I expect to see that analytic cookies are not allowed and third party cookies are allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, true);
+        // When I toggle off third party cookies checkbox
+        CookiePolicyModalSteps.toggleThirdPartyCookies();
+        // And I close the modal
+        CookiePolicyModalSteps.closeDialog();
+        // When I reopen modal from the widget
+        SettingsSteps.clickCookiePolicyLink();
+        // Then I expect to see that analytic cookies are not allowed and third party cookies are not allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, false);
+        CookiePolicyModalSteps.closeDialog();
+        // When I click OK in the banner
+        CookieConsentBannerSteps.giveCookieConsent();
+        // Then I expect the banner to be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I reload the page
+        cy.reload();
+        // Then I expect the banner to be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I logout
+        LoginSteps.logout();
+        // Then I should see the login page
+        LoginSteps.getLoginPage().should('be.visible');
+        // And the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I login with admin
+        LoginSteps.loginWithUser('admin', 'root');
+        // Then the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I open cookie policy modal from the widget
+        SettingsSteps.clickCookiePolicyLink();
+        // Then I expect to see that analytic cookies are not allowed and third party cookies are not allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, false);
+        // When I toggle on third party cookies checkbox
+        CookiePolicyModalSteps.toggleThirdPartyCookies();
+        // And I close the modal
+        CookiePolicyModalSteps.closeDialog();
+        // When I reload the page
+        cy.reload();
+        // Then I expect to see that analytic cookies are not allowed and third party cookies are allowed
+        SettingsSteps.clickCookiePolicyLink();
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, true);
+    });
+
+    // Scenario 8
+    it('should update cookie policy and give cookie consent when security is ON and free access is ON', () => {
+        // Given I open user and access page in prod mode
+        UserAndAccessSteps.visitInProdMode();
+        // And I enable security
+        UserAndAccessSteps.toggleSecurity();
+        // And I login with admin
+        LoginSteps.loginWithUser('admin', 'root');
+        // And I enable free access
+        UserAndAccessSteps.toggleFreeAccess();
+        UserAndAccessSteps.clickFreeWriteAccessRepo(repository);
+        ModalDialogSteps.clickOKButton();
+        // Then the cookie policy banner should be visible
+        CookieConsentBannerSteps.getCookieConsentBanner().and('be.visible');
+        // When I click on the cookie policy link in the banner
+        CookieConsentBannerSteps.clickCookiePolicyLink();
+        // Then I see the cookie policy
+        CookiePolicyModalSteps.getDialogComponent().should('be.visible');
+        // And I expect to see that analytic and third party cookies are allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(true, true);
+        // When I toggle off the analytics cookie checkbox
+        // The policy is saved on the server
+        CookiePolicyModalSteps.toggleStatisticCookies();
+        // And I close the dialog
+        CookiePolicyModalSteps.closeDialog();
+        CookiePolicyModalSteps.getDialog().should('not.exist');
+        // When I logout
+        HeaderSteps.logout();
+        // Then I should still see the user and access page but I have no access to it which is unimportant for this test
+        cy.url().should('include', '/users');
+        // And the cookie policy banner should be visible
+        CookieConsentBannerSteps.getCookieConsentBanner().and('be.visible');
+        // When I click on the cookie policy link in the banner
+        CookieConsentBannerSteps.clickCookiePolicyLink();
+        // Then I see the cookie policy
+        CookiePolicyModalSteps.getDialogComponent().should('be.visible');
+        // And I expect to see that analytic cookies are allowed and third party cookies are allowed
+        // (using browser data, because user is logged out)
+        CookiePolicyModalSteps.validateCookiePolicyDialog(true, true);
+        // And I close the cookie policy modal
+        CookiePolicyModalSteps.closeDialog();
+        // When I open another page
+        MainMenuSteps.clickOnMenuImport();
+        // Then the cookie policy banner should be visible
+        CookieConsentBannerSteps.getCookieConsentBanner().and('be.visible');
+        // When I give cookie consent
+        CookieConsentBannerSteps.giveCookieConsent();
+        // Then the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I open another page
+        MainMenuSteps.clickOnSparqlMenu();
+        cy.url().should('include', '/sparql');
+        // Then the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I reload the page
+        cy.reload();
+        // Then the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I login with admin
+        HeaderSteps.login();
+        LoginSteps.loginWithUser('admin', 'root');
+        cy.url().should('include', '/sparql');
+        // Then the cookie policy banner should be visible (because consent is saved on the server, but user has no changes persisted on server, so defaults are considered)
+        CookieConsentBannerSteps.getCookieConsentBanner().and('be.visible');
+        // When I click on the cookie policy link in the banner
+        CookieConsentBannerSteps.clickCookiePolicyLink();
+        // Then I see the cookie policy
+        CookiePolicyModalSteps.getDialogComponent().should('be.visible');
+        // And I expect to see that analytic cookies are allowed and third party cookies are allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, true);
+        // When I toggle off third party cookies checkbox
+        CookiePolicyModalSteps.toggleThirdPartyCookies();
+        // And I close the modal
+        CookiePolicyModalSteps.closeDialog();
+        // When I reopen modal from the banner button
+        CookieConsentBannerSteps.clickCookiePolicyLink();
+        // Then I expect to see that analytic cookies are allowed and third party cookies are not allowed
+        CookiePolicyModalSteps.validateCookiePolicyDialog(false, false);
+        CookiePolicyModalSteps.closeDialog();
+        // When I logout
+        HeaderSteps.logout();
+        // And the cookie policy banner should be hidden (using browser data)
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I login with admin
+        HeaderSteps.login();
+        LoginSteps.loginWithUser('admin', 'root');
+        // Then the cookie policy banner should be visible (consent is persisted with the user on server)
+        CookieConsentBannerSteps.getCookieConsentBanner().should('be.visible');
+        // When I give cookie consent
+        CookieConsentBannerSteps.giveCookieConsent();
+        // Then the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+        // When I reload the page
+        cy.reload();
+        // Then the cookie policy banner should be hidden
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
+    });
+
     it('should show the consent popup if free access is on and the user is on the login page', () => {
         // Given: Security is enabled and free access is on
         UserAndAccessSteps.visitInProdMode();
@@ -44,7 +270,7 @@ describe('Cookie policy', () => {
         // When: The user visits the login page
         LoginSteps.visitInProdMode();
         // Then: The cookie policy popup should be shown
-        HomeSteps.getCookieConsentPopup().should('exist').and('be.visible');
+        CookieConsentBannerSteps.getCookieConsentBanner().should('exist').and('be.visible');
     });
 
     it('should not show the consent popup if free access is off and the user is on the login page', () => {
@@ -57,8 +283,8 @@ describe('Cookie policy', () => {
         // When: The user logs out and visits the login page
         LoginSteps.logout();
         // Then: The cookie policy popup should not be shown
-        HomeSteps.getCookieConsentPopup().should('not.exist');
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
         LoginSteps.visitInProdMode();
-        HomeSteps.getCookieConsentPopup().should('not.exist');
+        CookieConsentBannerSteps.getCookieConsentBanner().should('not.exist');
     });
 });