ui-tests - update app names issue #8821

sgauruseu · sgauruseu · commit 0bbba8e65edb · 2025-06-01T11:03:08.000+02:00
diff --git a/testing/libs/app_const.js b/testing/libs/app_const.js
@@ -63,7 +63,6 @@ module.exports = Object.freeze({
     TEST_FOLDER_NAME: 'all-content-types-images',
     APP_CONTENT_TYPES: 'All Content Types App',
     MY_FIRST_APP: 'My First App',
-    APP_WITH_CONFIGURATOR: 'Second Selenium App',
     THIS_FIELD_IS_REQUIRED: 'This field is required',
     PROJECT_UNSAVED_CHANGES_MESSAGE: "There are unsaved changes, do you want to save them before closing?",
     TAB_TITLE_PART: "/ Content",
@@ -109,9 +108,10 @@ module.exports = Object.freeze({
     TEST_APPS_NAME: {
         APP_CONTENT_TYPES: 'All Content Types App',
         SIMPLE_SITE_APP: 'Simple Site App',
-        APP_WITH_CONFIG_OPTION_SET: 'Simple Test Selenium App',
-        APP_WITH_METADATA_MIXIN: 'Third Selenium App',
+        TEST_APP_WITH_METADATA_MIXIN: 'Test Selenium App',
         MY_FIRST_APP: 'My First App',
+        TEST_SELENIUM_APP: 'Test Selenium App',
+        TEST_ADFS_PROVIDER_APP: 'Test ADFS ID Provider',
     },
 
     VERSIONS_ITEM_HEADER: {
@@ -224,6 +224,7 @@ module.exports = Object.freeze({
         CITY_CREATION: 'City Creation',
         CONTENT_TYPES_CITIES_DISTANCE_FACET: 'Cities Distance Facet',
         PART_WITH_ERROR: 'part-with-error',
+        MY_FIRST_APP_CITY_LIST: 'City list',
     },
     PCV_MENU_ITEM: {
         INSERT: 'Insert',
diff --git a/testing/page_objects/wizardpanel/site_configurator/site.configurator.req.input.js b/testing/page_objects/wizardpanel/site_configurator/site.configurator.req.input.js
@@ -5,7 +5,7 @@ const XPATH = {
     trackingIdTextInput: `//input[contains(@name,'trackingId')]`,
 };
 
-class SecondAppSiteConfiguratorDialog extends BaseSiteConfiguratorDialog {
+class SiteConfiguratorReqInputDialog extends BaseSiteConfiguratorDialog {
 
     get trackingIdTextInput() {
         return XPATH.container + `${XPATH.trackingIdTextInput}`;
@@ -22,4 +22,4 @@ class SecondAppSiteConfiguratorDialog extends BaseSiteConfiguratorDialog {
     }
 }
 
-module.exports = SecondAppSiteConfiguratorDialog;
+module.exports = SiteConfiguratorReqInputDialog;
diff --git a/testing/specs/content-types-2/content.selector.partinspection.spec.js b/testing/specs/content-types-2/content.selector.partinspection.spec.js
@@ -44,7 +44,7 @@ describe('my.first.site.country.spec - Create a site with country content', func
             await pageComponentView.openMenu('main');
             await pageComponentView.selectMenuItem(['Insert', 'Part']);
             // 4. Select the part with a config
-            await liveFormPanel.selectPartByDisplayName('City list');
+            await liveFormPanel.selectPartByDisplayName(appConst.PART_NAME.MY_FIRST_APP_CITY_LIST);
             await contentWizard.switchToMainFrame();
             await cityListPartInspectionPanel.waitForLoaded();
             // 5. 'Apply' button should be disabled after selecting a part-option in the part-dropdown:
@@ -110,11 +110,11 @@ describe('my.first.site.country.spec - Create a site with country content', func
             await pageComponentView.openMenu('main');
             await pageComponentView.selectMenuItem(['Insert', 'Part']);
             // 4. Select the part with image-selector in config
-            await liveFormPanel.selectPartByDisplayName('City Creation');
+            await liveFormPanel.selectPartByDisplayName(appConst.PART_NAME.CITY_CREATION);
             await contentWizard.switchToMainFrame();
             // 5. Verify that Inspect Panel is loaded
             await cityCreationPartInspectionPanel.waitForLoaded();
-            // 6. Click on mode-toggler and switch to flat mode:
+            // 6. Click on mode-toggle and switch the image-selector to tree mode:
             await cityCreationPartInspectionPanel.clickOnImageSelectorModeTogglerButton();
             // 7. Verify that expected options are displayed in tree mode:
             let items = await cityCreationPartInspectionPanel.getTreeModeOptionsImagesDisplayName();
diff --git a/testing/specs/modal-dialog/site.config.modal.dialog.with.optionset.spec.js b/testing/specs/modal-dialog/site.config.modal.dialog.with.optionset.spec.js
@@ -8,6 +8,9 @@ const contentBuilder = require("../../libs/content.builder");
 const SiteFormPanel = require('../../page_objects/wizardpanel/site.form.panel');
 const SiteConfiguratorWithOptionSetDialog = require('../../page_objects/wizardpanel/site_configurator/site.config.with.optionset.dialog');
 const appConst = require('../../libs/app_const');
+const ContentWizard = require('../../page_objects/wizardpanel/content.wizard.panel');
+const SiteConfiguratorDialog = require('../../page_objects/wizardpanel/site_configurator/site.config.with.optionset.dialog');
+const ContentPublishDialog = require('../../page_objects/content.publish.dialog');
 
 describe('Tests for site configurator modal dialog with multi-selection Option Set', function () {
     this.timeout(appConst.SUITE_TIMEOUT);
@@ -19,34 +22,67 @@ describe('Tests for site configurator modal dialog with multi-selection Option S
     it(`Precondition: new site should be added`,
         async () => {
             let displayName = contentBuilder.generateRandomName('site');
-            SITE = contentBuilder.buildSite(displayName, 'description', [appConst.TEST_APPS_NAME.APP_WITH_CONFIG_OPTION_SET]);
-            await studioUtils.doAddSite(SITE, true);
+            SITE = contentBuilder.buildSite(displayName, 'description', [appConst.TEST_APPS_NAME.MY_FIRST_APP]);
+            await studioUtils.doAddSite(SITE);
         });
 
     // Verifies: Default options in option-set don't get selected in site configurator #4629
-    it(`GIVEN site configurator dialog is opened WHEN the default selected option has been clicked and Apply button has been pressed THEN all options are unselected after reopening the dialog`,
+    // https://github.com/enonic/app-contentstudio/issues/4629
+    it(`GIVEN site configurator dialog is opened WHEN the checkbox(Option 2) that is checked by default has been unchecked and Apply button has been pressed THEN all options should be unchecked after reopening the dialog`,
         async () => {
             let siteFormPanel = new SiteFormPanel();
-            let siteConfiguratorDialog = new SiteConfiguratorWithOptionSetDialog();
-            // 1. Open existing site:
+            let siteConfigOptionSet = new SiteConfiguratorWithOptionSetDialog();
+            // 1. Open the existing site:
             await studioUtils.selectContentAndOpenWizard(SITE.displayName);
             // 2. Open Site Configurator:
-            await siteFormPanel.openSiteConfiguratorDialog(appConst.TEST_APPS_NAME.APP_WITH_CONFIG_OPTION_SET);
+            await siteFormPanel.openSiteConfiguratorDialog(appConst.TEST_APPS_NAME.MY_FIRST_APP);
             await studioUtils.saveScreenshot('site_cfg_option2_selected_default');
-            // 3. Verify that 'Option 2' is selected by default:
-            let result = await siteConfiguratorDialog.isCheckboxSelected('Option 2');
+            // 3. Verify that checkbox 'Option 2' is checked by default:
+            let result = await siteConfigOptionSet.isCheckboxSelected('Option 2');
             assert.ok(result, 'Option 2 option should be selected');
-            // 4. Unselect the 'Option 2' then Apply it:
-            await siteConfiguratorDialog.clickOnOption('Option 2');
-            await siteConfiguratorDialog.clickOnApplyButton();
-            await siteConfiguratorDialog.waitForDialogClosed();
+            // 4. Uncheck the 'Option 2' then Apply it:
+            await siteConfigOptionSet.clickOnOption('Option 2');
+            await siteConfigOptionSet.clickOnApplyButton();
+            await siteConfigOptionSet.waitForDialogClosed();
             await siteFormPanel.pause(500);
             // 5. Reopen the site configurator modal dialog:
-            await siteFormPanel.openSiteConfiguratorDialog(appConst.TEST_APPS_NAME.APP_WITH_CONFIG_OPTION_SET);
+            await siteFormPanel.openSiteConfiguratorDialog(appConst.TEST_APPS_NAME.MY_FIRST_APP);
             await studioUtils.saveScreenshot('site_cfg_option2_unselected_reopened');
-            // 6. Verify that 'Option 2' is unselected:
-            result = await siteConfiguratorDialog.isCheckboxSelected('Option 2');
-            assert.ok(result === false, 'Option 2 option should be not selected');
+            // 6. Verify that 'Option 2' is unchecked:
+            result = await siteConfigOptionSet.isCheckboxSelected('Option 2');
+            assert.ok(result === false, 'Option 2 option should not be checked');
+        });
+
+    // Verifies: https://github.com/enonic/app-contentstudio/issues/5710
+    // Content is not reset from Ready to In progress when controller is selected
+    it("GIVEN site is ready for publishing WHEN site config has been updated THEN the site's status gets 'Work in progress'",
+        async () => {
+            let siteFormPanel = new SiteFormPanel();
+            let contentWizard = new ContentWizard();
+            let siteConfiguratorDialog = new SiteConfiguratorDialog();
+            // 1. Open existing site:
+            await studioUtils.selectContentAndOpenWizard(SITE.displayName);
+            await contentWizard.clickOnMarkAsReadyButton();
+            let contentPublishDialog = new ContentPublishDialog();
+            await contentPublishDialog.waitForDialogOpened();
+            await contentPublishDialog.clickOnCancelTopButton();
+            await contentPublishDialog.waitForDialogClosed();
+            // 2. Open Site Configurator:
+            await siteFormPanel.openSiteConfiguratorDialog(appConst.TEST_APPS_NAME.MY_FIRST_APP);
+            // 3. select the 'Option 3' then Apply it:
+            await siteConfiguratorDialog.clickOnOption('Option 3');
+            await siteConfiguratorDialog.clickOnApplyButton();
+            await siteConfiguratorDialog.waitForDialogClosed();
+            // 4. Verify that Notification message appears:
+            await contentWizard.waitForNotificationMessage();
+            // 5. Verify that 'MARK AS READY' button gets visible in the wizard-toolbar
+            await contentWizard.waitForMarkAsReadyButtonVisible();
+            // 6. Verify that 'Save' button is disabled:
+            await contentWizard.waitForSaveButtonDisabled();
+            await studioUtils.saveScreenshot('site_cfg_updated_workflow');
+            // 7. Workflow status should be 'Work in progress':
+            let workflow = await contentWizard.getContentWorkflowState();
+            assert.equal(workflow, appConst.WORKFLOW_STATE.WORK_IN_PROGRESS, "the site's status should be 'Work in progress'");
         });
 
     beforeEach(() => studioUtils.navigateToContentStudioApp());
@@ -57,4 +93,4 @@ describe('Tests for site configurator modal dialog with multi-selection Option S
         }
         return console.log('specification starting: ' + this.title);
     });
-});
+});
diff --git a/testing/specs/modal-dialog/site.config.workflow.spec.js b/testing/specs/modal-dialog/site.config.workflow.spec.js
diff --git a/testing/specs/page-editor/layout.config.inspect.panel.spec.js b/testing/specs/page-editor/layout.config.inspect.panel.spec.js
@@ -31,14 +31,14 @@ describe('layout.config.inspect.panel.spec: tests for layout with config', funct
             let layoutConfigInspectPanel = new LayoutConfigInspectPanel();
             let layoutInspectionPanel = new LayoutInspectionPanel();
             let name = contentBuilder.generateRandomName('site');
-            SITE = contentBuilder.buildSite(name, ' ', [appConst.TEST_APPS_NAME.APP_WITH_METADATA_MIXIN]);
+            SITE = contentBuilder.buildSite(name, ' ', [appConst.TEST_APPS_NAME.APP_CONTENT_TYPES]);
             // 1. Open site-wizard and save:
             await studioUtils.openContentWizard(appConst.contentTypes.SITE);
             await contentWizard.typeData(SITE);
             await contentWizard.waitForNotificationMessage();
             await contentWizard.pause(500);
             // 2. Verify that the site should be saved automatically after selecting a controller
-            await contentWizard.selectPageDescriptor(appConst.CONTROLLER_NAME.DEFAULT);
+            await contentWizard.selectPageDescriptor(appConst.CONTROLLER_NAME.MAIN_REGION);
             await contentWizard.waitForSaveButtonDisabled();
             // 3. Click on minimize-toggler, expand 'Live Edit' and open Page Component modal dialog:
             await contentWizard.clickOnMinimizeLiveEditToggler();
@@ -57,7 +57,7 @@ describe('layout.config.inspect.panel.spec: tests for layout with config', funct
             // 11. Verify that there are no duplicated items in PCV:(4 items should be displayed in PCV);
             let result = await pageComponentView.getPageComponentsDisplayName();
             await studioUtils.saveScreenshot('layout_config_inspect_panel');
-            assert.ok(result.includes('default'), 'main region item should be displayed in the modal dialog');
+            assert.ok(result.includes('main region'), 'main region item should be displayed in the modal dialog');
             assert.ok(result.includes('Main'), 'main item should be displayed in the modal dialog');
             assert.ok(result.includes('Centered'), 'text component should be displayed in the modal dialog');
             assert.ok(result.includes('Center'), 'the second text component should be displayed in the modal dialog');
@@ -71,16 +71,16 @@ describe('layout.config.inspect.panel.spec: tests for layout with config', funct
             let layoutConfigInspectPanel = new LayoutConfigInspectPanel();
             let layoutInspectionPanel = new LayoutInspectionPanel();
             let name = contentBuilder.generateRandomName('site');
-            SITE = contentBuilder.buildSite(name, ' ', [appConst.TEST_APPS_NAME.APP_WITH_METADATA_MIXIN]);
+            SITE = contentBuilder.buildSite(name, ' ', [appConst.TEST_APPS_NAME.APP_CONTENT_TYPES]);
             // 1. Open site-wizard and save:
             await studioUtils.openContentWizard(appConst.contentTypes.SITE);
             await contentWizard.typeData(SITE);
             await contentWizard.waitForNotificationMessage();
             await contentWizard.pause(500);
             // 2. Verify that the site should be saved automatically after selecting a controller
-            await contentWizard.selectPageDescriptor(appConst.CONTROLLER_NAME.DEFAULT);
+            await contentWizard.selectPageDescriptor(appConst.CONTROLLER_NAME.APP_CONTENT_TYPES_PAGE);
             await contentWizard.waitForSaveButtonDisabled();
-            // 3. Click on minimize-toggler, expand 'Live Edit' and open Page Component modal dialog:
+            // 3. Click on minimize-toggle, expand 'Live Edit' and open Page Component modal dialog:
             await contentWizard.clickOnMinimizeLiveEditToggler();
             await pageComponentView.openMenu(MAIN_REGION);
             // 4. Insert the layout:
@@ -136,7 +136,7 @@ describe('layout.config.inspect.panel.spec: tests for layout with config', funct
             let layoutInspectionPanel = new LayoutInspectionPanel();
             // 1. Open the existing site:
             await studioUtils.selectAndOpenContentInWizard(SITE.displayName);
-            // 2. Click on minimize-toggler, expand 'Live Edit' and open Page Component modal dialog:
+            // 2. Click on minimize-toggle, expand 'Live Edit' and open Page Component modal dialog:
             await contentWizard.clickOnMinimizeLiveEditToggler();
             // 3. Click on the Centered item in PCV:
             await pageComponentView.clickOnComponent('Centered');
diff --git a/testing/specs/page-editor/page.template.insert.layout.spec.js b/testing/specs/page-editor/page.template.insert.layout.spec.js
@@ -20,7 +20,7 @@ describe('page.template.insert.layout.spec: tests for inserting a layout in page
     const SUPPORT_SITE = 'Site';
     const CONTROLLER_NAME = appConst.CONTROLLER_NAME.MAIN_REGION;
     const LAYOUT_NAME = appConst.LAYOUT_NAME.COL_3;
-    const TEST_TEXT = "test text";
+    const TEST_TEXT = 'test text';
 
     it(`Preconditions: new site should be created`,
         async () => {
diff --git a/testing/specs/project-2/project.wizard.two.apps.spec.js b/testing/specs/project-2/project.wizard.two.apps.spec.js
@@ -26,7 +26,7 @@ describe('project.wizard.two.apps.spec - Select 2 applications in project wizard
     const PROJECT_DISPLAY_NAME = studioUtils.generateRandomName('project');
     const LAYER_DISPLAY_NAME = studioUtils.generateRandomName('layer');
     const LAYER_DISPLAY_NAME_2 = studioUtils.generateRandomName('layer');
-    const PARENT_APPS = [appConst.TEST_APPS_NAME.APP_CONTENT_TYPES, appConst.TEST_APPS_NAME.APP_WITH_METADATA_MIXIN];
+    const PARENT_APPS = [appConst.TEST_APPS_NAME.APP_CONTENT_TYPES, appConst.TEST_APPS_NAME.TEST_APP_WITH_METADATA_MIXIN];
 
     it(`GIVEN project with two selected apps is opened THEN expected application should be present in the wizard page`,
         async () => {
diff --git a/testing/specs/site.configurator.required.input.spec.js b/testing/specs/site.configurator.required.input.spec.js
diff --git a/testing/specs/site.with.meta.fields.spec.js b/testing/specs/site.with.meta.fields.spec.js

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ const XPATH = {`
`5`	`5`	trackingIdTextInput: `//input[contains(@name,'trackingId')]`,
`6`	`6`	`};`
`7`	`7`
`8`		`-class SecondAppSiteConfiguratorDialog extends BaseSiteConfiguratorDialog {`
	`8`	`+class SiteConfiguratorReqInputDialog extends BaseSiteConfiguratorDialog {`
`9`	`9`
`10`	`10`	`get trackingIdTextInput() {`
`11`	`11`	return XPATH.container + `${XPATH.trackingIdTextInput}`;
`@@ -22,4 +22,4 @@ class SecondAppSiteConfiguratorDialog extends BaseSiteConfiguratorDialog {`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`
`25`		`-module.exports = SecondAppSiteConfiguratorDialog;`
	`25`	`+module.exports = SiteConfiguratorReqInputDialog;`