You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by dk...@apache.org on 2023/03/28 03:54:02 UTC

[sling-org-apache-sling-app-cms] branch master updated: SLING-11808 - Fixing failing test on Windows

This is an automated email from the ASF dual-hosted git repository.

dklco pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git


The following commit(s) were added to refs/heads/master by this push:
     new f832c619 SLING-11808 - Fixing failing test on Windows
f832c619 is described below

commit f832c6190a137a8e77383ade455571b8aadc4db0
Author: Dan Klco <kl...@adobe.com>
AuthorDate: Mon Mar 27 23:53:56 2023 -0400

    SLING-11808 - Fixing failing test on Windows
---
 .../apache/sling/cms/core/internal/filters/EditIncludeFilterTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/test/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilterTest.java b/core/src/test/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilterTest.java
index 29bee4a4..c22630aa 100644
--- a/core/src/test/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilterTest.java
+++ b/core/src/test/java/org/apache/sling/cms/core/internal/filters/EditIncludeFilterTest.java
@@ -110,8 +110,8 @@ public class EditIncludeFilterTest {
         includeFilter.doFilter(context.request(), context.response(), Mockito.mock(FilterChain.class));
 
         assertEquals(
-                "<div class=\"sling-cms-component\" data-reload=\"false\" data-component=\"/libs/sling-cms/components/general/richtext\" data-sling-cms-title=\"Rich Text Editor\" data-sling-cms-resource-path=\"/content/apache/sling-apache-org/index/jcr:content/menu/richtext\" data-sling-cms-resource-type=\"sling-cms/components/general/richtext\" data-sling-cms-edit=\"/libs/sling-cms/components/general/richtext/edit\" data-sling-cms-resource-name=\"richtext\">\n    <div class=\"sling-cms- [...]
-                context.response().getOutputAsString());
+                "<div class=\"sling-cms-component\" data-reload=\"false\" data-component=\"/libs/sling-cms/components/general/richtext\" data-sling-cms-title=\"Rich Text Editor\" data-sling-cms-resource-path=\"/content/apache/sling-apache-org/index/jcr:content/menu/richtext\" data-sling-cms-resource-type=\"sling-cms/components/general/richtext\" data-sling-cms-edit=\"/libs/sling-cms/components/general/richtext/edit\" data-sling-cms-resource-name=\"richtext\">    <div class=\"sling-cms-ed [...]
+                context.response().getOutputAsString().replaceAll("[\\n\\r]", ""));
     }
 
     @Test