ui-tests issue #1390

enonic · Oct 21, 2024 · e53c10a · e53c10a
1 parent 07555aa
commit e53c10a
Show file tree

Hide file tree

Showing 65 changed files with 2,186 additions and 1,553 deletions.
diff --git a/testing/libs/WebDriverHelper.js b/testing/libs/WebDriverHelper.js
@@ -43,13 +43,13 @@ WebDriverHelper.prototype.setupBrowser = function setupBrowser(w, h) {
         console.log('browser name ##################### ' + browser_name);
         console.log('browser width ##################### ' + width);
         let options = {
-            logLevel: "error",
-            automationProtocol: "webdriver",
-            "wdio:enforceWebDriverClassic": true,
+            logLevel: 'error',
+            automationProtocol: 'webdriver',
             capabilities: {
                 "wdio:enforceWebDriverClassic": true,
                 browserName: browser_name,
                 browserVersion: browser_version,
+                "wdio:enforceWebDriverClassic": true,
                 'goog:chromeOptions': makeChromeOptions(isHeadless, width, height)
             }
         };

diff --git a/testing/libs/app_const.js b/testing/libs/app_const.js
@@ -379,4 +379,20 @@ module.exports = Object.freeze({
         ARCHIVED: 'Archived',
         ARCHIVED_BY: 'Archived by',
     },
+    WIDGET_SELECTOR_OPTIONS: {
+        VERSION_HISTORY: 'Version history',
+        DEPENDENCIES: 'Dependencies',
+        LAYERS: 'Layers',
+        EMULATOR: 'Emulator',
+        DETAILS: 'Details'
+    },
+    BROWSER_TITLES: {
+        CONTENT_STUDIO: 'Content Studio - Enonic XP Admin',
+        XP_HOME: 'Enonic XP Home',
+    },
+    ACCESSIBILITY_ATTRIBUTES: {
+        ROLE: 'role',
+        ARIA_LABEL: 'aria-label',
+        ARIA_HAS_POPUP: 'aria-haspopup',
+    },
 });
diff --git a/testing/libs/elements.js b/testing/libs/elements.js
diff --git a/testing/libs/project.utils.js b/testing/libs/project.utils.js
@@ -10,7 +10,7 @@ const ProjectWizardDialogPermissionsStep = require('../page_objects/project/proj
 const ProjectWizardDialogApplicationsStep = require('../page_objects/project/project-wizard-dialog/project.wizard.applications.step');
 const ProjectWizardDialogNameAndIdStep = require('../page_objects/project/project-wizard-dialog/project.wizard.name.id.step');
 const ProjectWizardDialogSummaryStep = require('../page_objects/project/project-wizard-dialog/project.wizard.summary.step');
-const appConst = require('./app_const');
+const appConst = require("./app_const");
 const path = require('path');
 const fs = require('fs');
 const webDriverHelper = require('./WebDriverHelper');
@@ -36,16 +36,15 @@ module.exports = {
         await summaryStep.waitForDialogClosed();
         return await settingsBrowsePanel.pause(500);
     },
-    async fillParentNameStep(parents) {
+    async selectParentProjectsByName(parents) {
         try {
             let parentProjectStep = new ProjectWizardDialogParentProjectStep();
             parents = [].concat(parents);
             let selectedItems = await parentProjectStep.getSelectedProjects();
             for (let name of parents) {
                 if (selectedItems.length === 0 || this.isProjectSelected(selectedItems, name)) {
-                    // TODO slickgrid - uncomment this string
-                    await parentProjectStep.selectParentProject(name);
-                    //await parentProjectStep.selectParentProjectById(name);
+                    // select a project and click on Apply button
+                    await parentProjectStep.selectParentProjectMulti(name);
                 }
             }
             await parentProjectStep.clickOnNextButton();
@@ -55,6 +54,23 @@ module.exports = {
             throw new Error(`Error occurred in parent project step, screenshot:${screenshot} ` + err);
         }
     },
+    async selectSingleParentProjectsByName(parent) {
+        try {
+            let parentProjectStep = new ProjectWizardDialogParentProjectStep();
+            let selectedItems = await parentProjectStep.getSelectedProjects();
+
+            let isSelected = selectedItems.length > 0 && selectedItems[0].includes(parent);
+            if (!isSelected) {
+                await parentProjectStep.selectParentProject(parent);
+            }
+
+            await parentProjectStep.clickOnNextButton();
+            return new ProjectWizardDialogLanguageStep();
+        } catch (err) {
+            let screenshot = await this.saveScreenshotUniqueName('err_parent_proj_step');
+            throw new Error(`Error occurred in parent project step, screenshot:${screenshot} ` + err);
+        }
+    },
     isProjectSelected(arr, text) {
         arr.find((item) => {
             if (item.includes(text)) {
@@ -133,7 +149,13 @@ module.exports = {
                 let parentProjectStep = new ProjectWizardDialogParentProjectStep();
                 await parentProjectStep.clickOnSkipButton();
             } else {
-                let languageStep = await this.fillParentNameStep(project.parents);
+                let languageStep;
+                if (Array.isArray(project.parents)) {
+                    languageStep = await this.selectParentProjectsByName(project.parents);
+                } else {
+                    languageStep = await this.selectSingleParentProjectsByName(project.parents);
+                }
+
                 await languageStep.waitForLoaded();
             }
             let accessModeStep = await this.fillLanguageStep(project.language);