From 771055f19e8b646a345d20e205221f9a6cb3d301 Mon Sep 17 00:00:00 2001
From: akarmanov <alexandrk_@hotmail.com>
Date: Tue, 5 Nov 2024 15:28:49 -0500
Subject: [PATCH 1/8] BACKLOG-23358 Add highlight test

---
 tests/cypress/e2e/jcontent/preview.cy.ts | 31 ++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/tests/cypress/e2e/jcontent/preview.cy.ts b/tests/cypress/e2e/jcontent/preview.cy.ts
index 639fa393e..25693b19d 100644
--- a/tests/cypress/e2e/jcontent/preview.cy.ts
+++ b/tests/cypress/e2e/jcontent/preview.cy.ts
@@ -1,6 +1,20 @@
 import {JContent} from '../../page-object';
+import gql from 'graphql-tag';
 
 describe('JContent preview tests', () => {
+    const addContent = gql`mutation MyMutation {
+  jcr {
+    addNode(
+      name: "addedNode"
+      parentPathOrId: "/sites/jcontentSite/home/area-main"
+      primaryNodeType: "jnt:bigText"
+      properties: { name: "text", language: "en", value: "test added" }
+    ) {
+      uuid
+    }
+  }
+}`;
+
     beforeEach(() => {
         cy.executeGroovy('jcontent/createSite.groovy', {SITEKEY: 'jcontentSite'});
         cy.apollo({mutationFile: 'jcontent/createContent.graphql'});
@@ -39,6 +53,23 @@ describe('JContent preview tests', () => {
             .should('be.visible');
     });
 
+    it('should highlight changes staging vs live', () => {
+        cy.apollo({mutation: addContent});
+        JContent.visit('jcontentSite', 'en', 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))');
+        cy.get('h1').contains('Compare staging vs live version').should('exist');
+        cy.get('button[data-sel-role="highlight"]').should('be.visible').click();
+        cy.get('iframe[data-sel-role="staging-frame"]')
+            .its('0.contentDocument.body')
+            .should('be.visible')
+            .contains('span[class="diff-html-added"]');
+        cy.get('button[data-sel-role="highlight"]').should('be.visible').click();
+        cy.get('iframe[data-sel-role="staging-frame"]')
+            .its('0.contentDocument.body')
+            .should('be.visible')
+            .contains('span[class="diff-html-added"]')
+            .should('not.exist');
+    });
+
     afterEach(() => {
         cy.logout();
         cy.executeGroovy('jcontent/deleteSite.groovy', {SITEKEY: 'jcontentSite'});

From 4e0c698c53a04d9f300a025e10d3991192a95982 Mon Sep 17 00:00:00 2001
From: akarmanov <alexandrk_@hotmail.com>
Date: Wed, 6 Nov 2024 07:31:44 -0500
Subject: [PATCH 2/8] BACKLOG-23358 Refactor tests

---
 .../JContent/CompareDialog/CompareDialog.jsx  |  4 +-
 .../e2e/jcontent/compareStagingLive.cy.ts     | 60 +++++++++++++++++++
 tests/cypress/e2e/jcontent/preview.cy.ts      | 42 -------------
 tests/cypress/page-object/compareDialog.ts    | 35 +++++++++++
 tests/cypress/page-object/jcontent.ts         |  5 ++
 5 files changed, 102 insertions(+), 44 deletions(-)
 create mode 100644 tests/cypress/e2e/jcontent/compareStagingLive.cy.ts
 create mode 100644 tests/cypress/page-object/compareDialog.ts

diff --git a/src/javascript/JContent/CompareDialog/CompareDialog.jsx b/src/javascript/JContent/CompareDialog/CompareDialog.jsx
index dd4a7811c..2a57969b5 100644
--- a/src/javascript/JContent/CompareDialog/CompareDialog.jsx
+++ b/src/javascript/JContent/CompareDialog/CompareDialog.jsx
@@ -43,14 +43,14 @@ const CompareDialog = () => {
     }
 
     return (
-        <Dialog fullScreen open={open}>
+        <Dialog fullScreen open={open} data-sel-role="compare-dialog">
             <Header className={styles.header}
                     title={t('jcontent:label.contentManager.actions.compareStagingToLive')}
                     mainActions={[
                         <div key="mainActions" className={styles.actionsRoot}>
                             <Button variant="ghost"
                                     size="big"
-                                    data-sel-role="refresh"
+                                    data-sel-role="compare-refresh"
                                     className={styles.actionItem}
                                     icon={<Reload/>}
                                     label={t('jcontent:label.contentManager.refresh')}
diff --git a/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts b/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts
new file mode 100644
index 000000000..84f768d95
--- /dev/null
+++ b/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts
@@ -0,0 +1,60 @@
+import {JContent} from '../../page-object';
+import gql from 'graphql-tag';
+
+describe('JContent preview tests', () => {
+    const addContent = gql`mutation MyMutation {
+      jcr {
+        addNode(
+          name: "addedNode"
+          parentPathOrId: "/sites/jcontentSite/home/area-main"
+          primaryNodeType: "jnt:bigText"
+          properties: { name: "text", language: "en", value: "test added" }
+        ) {
+          uuid
+        }
+      }
+    }`;
+
+    beforeEach(() => {
+        cy.executeGroovy('jcontent/createSite.groovy', {SITEKEY: 'jcontentSite'});
+        cy.apollo({mutationFile: 'jcontent/createContent.graphql'});
+        cy.loginAndStoreSession(); // Edit in chief
+        const jcontent = JContent.visit('jcontentSite', 'en', 'pages/home');
+        jcontent.publishAll();
+        cy.get('button[data-sel-role="openInLive"]', {timeout: 5000}).should('be.visible');
+        cy.apollo({mutation: addContent});
+    });
+
+    it('should open preview with url', () => {
+        const jcontent = JContent.visit('jcontentSite', 'en', 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))');
+        const compareDialog = jcontent.getCompareDialog();
+        compareDialog.get().get('h1').contains('Compare staging vs live version').should('exist');
+        compareDialog.getStagingFrame().should('be.visible');
+        compareDialog.getLiveFrame().should('be.visible');
+    });
+
+    it('should highlight changes staging vs live', () => {
+        const jcontent = JContent.visit('jcontentSite', 'en', 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))');
+        const compareDialog = jcontent.getCompareDialog();
+        compareDialog.get().get('h1').contains('Compare staging vs live version').should('exist');
+        compareDialog.highlightToggle();
+        compareDialog.getStagingFrame().find('span[class="diff-html-added"]').should('exist');
+        compareDialog.highlightToggle();
+        compareDialog.getStagingFrame().find('span[class="diff-html-added"]').should('not.exist');
+    });
+
+    it('should refresh to original state', () => {
+        const jcontent = JContent.visit('jcontentSite', 'en', 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))');
+        const compareDialog = jcontent.getCompareDialog();
+        compareDialog.get().get('h1').contains('Compare staging vs live version').should('exist');
+        compareDialog.highlightToggle();
+        compareDialog.getStagingFrame().find('span[class="diff-html-added"]').should('exist');
+        compareDialog.refresh();
+        compareDialog.getStagingFrame().find('span[class="diff-html-added"]').should('not.exist');
+    });
+
+    afterEach(() => {
+        cy.logout();
+        cy.executeGroovy('jcontent/deleteSite.groovy', {SITEKEY: 'jcontentSite'});
+    });
+});
diff --git a/tests/cypress/e2e/jcontent/preview.cy.ts b/tests/cypress/e2e/jcontent/preview.cy.ts
index 25693b19d..70518d0cd 100644
--- a/tests/cypress/e2e/jcontent/preview.cy.ts
+++ b/tests/cypress/e2e/jcontent/preview.cy.ts
@@ -1,20 +1,6 @@
 import {JContent} from '../../page-object';
-import gql from 'graphql-tag';
 
 describe('JContent preview tests', () => {
-    const addContent = gql`mutation MyMutation {
-  jcr {
-    addNode(
-      name: "addedNode"
-      parentPathOrId: "/sites/jcontentSite/home/area-main"
-      primaryNodeType: "jnt:bigText"
-      properties: { name: "text", language: "en", value: "test added" }
-    ) {
-      uuid
-    }
-  }
-}`;
-
     beforeEach(() => {
         cy.executeGroovy('jcontent/createSite.groovy', {SITEKEY: 'jcontentSite'});
         cy.apollo({mutationFile: 'jcontent/createContent.graphql'});
@@ -42,34 +28,6 @@ describe('JContent preview tests', () => {
                 'test 7');
     });
 
-    it('should open preview with url', () => {
-        JContent.visit('jcontentSite', 'en', 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))');
-        cy.get('h1').contains('Compare staging vs live version').should('exist');
-        cy.get('iframe[data-sel-role="staging-frame"]')
-            .its('0.contentDocument.body')
-            .should('be.visible');
-        cy.get('iframe[data-sel-role="live-frame"]')
-            .its('0.contentDocument.body')
-            .should('be.visible');
-    });
-
-    it('should highlight changes staging vs live', () => {
-        cy.apollo({mutation: addContent});
-        JContent.visit('jcontentSite', 'en', 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))');
-        cy.get('h1').contains('Compare staging vs live version').should('exist');
-        cy.get('button[data-sel-role="highlight"]').should('be.visible').click();
-        cy.get('iframe[data-sel-role="staging-frame"]')
-            .its('0.contentDocument.body')
-            .should('be.visible')
-            .contains('span[class="diff-html-added"]');
-        cy.get('button[data-sel-role="highlight"]').should('be.visible').click();
-        cy.get('iframe[data-sel-role="staging-frame"]')
-            .its('0.contentDocument.body')
-            .should('be.visible')
-            .contains('span[class="diff-html-added"]')
-            .should('not.exist');
-    });
-
     afterEach(() => {
         cy.logout();
         cy.executeGroovy('jcontent/deleteSite.groovy', {SITEKEY: 'jcontentSite'});
diff --git a/tests/cypress/page-object/compareDialog.ts b/tests/cypress/page-object/compareDialog.ts
new file mode 100644
index 000000000..731924515
--- /dev/null
+++ b/tests/cypress/page-object/compareDialog.ts
@@ -0,0 +1,35 @@
+import {BaseComponent, getComponentBySelector} from '@jahia/cypress';
+
+export class CompareDialog extends BaseComponent {
+    static defaultSelector = 'div[data-sel-role="compare-dialog"]';
+
+    getStagingFrame() {
+        return this.get()
+            .get('iframe[data-sel-role="staging-frame"]')
+            .its('0.contentDocument.body').should('not.be.empty')
+            .then(cy.wrap);
+    }
+
+    getLiveFrame() {
+        return this.get()
+            .get('iframe[data-sel-role="live-frame"]')
+            .its('0.contentDocument.body').should('not.be.empty')
+            .then(cy.wrap);
+    }
+
+    highlightToggle() {
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(2000);
+        this.get().get('button[data-sel-role="highlight"]').should('be.visible').click();
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(2000);
+    }
+
+    refresh() {
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(2000);
+        this.get().get('button[data-sel-role="compare-refresh"]').should('be.visible').click();
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(2000);
+    }
+}
diff --git a/tests/cypress/page-object/jcontent.ts b/tests/cypress/page-object/jcontent.ts
index ffb9855f9..914570fba 100644
--- a/tests/cypress/page-object/jcontent.ts
+++ b/tests/cypress/page-object/jcontent.ts
@@ -23,6 +23,7 @@ import {ContentGrid} from './contentGrid';
 import {BreadcrumbPageBuilder} from './breadcrumb';
 import ClickOptions = Cypress.ClickOptions;
 import VisitOptions = Cypress.VisitOptions;
+import {CompareDialog} from "./compareDialog";
 
 export class JContent extends BasePage {
     secondaryNav: SecondaryNav;
@@ -212,6 +213,10 @@ export class JContent extends BasePage {
     clickPublishNow() {
         cy.get('#publishNowButton').should('be.visible').find('button').contains('Publish now').click();
     }
+
+    getCompareDialog(): CompareDialog {
+        return getComponent(CompareDialog);
+    }
 }
 
 export class JContentPageBuilder extends JContent {

From a641d0dfbcd0acebfaeeca3f68b6a63ab1cc55d9 Mon Sep 17 00:00:00 2001
From: akarmanov <alexandrk_@hotmail.com>
Date: Wed, 6 Nov 2024 07:32:14 -0500
Subject: [PATCH 3/8] BACKLOG-23358 Fix lint

---
 tests/cypress/page-object/jcontent.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/cypress/page-object/jcontent.ts b/tests/cypress/page-object/jcontent.ts
index 914570fba..e18104a7c 100644
--- a/tests/cypress/page-object/jcontent.ts
+++ b/tests/cypress/page-object/jcontent.ts
@@ -23,7 +23,7 @@ import {ContentGrid} from './contentGrid';
 import {BreadcrumbPageBuilder} from './breadcrumb';
 import ClickOptions = Cypress.ClickOptions;
 import VisitOptions = Cypress.VisitOptions;
-import {CompareDialog} from "./compareDialog";
+import {CompareDialog} from './compareDialog';
 
 export class JContent extends BasePage {
     secondaryNav: SecondaryNav;

From 0e2ce86c88268a86bc164520730828ca6b53b63e Mon Sep 17 00:00:00 2001
From: akarmanov <alexandrk_@hotmail.com>
Date: Wed, 6 Nov 2024 08:08:38 -0500
Subject: [PATCH 4/8] BACKLOG-23358 Add publication test

---
 .../e2e/jcontent/compareStagingLive.cy.ts      | 18 +++++++++++++++---
 tests/cypress/page-object/compareDialog.ts     |  8 ++++++++
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts b/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts
index 84f768d95..f2de91927 100644
--- a/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts
+++ b/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts
@@ -15,6 +15,8 @@ describe('JContent preview tests', () => {
       }
     }`;
 
+    const path = 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))';
+
     beforeEach(() => {
         cy.executeGroovy('jcontent/createSite.groovy', {SITEKEY: 'jcontentSite'});
         cy.apollo({mutationFile: 'jcontent/createContent.graphql'});
@@ -26,7 +28,7 @@ describe('JContent preview tests', () => {
     });
 
     it('should open preview with url', () => {
-        const jcontent = JContent.visit('jcontentSite', 'en', 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))');
+        const jcontent = JContent.visit('jcontentSite', 'en', path);
         const compareDialog = jcontent.getCompareDialog();
         compareDialog.get().get('h1').contains('Compare staging vs live version').should('exist');
         compareDialog.getStagingFrame().should('be.visible');
@@ -34,7 +36,7 @@ describe('JContent preview tests', () => {
     });
 
     it('should highlight changes staging vs live', () => {
-        const jcontent = JContent.visit('jcontentSite', 'en', 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))');
+        const jcontent = JContent.visit('jcontentSite', 'en', path);
         const compareDialog = jcontent.getCompareDialog();
         compareDialog.get().get('h1').contains('Compare staging vs live version').should('exist');
         compareDialog.highlightToggle();
@@ -44,7 +46,7 @@ describe('JContent preview tests', () => {
     });
 
     it('should refresh to original state', () => {
-        const jcontent = JContent.visit('jcontentSite', 'en', 'pages/home#(jcontent:(compareDialog:(open:!t,path:/sites/jcontentSite/home)))');
+        const jcontent = JContent.visit('jcontentSite', 'en', path);
         const compareDialog = jcontent.getCompareDialog();
         compareDialog.get().get('h1').contains('Compare staging vs live version').should('exist');
         compareDialog.highlightToggle();
@@ -53,6 +55,16 @@ describe('JContent preview tests', () => {
         compareDialog.getStagingFrame().find('span[class="diff-html-added"]').should('not.exist');
     });
 
+    it('should publish', () => {
+        const jcontent = JContent.visit('jcontentSite', 'en', path);
+        const compareDialog = jcontent.getCompareDialog();
+        compareDialog.get().get('h1').contains('Compare staging vs live version').should('exist');
+        compareDialog.getStagingFrame().find('div').contains('test added').should('exist');
+        compareDialog.getLiveFrame().find('div').contains('test added').should('not.exist');
+        compareDialog.publish();
+        compareDialog.getLiveFrame().find('div[class="col-md-12"]').contains('test added', {timeout: 2000}).should('exist');
+    });
+
     afterEach(() => {
         cy.logout();
         cy.executeGroovy('jcontent/deleteSite.groovy', {SITEKEY: 'jcontentSite'});
diff --git a/tests/cypress/page-object/compareDialog.ts b/tests/cypress/page-object/compareDialog.ts
index 731924515..aed1d4eda 100644
--- a/tests/cypress/page-object/compareDialog.ts
+++ b/tests/cypress/page-object/compareDialog.ts
@@ -32,4 +32,12 @@ export class CompareDialog extends BaseComponent {
         // eslint-disable-next-line cypress/no-unnecessary-waiting
         cy.wait(2000);
     }
+
+    publish() {
+        this.get().find('[data-sel-role="publish"]').click();
+        cy.get('#publishNowButton').should('be.visible').find('button').contains('Publish now').click();
+        cy.get('div[id="notistack-snackbar"]', {timeout: 3000}).contains('Publication completed', {timeout: 3000}).should('exist');
+        // eslint-disable-next-line cypress/no-unnecessary-waiting
+        cy.wait(2000);
+    }
 }

From 69bb1d332df975f5ee181b90e58ee959f7eaef02 Mon Sep 17 00:00:00 2001
From: akarmanov <alexandrk_@hotmail.com>
Date: Fri, 8 Nov 2024 07:31:35 -0500
Subject: [PATCH 5/8] BACKLOG-23358 Use api

---
 tests/cypress/e2e/jcontent/compareStagingLive.cy.ts | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts b/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts
index f2de91927..3c2b85a81 100644
--- a/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts
+++ b/tests/cypress/e2e/jcontent/compareStagingLive.cy.ts
@@ -1,5 +1,6 @@
 import {JContent} from '../../page-object';
 import gql from 'graphql-tag';
+import {publishAndWaitJobEnding} from '@jahia/cypress';
 
 describe('JContent preview tests', () => {
     const addContent = gql`mutation MyMutation {
@@ -20,11 +21,9 @@ describe('JContent preview tests', () => {
     beforeEach(() => {
         cy.executeGroovy('jcontent/createSite.groovy', {SITEKEY: 'jcontentSite'});
         cy.apollo({mutationFile: 'jcontent/createContent.graphql'});
-        cy.loginAndStoreSession(); // Edit in chief
-        const jcontent = JContent.visit('jcontentSite', 'en', 'pages/home');
-        jcontent.publishAll();
-        cy.get('button[data-sel-role="openInLive"]', {timeout: 5000}).should('be.visible');
+        publishAndWaitJobEnding('/sites/jcontentSite');
         cy.apollo({mutation: addContent});
+        cy.loginAndStoreSession(); // Edit in chief
     });
 
     it('should open preview with url', () => {

From 53a52ee7675d3fb64c71ca9346618df775bb0f80 Mon Sep 17 00:00:00 2001
From: akarmanov <alexandrk_@hotmail.com>
Date: Fri, 8 Nov 2024 08:26:54 -0500
Subject: [PATCH 6/8] BACKLOG-23358 Increase timeout

---
 tests/cypress/page-object/compareDialog.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/cypress/page-object/compareDialog.ts b/tests/cypress/page-object/compareDialog.ts
index aed1d4eda..4793c5506 100644
--- a/tests/cypress/page-object/compareDialog.ts
+++ b/tests/cypress/page-object/compareDialog.ts
@@ -36,8 +36,8 @@ export class CompareDialog extends BaseComponent {
     publish() {
         this.get().find('[data-sel-role="publish"]').click();
         cy.get('#publishNowButton').should('be.visible').find('button').contains('Publish now').click();
-        cy.get('div[id="notistack-snackbar"]', {timeout: 3000}).contains('Publication completed', {timeout: 3000}).should('exist');
+        cy.get('div[id="notistack-snackbar"]', {timeout: 5000}).contains('Publication completed', {timeout: 5000}).should('exist');
         // eslint-disable-next-line cypress/no-unnecessary-waiting
-        cy.wait(2000);
+        cy.wait(3000);
     }
 }

From 592cbd3448dcda81398632abd07476d802dd6658 Mon Sep 17 00:00:00 2001
From: akarmanov <alexandrk_@hotmail.com>
Date: Fri, 8 Nov 2024 12:21:46 -0500
Subject: [PATCH 7/8] BACKLOG-23358 Set server name for the site

---
 tests/cypress/fixtures/jcontent/createSite.groovy | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/cypress/fixtures/jcontent/createSite.groovy b/tests/cypress/fixtures/jcontent/createSite.groovy
index a5361afbb..7bc125309 100644
--- a/tests/cypress/fixtures/jcontent/createSite.groovy
+++ b/tests/cypress/fixtures/jcontent/createSite.groovy
@@ -10,6 +10,7 @@ if (sitesService.getSiteByKey("SITEKEY") == null) {
             title("SITEKEY").
             templateSet("dx-base-demo-templates").
             modulesToDeploy(new String[]{"event", "bootstrap3-components", "article"}).
+            serverName("jahia").
             locale("en").build())
 }
 

From e82b1455805beb5bb423fa4e520505cecf934116 Mon Sep 17 00:00:00 2001
From: akarmanov <alexandrk_@hotmail.com>
Date: Fri, 8 Nov 2024 12:22:30 -0500
Subject: [PATCH 8/8] BACKLOG-23358 Set jahia server name for the site

---
 tests/cypress/fixtures/jcontent/createSite.groovy | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/cypress/fixtures/jcontent/createSite.groovy b/tests/cypress/fixtures/jcontent/createSite.groovy
index 7bc125309..5912a925b 100644
--- a/tests/cypress/fixtures/jcontent/createSite.groovy
+++ b/tests/cypress/fixtures/jcontent/createSite.groovy
@@ -6,11 +6,10 @@ JahiaSitesService sitesService = JahiaSitesService.getInstance();
 if (sitesService.getSiteByKey("SITEKEY") == null) {
     JahiaSite site = sitesService.addSite(SiteCreationInfo.builder().
             siteKey("SITEKEY").
-            serverName("localhost").
+            serverName("jahia").
             title("SITEKEY").
             templateSet("dx-base-demo-templates").
             modulesToDeploy(new String[]{"event", "bootstrap3-components", "article"}).
-            serverName("jahia").
             locale("en").build())
 }