SITES-19187 - Two methods of placing assets in image component give different results on dialog (#2663)

LSantha · web-flow · commit 0862382db03b · 2024-02-06T18:49:23.000+02:00
* ignore freshness for checkbox altValueFromDAM, titleValueFromDAM and displayPopupTitle in Image v2 edit dialog
 * ignore freshness for checkbox altValueFromDAM in Image v3 edit dialog
 * updated dependencies for selenium tests to fix failures with chrome versions newer than version 114
 * updated selenium tests
 * ignore the new selenium tests until the necessary releases

---------

Co-authored-by: levente &lt;levente@qadobe.com&gt;
diff --git a/content/src/content/jcr_root/apps/core/wcm/components/image/v2/image/_cq_dialog/.content.xml b/content/src/content/jcr_root/apps/core/wcm/components/image/v2/image/_cq_dialog/.content.xml
@@ -164,6 +164,7 @@
                                                         sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
                                                         checked="${not empty cqDesign.altValueFromDAM ? cqDesign.altValueFromDAM : true}"
                                                         fieldDescription="When checked, populate the image's alt attribute with the value of the dc:description metadata in DAM."
+                                                        forceIgnoreFreshness="true"
                                                         name="./altValueFromDAM"
                                                         text="Get alternative text from DAM"
                                                         uncheckedValue="false"
@@ -185,6 +186,7 @@
                                                         sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
                                                         checked="${not empty cqDesign.titleValueFromDAM ? cqDesign.titleValueFromDAM : true}"
                                                         fieldDescription="When checked, populate the image's caption with the value of the dc:title metadata in DAM."
+                                                        forceIgnoreFreshness="true"
                                                         name="./titleValueFromDAM"
                                                         text="Get caption from DAM"
                                                         uncheckedValue="false"
@@ -194,6 +196,7 @@
                                                         sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
                                                         checked="${not empty cqDesign.displayPopupTitle ? cqDesign.displayPopupTitle : true}"
                                                         fieldDescription="When checked, the caption won't be displayed below the image, but as a pop-up displayed by some browsers when hovering over the image."
+                                                        forceIgnoreFreshness="true"
                                                         name="./displayPopupTitle"
                                                         text="Display caption as pop-up"
                                                         uncheckedValue="false"
diff --git a/content/src/content/jcr_root/apps/core/wcm/components/image/v3/image/_cq_dialog/.content.xml b/content/src/content/jcr_root/apps/core/wcm/components/image/v3/image/_cq_dialog/.content.xml
@@ -97,6 +97,7 @@
                                                         sling:resourceType="granite/ui/components/coral/foundation/form/checkbox"
                                                         checked="${not empty cqDesign.altValueFromDAM ? cqDesign.altValueFromDAM : true}"
                                                         fieldDescription="When checked, populate the image's alt attribute with the value of the dc:description metadata in DAM."
+                                                        forceIgnoreFreshness="true"
                                                         name="./altValueFromDAM"
                                                         text="Inherit from description of asset"
                                                         uncheckedValue="false"
diff --git a/parent/pom.xml b/parent/pom.xml
@@ -64,9 +64,9 @@
         <mockitio.version>4.8.1</mockitio.version>
         <maven.compiler.source>${aem.java.version}</maven.compiler.source>
         <maven.compiler.target>${aem.java.version}</maven.compiler.target>
-        <aem.selenium.base.it.version>0.2.42</aem.selenium.base.it.version>
-        <selenide.version>6.10.1</selenide.version>
-        <selenium.version>4.7.1</selenium.version>
+        <aem.selenium.base.it.version>0.2.46</aem.selenium.base.it.version>
+        <selenide.version>6.19.1</selenide.version>
+        <selenium.version>4.13.0</selenium.version>
     </properties>
 
     <!-- ======================================================================= -->
diff --git a/testing/it/e2e-selenium-utils/src/main/java/com/adobe/cq/wcm/core/components/it/seljup/util/Commons.java b/testing/it/e2e-selenium-utils/src/main/java/com/adobe/cq/wcm/core/components/it/seljup/util/Commons.java
@@ -26,6 +26,12 @@
 import java.util.concurrent.TimeoutException;
 
 import com.adobe.cq.testing.selenium.pagewidgets.cq.InsertComponentDialog;
+import com.codeborne.selenide.Condition;
+import com.codeborne.selenide.DragAndDropOptions;
+import com.codeborne.selenide.ElementsCollection;
+import com.codeborne.selenide.Selenide;
+import com.codeborne.selenide.SelenideElement;
+import com.codeborne.selenide.WebDriverRunner;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.http.HttpStatus;
@@ -58,11 +64,6 @@
 import com.adobe.cq.testing.selenium.utils.TestContentBuilder;
 import com.adobe.cq.wcm.core.components.it.seljup.util.constant.RequestConstants;
 import com.adobe.cq.wcm.core.components.it.seljup.util.constant.Selectors;
-import com.codeborne.selenide.Condition;
-import com.codeborne.selenide.ElementsCollection;
-import com.codeborne.selenide.Selenide;
-import com.codeborne.selenide.SelenideElement;
-import com.codeborne.selenide.WebDriverRunner;
 
 import static com.adobe.cq.testing.selenium.Constants.DEFAULT_RETRY_DELAY;
 import static com.adobe.cq.testing.selenium.Constants.DEFAULT_SMALL_SIZE;
@@ -922,6 +923,12 @@ public static void makeInlineEditorEditable() {
         ((JavascriptExecutor) webDriver).executeScript("document.getElementsByName('actionUpdate')[0].style.display='inline'");
     }
 
+    public static void dragSidePanelImageToComponent(String imagePath, String componentPath) {
+        SelenideElement image = $(String.format("coral-card.cq-draggable[data-path=\"%s\"]", imagePath));
+        DragAndDropOptions.DragAndDropTarget.CssSelector targetComp = new DragAndDropOptions.DragAndDropTarget.CssSelector(String.format("[data-type='Editable'][data-path='%s']", componentPath));
+        image.dragAndDrop(new DragAndDropOptions(targetComp, DragAndDropOptions.DragAndDropMethod.ACTIONS));
+    }
+
     /**
      * Class representing a simple page that can be opened in a Selenium browser.
      */
diff --git a/testing/it/e2e-selenium-utils/src/main/java/com/adobe/cq/wcm/core/components/it/seljup/util/components/image/ImageEditDialog.java b/testing/it/e2e-selenium-utils/src/main/java/com/adobe/cq/wcm/core/components/it/seljup/util/components/image/ImageEditDialog.java
@@ -133,4 +133,18 @@ public void clickLinkTarget() {
         checkbox.click();
     }
 
+    public boolean isTitleFromDAM() {
+        CoralCheckbox checkbox = new CoralCheckbox(titleValueFromDAM);
+        return checkbox.isChecked();
+    }
+
+    public boolean isAltFromDAM() {
+        CoralCheckbox checkbox = new CoralCheckbox(altValueFromDAM);
+        return checkbox.isChecked();
+    }
+
+    public boolean isPopUpTitle() {
+        CoralCheckbox checkbox = new CoralCheckbox(popUpTitle);
+        return checkbox.isChecked();
+    }
 }
diff --git a/testing/it/e2e-selenium-utils/src/main/java/com/adobe/cq/wcm/core/components/it/seljup/util/components/teaser/v1/TeaserEditDialog.java b/testing/it/e2e-selenium-utils/src/main/java/com/adobe/cq/wcm/core/components/it/seljup/util/components/teaser/v1/TeaserEditDialog.java
@@ -172,4 +172,8 @@ public void checkAltTextFromAssetDescription() {
         checkbox.click();
     }
 
+    public boolean isAltTextFromAssetDescription() {
+        CoralCheckbox checkbox = new CoralCheckbox(altTextFromAssetDescription);
+        return checkbox.isChecked();
+    }
 }
diff --git a/testing/it/e2e-selenium/pom.xml b/testing/it/e2e-selenium/pom.xml
@@ -261,7 +261,7 @@
         <dependency>
             <groupId>com.adobe.cq</groupId>
             <artifactId>aem-cloud-testing-clients</artifactId>
-            <version>1.1.0</version>
+            <version>1.2.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>com.fasterxml.jackson.core</groupId>
diff --git a/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/image/ImageTests.java b/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/image/ImageTests.java
@@ -186,6 +186,28 @@ public void testAddImage() throws TimeoutException, InterruptedException {
                 + " and title " + originalDamTitle);
     }
 
+    public void testDragImageToComponent(boolean imageV3) throws TimeoutException, InterruptedException {
+        Commons.openSidePanel();
+        Commons.dragSidePanelImageToComponent(testImagePath, compPath);
+        Commons.closeSidePanel();
+
+        ImageEditDialog editDialog = image.getEditDialog();
+        Commons.openEditDialog(editorPage, compPath);
+
+        assertTrue(editDialog.isAltFromDAM());
+
+        if (!imageV3) {
+            assertTrue(editDialog.isTitleFromDAM());
+            assertTrue(editDialog.isPopUpTitle());
+        }
+
+        Commons.closeConfigureDialog();
+        Commons.switchContext("ContentFrame");
+
+        assertTrue(image.isImagePresentWithAltTextAndTitle(testPage, originalDamDescription, originalDamTitle),
+            "Image should be present with alt text " + originalDamDescription + " and title " + originalDamTitle);
+    }
+
     public void testAddAltTextAndTitle() throws TimeoutException, InterruptedException {
         Commons.openSidePanel();
         dragImage();
diff --git a/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/image/v2/ImageIT.java b/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/image/v2/ImageIT.java
@@ -19,6 +19,7 @@
 import java.util.concurrent.TimeoutException;
 
 import org.apache.sling.testing.clients.ClientException;
+import org.junit.Ignore;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
@@ -56,6 +57,15 @@ public void testAddImage() throws TimeoutException, InterruptedException {
         imageTests.testAddImage();
     }
 
+    @Ignore
+    @Tag("IgnoreOnSDK")
+    @Tag("IgnoreOn65")
+    @Test
+    @DisplayName("Test: drag image to component")
+    public void testDragImageToComponent() throws TimeoutException, InterruptedException {
+        imageTests.testDragImageToComponent(false);
+    }
+
     /**
      * Test: set Alt Text and Title
      */
diff --git a/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/image/v3/ImageIT.java b/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/image/v3/ImageIT.java
@@ -17,7 +17,6 @@
 package com.adobe.cq.wcm.core.components.it.seljup.tests.image.v3;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.concurrent.TimeoutException;
 
 import org.apache.http.NameValuePair;
@@ -32,7 +31,6 @@
 import com.adobe.cq.wcm.core.components.it.seljup.tests.image.ImageTests;
 import com.adobe.cq.wcm.core.components.it.seljup.util.Commons;
 import com.adobe.cq.wcm.core.components.it.seljup.util.components.image.v2.Image;
-import com.google.common.collect.ImmutableMap;
 
 @Tag("group2")
 public class ImageIT extends com.adobe.cq.wcm.core.components.it.seljup.tests.image.v2.ImageIT {
@@ -44,6 +42,15 @@ public void setupBeforeEach() throws ClientException {
         imageTests.setup(adminClient, contextPath, label, Commons.RT_IMAGE_V3, rootPage, defaultPageTemplate, clientlibs, new Image());
     }
 
+    @Ignore
+    @Tag("IgnoreOnSDK")
+    @Tag("IgnoreOn65")
+    @Test
+    @DisplayName("Test: drag image to component")
+    public void testDragImageToComponent() throws TimeoutException, InterruptedException {
+        imageTests.testDragImageToComponent(true);
+    }
+
     /**
      * Test: Check image map areas are not rendered
      *
diff --git a/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/teaser/v1/TeaserIT.java b/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/teaser/v1/TeaserIT.java
@@ -47,6 +47,7 @@
 public class TeaserIT extends AuthorBaseUITest {
     protected static String  testAssetsPath                   = "/content/dam/core-components";
     protected static String  testImagePath                    = testAssetsPath + "/core-comp-test-image.jpg";
+    protected static String  testImageAltText                 = "House on a beach with blue sky";
     protected static String  preTitle                         = "Teaser PreTitle";
     protected static String  title                            = "Teaser Title";
     protected static String  description                      = "Teaser Description";
diff --git a/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/teaser/v2/TeaserIT.java b/testing/it/e2e-selenium/src/test/java/com/adobe/cq/wcm/core/components/it/seljup/tests/teaser/v2/TeaserIT.java
@@ -20,6 +20,7 @@
 import java.util.concurrent.TimeoutException;
 
 import org.apache.sling.testing.clients.ClientException;
+import org.junit.Ignore;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Tag;
@@ -512,6 +513,27 @@ public void testInheritImageFromAction_altNotInherited() throws ClientException,
         assertTrue(teaser.isImagePresentWithFileName(skiingAssetFormatted),"image should be rendered with file name: " + skiingAssetFormatted);
     }
 
+    @Ignore
+    @Tag("IgnoreOnSDK")
+    @Tag("IgnoreOn65")
+    @Test
+    @DisplayName("Test: drag and drop image from side panel to teaser component on a page")
+    public void testDropImageToTeaser() throws TimeoutException, InterruptedException {
+        Commons.openSidePanel();
+        Commons.dragSidePanelImageToComponent(testImagePath, cmpPath);
+        Commons.closeSidePanel();
+
+        com.adobe.cq.wcm.core.components.it.seljup.util.components.teaser.v1.TeaserEditDialog editDialog = teaser.getEditDialog();
+        Commons.openEditDialog(editorPage, cmpPath);
+
+        assertTrue(editDialog.isAltTextFromAssetDescription());
+
+        Commons.closeConfigureDialog();
+        Commons.switchContext("ContentFrame");
+
+        assertTrue(teaser.isImagePresentWithAltText(testPage, testImageAltText), "Image should be rendered with alt text: " + testImageAltText);
+    }
+
     // ----------------------------------------------------------
     // private stuff
     // ----------------------------------------------------------

Original file line number	Diff line number	Diff line change
`@@ -172,4 +172,8 @@ public void checkAltTextFromAssetDescription() {`
`172`	`172`	`checkbox.click();`
`173`	`173`	`}`
`174`	`174`
	`175`	`+ public boolean isAltTextFromAssetDescription() {`
	`176`	`+ CoralCheckbox checkbox = new CoralCheckbox(altTextFromAssetDescription);`
	`177`	`+ return checkbox.isChecked();`
	`178`	`+ }`
`175`	`179`	`}`