From 8f8bd1a1c6d23b8ac87f4b7385813c0614cfea1f Mon Sep 17 00:00:00 2001
From: Geofrey Flores <75278792+gflores-jahia@users.noreply.github.com>
Date: Thu, 18 Jan 2024 10:12:53 -0500
Subject: [PATCH] BACKLOG-22218: Add more test scenarios (#12)

---
 tests/cypress/e2e/filtering.cy.ts             | 56 ++++++++++++++++---
 tests/cypress/fixtures/utils/configuration.ts | 21 ++++++-
 2 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/tests/cypress/e2e/filtering.cy.ts b/tests/cypress/e2e/filtering.cy.ts
index e285985..e69fd2d 100644
--- a/tests/cypress/e2e/filtering.cy.ts
+++ b/tests/cypress/e2e/filtering.cy.ts
@@ -1,5 +1,7 @@
 import {addNode, createSite, deleteSite} from '@jahia/cypress';
 import {
+    addConfig,
+    disableHtmlFiltering,
     enableHtmlFiltering,
     getContent,
     installConfig,
@@ -11,6 +13,8 @@ describe('HTML rich text filtering', () => {
     const textName = 'myText';
     const path = `/sites/${siteKey}/contents/${textName}`;
 
+    // TODO Need to clean up configuration manually (delete in file system) for local re-runs
+
     before(() => {
         createSite(siteKey);
         addNode({
@@ -25,17 +29,18 @@ describe('HTML rich text filtering', () => {
         deleteSite(siteKey);
     });
 
-    it('does not apply html filtering when disabled (default)', () => {
-        modifyContent(path, '<iframe title="My iframe"></iframe>');
+    it('does not apply html filtering to tag when disabled (default)', () => {
+        modifyContent(path, '<iframe title="My iframe"></iframe><script> var today= new Date(); </script>');
         getContent(path).then(result => {
             expect(result.data.jcr.nodeByPath.property.value).to.contain('iframe');
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('<script>');
         });
     });
 
     it('does not apply html filtering to attribute when disabled (default)', () => {
         modifyContent(path, '<img src="stub.jpg" loading="lazy">');
         getContent(path).then(result => {
-            expect(result.data.jcr.nodeByPath.property.value).to.contain('img');
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('<img');
             expect(result.data.jcr.nodeByPath.property.value).to.contain('src');
             expect(result.data.jcr.nodeByPath.property.value).to.contain('loading');
         });
@@ -43,22 +48,36 @@ describe('HTML rich text filtering', () => {
 
     it('applies default html filtering when enabled', () => {
         enableHtmlFiltering(siteKey);
-        modifyContent(path, '<iframe title="My iframe"></iframe>');
+        modifyContent(path, '<iframe title="My iframe"></iframe><a title="My link"></a><script> var today= new Date(); </script>');
         getContent(path).then(result => {
             expect(result.data.jcr.nodeByPath.property.value).to.not.contain('iframe');
+            expect(result.data.jcr.nodeByPath.property.value).to.not.contain('script');
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('<a');
+        });
+    });
+
+    it('applies default html filtering when enabled', () => {
+        enableHtmlFiltering(siteKey);
+        modifyContent(path, '<a title="My iframe"></a>');
+        getContent(path).then(result => {
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('a');
         });
     });
 
     it('applies default filtering to html element when enabled', () => {
-        modifyContent(path, '<iframe title="My iframe"></iframe>');
+        modifyContent(path, '<iframe title="My iframe"></iframe><p>This is a <u>nested</u>tag</p>');
         getContent(path).then(result => {
-            expect(result.data.jcr.nodeByPath.property.value).to.not.contain('iframe');
+            expect(result.data.jcr.nodeByPath.property.value).to.not.contain('<iframe>');
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('<p>');
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('<u>');
         });
     });
 
     it('applies default filtering to html attributes when enabled', () => {
-        modifyContent(path, '<img src="stub.jpg" loading="lazy">');
+        modifyContent(path, '<img src="stub.jpg" loading="lazy"><a href="https://localhost:8080">');
         getContent(path).then(result => {
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('a');
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('href');
             expect(result.data.jcr.nodeByPath.property.value).to.contain('img');
             expect(result.data.jcr.nodeByPath.property.value).to.contain('src');
             expect(result.data.jcr.nodeByPath.property.value).to.not.contain('loading', 'filtered attribute');
@@ -75,11 +94,30 @@ describe('HTML rich text filtering', () => {
 
     it('can override filtering config for specified site', () => {
         installConfig('configs/org.jahia.modules.richtext.config-filteringSite.yml');
-        modifyContent(path, '<strong>This text is important!</strong>');
+        modifyContent(path, '<p>This text<strong>is important!</strong> but not this one</p>');
         getContent(path).then(result => {
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('<p>');
             expect(result.data.jcr.nodeByPath.property.value).to.not.contain('strong');
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('important', 'Tag removed but data remains');
+        });
+    });
+
+    it('can update config and filter using updated rules', () => {
+        addConfig('htmlFiltering.disallow.elements[1].name', 'i', 'filteringSite');
+        modifyContent(path, '<p>This text<i>is important!</i> but not this one</p>');
+        getContent(path).then(result => {
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('<p>');
+            expect(result.data.jcr.nodeByPath.property.value).to.not.contain('<i>');
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('important', 'Tag removed but data remains');
         });
     });
 
-    // TODO Need to clean up configuration manually (delete in file system) for re-runs
+    it('does not override filtering config for specified site when filtering is disabled', () => {
+        disableHtmlFiltering(siteKey);
+        installConfig('configs/org.jahia.modules.richtext.config-filteringSite.yml');
+        modifyContent(path, '<p>This text<strong>is important!</strong> but not this one</p>');
+        getContent(path).then(result => {
+            expect(result.data.jcr.nodeByPath.property.value).to.contain('strong');
+        });
+    });
 });
diff --git a/tests/cypress/fixtures/utils/configuration.ts b/tests/cypress/fixtures/utils/configuration.ts
index a7290e4..3c9b6d3 100644
--- a/tests/cypress/fixtures/utils/configuration.ts
+++ b/tests/cypress/fixtures/utils/configuration.ts
@@ -1,5 +1,7 @@
 import gql from 'graphql-tag';
 
+const pid = 'org.jahia.modules.richtext.config';
+
 export const installConfig = configFilePath => {
     return cy.runProvisioningScript(
         {fileContent: `- installConfiguration: "${configFilePath}"`, type: 'application/yaml'},
@@ -8,7 +10,6 @@ export const installConfig = configFilePath => {
 };
 
 export const getConfig = siteKey => {
-    const pid = 'org.jahia.modules.richtext.config';
     const getConfigGql = gql`
         query getConfig($pid: String!, $siteKey: String!) {
             admin {
@@ -25,3 +26,21 @@ export const getConfig = siteKey => {
         variables: {pid, siteKey}
     });
 };
+
+export const addConfig = (key, value, siteKey = 'default') => {
+    const addConfigGql = gql`
+        mutation addConfig($pid: String!, $identifier: String!, $key: String!, $value: String!) {
+            admin {
+                jahia {
+                    configuration(pid: $pid, identifier: $identifier) {
+                        value(name: $key value: $value)
+                    }
+                }
+            }
+        }
+    `;
+    return cy.apollo({
+        mutation: addConfigGql,
+        variables: {pid, identifier: siteKey, key, value}
+    });
+};