graphdb-workbench-tests 3.3.2-RC1 → 3.3.2-RC3

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-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/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "3.3.2-RC1",
+  "version": "3.3.2-RC3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "graphdb-workbench-tests",
-      "version": "3.3.2-RC1",
+      "version": "3.3.2-RC3",
       "license": "Apache-2.0",
       "devDependencies": {
         "@bahmutov/cypress-code-coverage": "^2.7.2",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "3.3.2-RC1",
+  "version": "3.3.2-RC3",
   "description": "Cypress tests for GraphDB workbench",
   "type": "module",
   "scripts": {

package/steps/error-page-steps.js

@@ -0,0 +1,9 @@
+export class ErrorPageSteps {
+    static visit404() {
+        cy.visit('/404');
+    }
+
+    static get404Page() {
+        return cy.get('app-not-found-page');
+    }
+}

package/steps/login-steps.js

@@ -18,6 +18,10 @@ export class LoginSteps {
         cy.visit(`/login?r=${returnURLEncoded}`);
     }
 
+    static getLoginPage() {
+        return cy.get('app-login');
+    }
+
     static navigateToLoginPage() {
         cy.get('onto-user-login').click();
     }

package/steps/setup/user-and-access-steps.js

@@ -13,6 +13,10 @@ export class UserAndAccessSteps {
         });
     }
 
+    static getUsersCatalogContainer() {
+        return cy.get('#wb-users');
+    }
+
     static getUrl() {
         return cy.url();
     }
@@ -363,15 +367,15 @@ export class UserAndAccessSteps {
     }
 
     static clickFreeWriteAccessRepo(repoName) {
-        const repoRow = cy.get('.repo-fields').contains(repoName).parent('.row');
-        repoRow.scrollIntoView();
-        repoRow.find('.write').realClick();
+        cy.get('.repo-fields').contains(repoName).parent('.row').as('row');
+        cy.get('@row').scrollIntoView();
+        cy.get('@row').find('.write').realClick();
     }
 
     static clickFreeGraphqlAccessRepo(repoName) {
-        const repoRow = cy.get('.repo-fields').contains(repoName).parent('.row');
-        repoRow.scrollIntoView();
-        repoRow.find('.graphql').realClick();
+        cy.get('.repo-fields').contains(repoName).parent('.row').as('row');
+        cy.get('@row').scrollIntoView();
+        cy.get('@row').find('.graphql').realClick();
     }
 
 }