FOUR-12447 Fixed merge conflicts

ProcessMaker · Dec 22, 2023 · 81fc240 · 81fc240
1 parent db96447
commit 81fc240
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 39 deletions.
diff --git a/tests/e2e/specs/Loop.spec.js b/tests/e2e/specs/Loop.spec.js
@@ -1,13 +1,7 @@
-<<<<<<< HEAD
 describe("Loop control", () => {
   it("Input inside loop", () => {
     cy.visit("/");
-=======
-describe('Loop control', () => {
-  it('Input inside loop', () => {
-    cy.visit('/');
     cy.openAcordeon("collapse-2");
->>>>>>> origin/next
     // Add loop control
     cy.get("[data-cy=controls-FormLoop]").drag("[data-cy=screen-drop-zone]", {
       position: "bottom"
@@ -19,7 +13,7 @@ describe('Loop control', () => {
 
     // Add input to loop
     cy.openAcordeon("collapse-1");
-    cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-element-container] .column-draggable div', {position: 'bottom'});
+    cy.get("[data-cy=controls-FormInput]").drag("[data-cy=screen-element-container] .column-draggable div", { position: "bottom" });
 
     // Preview
     cy.get("[data-cy=mode-preview]").click();
@@ -57,8 +51,8 @@ describe('Loop control', () => {
     });
   });
 
-  it('Verify validation on visible fields', () => {
-    cy.visit('/');
+  it("Verify validation on visible fields", () => {
+    cy.visit("/");
     cy.openAcordeon("collapse-2");
     // Add loop control
     cy.get("[data-cy=controls-FormLoop]").drag("[data-cy=screen-drop-zone]", {
@@ -70,8 +64,8 @@ describe('Loop control', () => {
 
     // Add input to loop
     cy.openAcordeon("collapse-1");
-    cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-element-container] .column-draggable div', {position: 'bottom'});
-    cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-element-container] .column-draggable div', {position: 'bottom'});
+    cy.get("[data-cy=controls-FormInput]").drag("[data-cy=screen-element-container] .column-draggable div", { position: "bottom" });
+    cy.get("[data-cy=controls-FormInput]").drag("[data-cy=screen-element-container] .column-draggable div", { position: "bottom" });
 
     // Configure Validation rule
     cy.get("[data-cy=screen-element-container]").click();
@@ -132,10 +126,12 @@ describe('Loop control', () => {
 
     // Add loop control
     cy.openAcordeon("collapse-2");
-    cy.get('[data-cy=controls-FormLoop]').drag('[data-cy=screen-drop-zone]', {position: 'bottom'});
-    cy.get('[data-cy=screen-element-container]').click();
-    cy.get('[data-cy=inspector-name]');
-    cy.get('[data-cy=inspector-source]').select('existing');
+    cy.get("[data-cy=controls-FormLoop]").drag("[data-cy=screen-drop-zone]", {
+      position: "bottom"
+    });
+    cy.get("[data-cy=screen-element-container]").click();
+    cy.get("[data-cy=inspector-name]");
+    cy.get("[data-cy=inspector-source]").select("existing");
 
     // Add multicolumn to loop
     cy.get("[data-cy=controls-FormMultiColumn]").drag("[data-cy=screen-element-container] .column-draggable div", { position: "bottom" });
@@ -147,7 +143,7 @@ describe('Loop control', () => {
 
     // Add input to multicolumn
     cy.openAcordeon("collapse-1");
-    cy.get('[data-cy=controls-FormInput]').drag('.mb-1 > :nth-child(1) > .row > :nth-child(1)', {position: 'bottom'});
+    cy.get("[data-cy=controls-FormInput]").drag(".mb-1 > :nth-child(1) > .row > :nth-child(1)", { position: "bottom" });
 
     // Configure Validation rule
     cy.get("#form_input_1 > .m-2").click();
@@ -190,10 +186,12 @@ describe('Loop control', () => {
 
     // Add loop contro
     cy.openAcordeon("collapse-2");
-    cy.get('[data-cy=controls-FormLoop]').drag('[data-cy=screen-drop-zone]', {position: 'bottom'});
-    cy.get('[data-cy=screen-element-container]').click();
-    cy.get('[data-cy=inspector-name]');
-    cy.get('[data-cy=inspector-source]').select('existing');
+    cy.get("[data-cy=controls-FormLoop]").drag("[data-cy=screen-drop-zone]", {
+      position: "bottom"
+    });
+    cy.get("[data-cy=screen-element-container]").click();
+    cy.get("[data-cy=inspector-name]");
+    cy.get("[data-cy=inspector-source]").select("existing");
 
     // Add loop to loop
     cy.get("[data-cy=controls-FormLoop]").drag("[data-cy=screen-element-container] .column-draggable div", { position: "bottom" });
@@ -206,7 +204,7 @@ describe('Loop control', () => {
 
     // Add input to nested loop
     cy.openAcordeon("collapse-1");
-    cy.get('[data-cy=controls-FormInput]').drag('.m-2 > .column-draggable > div', {position: 'bottom'});
+    cy.get("[data-cy=controls-FormInput]").drag(".m-2 > .column-draggable > div", { position: "bottom" });
 
     // Configure Input Validation rule
     cy.get("#form_input_1 > .m-2").click();
@@ -290,7 +288,7 @@ describe('Loop control', () => {
     cy.visit("/");
     cy.showValidationOnLoad();
     let alert = false;
-    cy.on('window:alert', msg => alert = msg);
+    cy.on("window:alert", (msg) => (alert = msg));
     cy.openAcordeon("collapse-2");
 
     // Add loop control
@@ -312,7 +310,7 @@ describe('Loop control', () => {
 
     // Add submit button
     cy.openAcordeon("collapse-1");
-    cy.get('[data-cy=controls-FormButton]').contains('Submit Button').drag('[data-cy=screen-element-container]', {position: 'bottom'});
+    cy.get("[data-cy=controls-FormButton]").contains("Submit Button").drag("[data-cy=screen-element-container]", { position: "bottom" });
 
     // Set preview data
     cy.setPreviewDataInput('{"loop_1":[{"name": "bar"}, {"name": "foo"}]}');

diff --git a/tests/e2e/specs/Pagination.spec.js b/tests/e2e/specs/Pagination.spec.js
@@ -55,8 +55,9 @@ const data = {
 };
 
 beforeEach(() => {
-<<<<<<< HEAD
   cy.visit("/");
+  cy.openAcordeon("collapse-2");
+  cy.openAcordeon("collapse-1");
   cy.get("[data-cy=controls-FormRecordList]").drag("[data-cy=screen-drop-zone]", { position: "bottom" });
   cy.get("[data-cy=toolbar-add]").click({ force: true });
   cy.get("[data-cy=add-page-name]").type("page2");
@@ -69,21 +70,6 @@ beforeEach(() => {
   cy.get("[data-cy=accordion-Configuration]").click();
   cy.get(".form-check-label").click();
   cy.get("div.multiselect").click();
-=======
-  cy.visit('/');
-  cy.openAcordeon("collapse-2");
-  cy.openAcordeon("collapse-1");
-  cy.get('[data-cy=controls-FormRecordList]').drag('[data-cy=screen-drop-zone]', 'bottom');
-  cy.get('[data-cy=toolbar-add]').click({force: true});
-  cy.get('[data-cy=add-page-name]').type('page2');
-  cy.get('#addPageModal___BV_modal_footer_ > .btn-secondary').click();
-  cy.get('[data-cy=controls-FormInput]').drag('[data-cy=screen-drop-zone]', 'bottom');
-  cy.get('[data-cy=toolbar-page]').select('0');
-  cy.get('[data-cy=screen-element-container]').click();
-  cy.get('[data-cy=accordion-Configuration]').click();
-  cy.get('.form-check-label').click();
-  cy.get('div.multiselect').click();
->>>>>>> origin/next
   cy.get('.multiselect__element > .multiselect__option span:contains("page2")').click();
   cy.get('button:contains("Columns")').click();
   cy.get(".col-2 > .fas").click();