Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: adobe/aem-core-cif-components
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 11fa8ebe0b6da4a9d054f51830fd9ebab06171fb
Choose a base ref
..
head repository: adobe/aem-core-cif-components
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: f134bca75fa73566898229c7937c094a414f1587
Choose a head ref
Showing with 5 additions and 4 deletions.
  1. +3 −0 .gitattributes
  2. +2 −4 ...st/java/com/adobe/cq/commerce/core/components/internal/services/CommerceLinksTransformerTest.java
3 changes: 3 additions & 0 deletions .gitattributes
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
* text=auto

bundles/core/src/test/resources/rewriter/ciflinks.html binary
6 changes: 2 additions & 4 deletions ...com/adobe/cq/commerce/core/components/internal/services/CommerceLinksTransformerTest.java
View file
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.util.stream.Collectors;

import org.apache.http.HttpStatus;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -155,9 +154,8 @@ public void testTransformerDisabled() throws Exception {
// verify transformed HTML
String transformedHtml = writer.toString();

Path filePath = Paths.get(classLoader.getResource(TEST_HTML).getPath());
String originalHtml = Files.lines(filePath).collect(Collectors.joining(System.lineSeparator()));

Path filePath = Paths.get(classLoader.getResource(TEST_HTML).toURI());
String originalHtml = new String(Files.readAllBytes(filePath));
assertTrue(transformedHtml.endsWith(originalHtml));
}