graphdb-workbench-tests 3.1.3 → 3.2.0-RC1

package/package.json

@@ -1,7 +1,8 @@
 {
   "name": "graphdb-workbench-tests",
-  "version": "3.1.3",
+  "version": "3.2.0-RC1",
   "description": "Cypress tests for GraphDB workbench",
+  "type": "module",
   "scripts": {
     "prepack": "npm shrinkwrap",
     "postpack": "mv npm-shrinkwrap.json package-lock.json",
@@ -16,7 +17,8 @@
     "cy:run-legacy:coverage": "cypress run --config-file cypress-legacy.config.js --browser chrome",
     "cy:run-flaky": "cypress run --config-file cypress-flaky.config.js --browser chrome",
     "test": "npm run cy:run-legacy",
-    "test:core": "cypress run --spec e2e-legacy/repository/**,e2e-legacy/import/**,e2e-legacy/sparql-editor/**,e2e-legacy/monitor/**,e2e-legacy/cluster/**,e2e-legacy/ttyg/**"
+    "test:core": "cypress run --spec e2e-legacy/repository/**,e2e-legacy/import/**,e2e-legacy/sparql-editor/**,e2e-legacy/monitor/**,e2e-legacy/cluster/**,e2e-legacy/ttyg/**",
+    "lint": "eslint '**/*.{js,mjs,cjs}'"
   },
   "author": {
     "name": "Ontotext AD",
@@ -33,6 +35,9 @@
   },
   "devDependencies": {
     "@bahmutov/cypress-code-coverage": "^2.7.2",
+    "@cypress/webpack-preprocessor": "^7.0.1",
+    "@eslint/js": "^9.33.0",
+    "babel-loader": "^10.0.0",
     "babel-plugin-istanbul": "^7.0.0",
     "cypress": "14.5.1",
     "cypress-failed-log": "^2.10.0",
@@ -44,7 +49,11 @@
     "cypress-wait-until": "^3.0.2",
     "del": "^8.0.0",
     "dotenv": "^17.0.1",
+    "eslint": "^9.33.0",
+    "eslint-plugin-cypress": "^5.1.0",
+    "globals": "^16.3.0",
     "minimist": "^1.2.8",
-    "mocha-junit-reporter": "^2.2.1"
+    "mocha-junit-reporter": "^2.2.1",
+    "path-browserify": "^1.0.1"
   }
 }

package/plugins/index.js

@@ -11,17 +11,20 @@
 // This function is called when a project is opened or re-opened (e.g. due to
 // the project's config changing)
 
-const deleteSync = require('del').deleteSync;
+import { deleteSync } from 'del';
+import failed from 'cypress-failed-log/src/failed.js';
+import installLogsPrinter from 'cypress-terminal-report/src/installLogsPrinter.js';
+
 const retryTracker = {};
 
-module.exports = (on, config) => {
+export default (on, config) => {
     // `on` is used to hook into various events Cypress emits
     // `config` is the resolved Cypress config
     on('task', {
-        failed: require('cypress-failed-log/src/failed')()
+        failed: failed()
     });
 
-    require('cypress-terminal-report/src/installLogsPrinter')(on, {
+    installLogsPrinter(on, {
         logToFilesOnAfterRun: true,
         printLogsToConsole: 'onFail',
         outputRoot: config.projectRoot + '/logs/',
@@ -95,5 +98,6 @@ module.exports = (on, config) => {
         printGroup('[FAIL] Broken tests', broken);
         console.log('====================================================================================================\n');
     });
+
     return config;
 };

package/steps/home-steps.js

@@ -15,7 +15,7 @@ class HomeSteps extends BaseSteps {
 
     static visitInProdMode() {
         cy.visit('/', {
-            onBeforeLoad: (win) => {
+            onBeforeLoad: () => {
                 EnvironmentStubs.stubWbProdMode();
             }
         });
@@ -23,7 +23,7 @@ class HomeSteps extends BaseSteps {
 
     static visitInDevMode() {
         cy.visit('/', {
-            onBeforeLoad: (win) => {
+            onBeforeLoad: () => {
                 EnvironmentStubs.stubWbDevMode();
             }
         });
@@ -135,11 +135,17 @@ class HomeSteps extends BaseSteps {
     static selectSPARQLQueryToExecute(query) {
         cy.contains('ul.saved-queries li', query)
             .should('be.visible')
-            .trigger('hover')
+            .as('savedQueryItem');
+
+        cy.get('@savedQueryItem')
+            .trigger('hover');
+
+        cy.get('@savedQueryItem')
             .find('.execute-saved-query')
-            .click({force: true});
+            .click({ force: true });
     }
 
+
     static verifyQueryLink(queryName, modifiesRepoModal) {
         HomeSteps.selectSPARQLQueryToExecute(queryName);
         modifiesRepoModal ? cy.get('.modal-body').should('be.visible') : cy.get('.modal-body').should('not.exist');
@@ -188,7 +194,7 @@ class HomeSteps extends BaseSteps {
                 HomeSteps.getCreateRepositoryLink()
                     .click()
                     .url()
-                    .should('eq', Cypress.config("baseUrl") + '/repository/create?previous=home');
+                    .should('eq', Cypress.config("baseUrl") + '/repository/create?previous=%2F');
             });
         cy.get('.big-logo').click();
     }
@@ -205,9 +211,8 @@ class HomeSteps extends BaseSteps {
     }
 
     static getAutocompleteInput() {
-        const input = cy.get('.home-rdf-resource-search search-resource-input .view-res-input');
-        input.should('be.visible');
-        return input;
+        return cy.get('.home-rdf-resource-search search-resource-input .view-res-input')
+            .should('be.visible');
     }
 
     static shouldHaveAutocompleteResult(uri) {
@@ -220,9 +225,9 @@ class HomeSteps extends BaseSteps {
     }
 
     static getAutocompleteResultElement(uri) {
-        const element = cy.get("#auto-complete-results-wrapper p").contains(uri);
-        element.trigger('mouseover');
-        return element;
+        return cy.get('#auto-complete-results-wrapper p')
+            .contains(uri)
+            .trigger('mouseover');
     }
 
     static verifyAutocompleteResourceLink(uri) {

package/steps/operations-statuses-component-steps.js

@@ -15,15 +15,15 @@ export class OperationsStatusesComponentSteps {
     }
 
     static getQueriesOperationStatusHeaderElement() {
-        return OperationsStatusesComponentSteps.getOperationStatusHeader('.fa-arrow-right-arrow-left');
+        return OperationsStatusesComponentSteps.getOperationStatusHeader('.ri-arrow-left-right-line');
     }
 
     static getBackupAndRestoreOperationStatusHeaderElement() {
-        return OperationsStatusesComponentSteps.getOperationStatusHeader('.fa-archive');
+        return OperationsStatusesComponentSteps.getOperationStatusHeader('.ri-archive-line');
     }
 
     static getClusterOperationStatusHeaderElement() {
-        return OperationsStatusesComponentSteps.getOperationStatusHeader('.fa-sitemap');
+        return OperationsStatusesComponentSteps.getOperationStatusHeader('.ri-organization-chart');
     }
 
     static getOperationStatuses() {

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

@@ -7,7 +7,7 @@ export class UserAndAccessSteps {
 
     static visitInProdMode() {
         cy.visit('/users', {
-            onBeforeLoad: (win) => {
+            onBeforeLoad: () => {
                 EnvironmentStubs.stubWbProdMode();
             }
         });
@@ -186,7 +186,7 @@ export class UserAndAccessSteps {
     }
 
     static getPermissionError() {
-        return cy.get('.permission-banner');
+        return cy.getByTestId('restricted-access-banner');
     }
 
     static getModal() {
@@ -294,7 +294,7 @@ export class UserAndAccessSteps {
     }
 
     static findGraphqlIconAlias(repoLineAlias) {
-        return cy.get(repoLineAlias).find('.fa-gdb-graphql');
+        return cy.get(repoLineAlias).find('.icon-graphql');
     }
 
     static openEditUserPage(username) {

package/steps/ttyg/chat-panel-steps.js

@@ -16,6 +16,10 @@ export class ChatPanelSteps {
         return ChatPanelSteps.getChatDetailElement(chatDetailIndex).find('.actions').eq(answerIndex);
     }
 
+    static getAssistantAnswer(index) {
+        return ChatPanelSteps.getChatPanel().find('.assistant-message markdown-content').eq(index);
+    }
+
     static getQuestionInputElement() {
         return ChatPanelSteps.getChatPanel().find('.question-input .contenteditable');
     }
@@ -24,6 +28,10 @@ export class ChatPanelSteps {
         return ChatPanelSteps.getChatPanel().find('.ask-button');
     }
 
+    static askQuestion() {
+        ChatPanelSteps.getAskButtonElement().scrollIntoView().click();
+    }
+
     static getChatDetailQuestionElement(index = 0) {
         return ChatPanelSteps.getChatDetailElement(index).find('.question');
     }
@@ -59,4 +67,16 @@ export class ChatPanelSteps {
     static getCopyToClipboardElement(index = 0) {
         return ChatPanelSteps.getCopyToClipboardElements().eq(index);
     }
+
+    static getCancelButton() {
+        return ChatPanelSteps.getChatPanel().find('.cancel-ask-button');
+    }
+
+    static cancelQuestion() {
+        ChatPanelSteps.getCancelButton().click();
+    }
+
+    static getAssistantIcon(index) {
+        return ChatPanelSteps.getChatDetailElement(index).find('.assistant-icon');
+    }
 }

package/steps/ttyg/ttyg-agent-settings-modal.steps.js

@@ -227,7 +227,7 @@ export class TtygAgentSettingsModalSteps extends ModalDialogSteps {
     }
 
     static clickOnSimilaritySearchIndexMissingHelp() {
-        this.getSimilaritySearchIndexMissingHelp().find('a').click();
+        this.getSimilaritySearchIndexMissingHelp().find('a').eq(0).click();
     }
 
     static getSimilarityIndexFormGroup() {
@@ -235,7 +235,11 @@ export class TtygAgentSettingsModalSteps extends ModalDialogSteps {
     }
 
     static getSimilarityIndexField() {
-        return this.getSimilarityIndexFormGroup().find('select');
+        return this.getSimilarityIndexFormGroup().find('#connectorInstances');
+    }
+
+    static getSimilarityIndexSelectedOption() {
+        return this.getSimilarityIndexField().find('option:selected');
     }
 
     static selectSimilarityIndex(index) {
@@ -246,6 +250,14 @@ export class TtygAgentSettingsModalSteps extends ModalDialogSteps {
         this.getSimilarityIndexField().find('option:selected').should('have.text', similarityIndex);
     }
 
+    static getSimilarityIndexVectorFieldsField() {
+        return this.getSimilarityIndexFormGroup().find('select#vectorFieldsSelect');
+    }
+
+    static getSimilarityIndexSelectedVectorFieldsValue() {
+        return this.getSimilarityIndexVectorFieldsField().find('option:selected');
+    }
+
     static getSimilarityIndexThresholdFormGroup() {
         return this.getExtractionMethodPanel('similarity_search').find('.similarity-index-threshold');
     }

package/stubs/ttyg/ttyg-stubs.js

@@ -86,8 +86,16 @@ export class TTYGStubs extends Stubs {
         }).as('get-agent-list');
     }
 
+    static getSimilarityIndexesForRepo(repositoryId, fixture = '/ttyg/agent/get-similarity-indexes.json', delay = 0) {
+        cy.intercept('GET', `rest/similarity/${repositoryId}/indexes`, {
+            fixture: fixture,
+            statusCode: 200,
+            delay: delay
+        }).as('get-similarity-indexes');
+    }
+
     static stubAgentListWithIncompatibleGet(delay = 0) {
-        this.stubAgentListGet('/ttyg/agent/get-agent-list-with-incompatible-agents.json');
+        this.stubAgentListGet('/ttyg/agent/get-agent-list-with-incompatible-agents.json', delay);
     }
 
     static stubAgentGet(fixture = '/ttyg/agent/get-agent.json', delay = 0) {
@@ -143,22 +151,52 @@ export class TTYGStubs extends Stubs {
     }
 
     static stubAnswerQuestion(fixture = '/ttyg/chats/ask-question.json') {
-        cy.intercept('POST', '/rest/chat/conversations', {
+        cy.intercept('POST', '/rest/chat/chats/**/question', {
             fixture,
             statusCode: 200
         }).as('get-agent-defaults');
     }
 
-    static stubCrateNewChat(fixture = 'ttyg/chats/create/create-chat-response.json') {
-        cy.fixture(fixture).then((fixtureData) => {
+    static stubAnswerQuestionWithDelay(fixture = '/ttyg/chats/ask-question-cancel.json', delay = 1000) {
+        cy.intercept({
+            method: 'POST',
+            url: '/rest/chat/chats/**/question',
+        }, (req) => {
+            req.reply({
+                fixture,
+                statusCode: 200,
+                delay
+            });
+        }).as('get-cancelled-answer');
+    }
+
+    static stubCancelQuestion(fixture = '/ttyg/chats/cancel-question-response.json', delay = 1000) {
+        cy.intercept({
+            method: 'POST',
+            url: 'rest/chat/chats/**/cancel'
+        }, (req) => {
+            req.reply({
+                fixture,
+                statusCode: 200,
+                delay
+            });
+        }).as('get-cancel-response');
+    }
+
+    static stubCreateNewChat() {
+            cy.intercept('POST', '/rest/chat/chats', {
+                fixture: 'ttyg/chats/create/create-chat-response.json',
+                statusCode: 200
+            }).as('ask-first-chat-question');
+
+            cy.fixture('ttyg/chats/create/question-response-after-chat-creation.json').then((fixtureData) => {
             const today = Math.floor(Date.now() / 1000) + '';
             const body = JSON.stringify(fixtureData).replace(/"creationDate"/g, today);
-            cy.intercept('POST', '/rest/chat/conversations', {
+            cy.intercept('POST', '/rest/chat/chats/**/question', {
                 statusCode: 200,
                 body: JSON.parse(body)
             }).as('create-chat');
         });
-
     }
 
     static stubExplainResponse(fixture = '/ttyg/chats/explain-response-1.json') {

package/support/e2e.js

@@ -24,14 +24,16 @@ import 'cypress-file-upload';
 import {LicenseStubs} from "../stubs/license-stubs";
 import {SecurityStubs} from "../stubs/security-stubs";
 // https://github.com/bahmutov/cypress-code-coverage
-require('@bahmutov/cypress-code-coverage/support');
+import '@bahmutov/cypress-code-coverage/support';
 
 // Configures an environment variable with the key used for common actions (cmd on mac, ctrl on other OS).
 // This variable must be used in all actions that type e.g. ctrl-a to select text.
 Cypress.env('modifierKey', Cypress.platform === 'darwin' ? '{cmd}' : '{ctrl}');
 
-require('cypress-failed-log');
-require('cypress-terminal-report/src/installLogsCollector')();
+import 'cypress-failed-log';
+import * as ctr from 'cypress-terminal-report/src/installLogsCollector';
+const installLogsCollector = ('default' in ctr) ? ctr.default : ctr;
+installLogsCollector();
 
 // We don't want any tests to hit real Google
 beforeEach(() => {