update changelog

wcm-io · Nov 7, 2023 · c8cc46a · c8cc46a
1 parent ef5b554
commit c8cc46a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 1 deletion.
diff --git a/changes.xml b/changes.xml
@@ -23,6 +23,12 @@
     xsi:schemaLocation="http://maven.apache.org/changes/1.0.0 http://maven.apache.org/plugins/maven-changes-plugin/xsd/changes-1.0.0.xsd">
   <body>
 
+    <release version="1.16.0" date="not released">
+      <action type="update" dev="sseifert" issue="14">
+        MediaHandlerConfig: Make list of allowed IPE editor types configurable (defaults to "image").
+      </action>
+    </release>
+
     <release version="1.15.8" date="2023-09-08">
       <action type="update" dev="joerghoh" issue="22">
         DAM Renditions: Read width/height of rendition lazy, as this can be expensive when not configured properly or Asset metadata is missing for other reasons.

diff --git a/src/test/java/io/wcm/handler/media/markup/MediaMarkupBuilderUtilTest.java b/src/test/java/io/wcm/handler/media/markup/MediaMarkupBuilderUtilTest.java
@@ -23,6 +23,7 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.when;
 
 import java.util.Set;
@@ -98,7 +99,6 @@ void setUp() throws Exception {
     when(componentContext.getEditContext()).thenReturn(editContext);
     when(editContext.getEditConfig()).thenReturn(editConfig);
     when(editConfig.getInplaceEditingConfig()).thenReturn(inplaceEditingConfig);
-    when(inplaceEditingConfig.getConfigPath()).thenReturn("/apps/components/comp1");
     when(inplaceEditingConfig.getEditorType()).thenReturn("image");
   }
 
@@ -201,4 +201,19 @@ void testCanSetCustomIPECropRatios_AUTO() {
     assertTrue(MediaMarkupBuilderUtil.canSetCustomIPECropRatios(mediaRequest, componentContext));
   }
 
+  @Test
+  void testCanSetCustomIPECropRatios_AUTO_IPEConfigPath() {
+    MediaRequest mediaRequest = new MediaRequest("/content/dam/path", new MediaArgs().ipeRatioCustomize(IPERatioCustomize.AUTO));
+    when(inplaceEditingConfig.getConfigPath()).thenReturn("/apps/components/comp1");
+    assertTrue(MediaMarkupBuilderUtil.canSetCustomIPECropRatios(mediaRequest, componentContext));
+  }
+
+  @Test
+  void testCanSetCustomIPECropRatios_AUTO_ExistingRatios() {
+    MediaRequest mediaRequest = new MediaRequest("/content/dam/path", new MediaArgs().ipeRatioCustomize(IPERatioCustomize.AUTO));
+    when(inplaceEditingConfig.getConfigPath()).thenReturn("/apps/components/comp1");
+    when(resolver.getResource("/apps/components/comp1/plugins/crop/aspectRatios")).thenReturn(mock(Resource.class));
+    assertFalse(MediaMarkupBuilderUtil.canSetCustomIPECropRatios(mediaRequest, componentContext));
+  }
+
 }