Merge branch 'feature/FOUR-13174' of https://github.com/ProcessMaker/…

…screen-builder into feature/FOUR-13174
ProcessMaker · Jan 18, 2024 · 2e56109 · 2e56109
2 parents d02246f + b5b0b51
commit 2e56109
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/components/vue-form-builder.vue b/src/components/vue-form-builder.vue
@@ -884,7 +884,7 @@ export default {
       return order;
     },
     setGroupOrder(orderConfig) {
-      this.groupOrder = { ...orderConfig };
+      this.groupOrder = { ...this.groupOrder, ...orderConfig };
     },
     toggleCollapse(index) {
       if (this.collapse[index] && this.collapse[index] === true) {

diff --git a/tests/e2e/specs/DeviceVisivilityInspector.spec.js b/tests/e2e/specs/DeviceVisivilityInspector.spec.js
@@ -53,7 +53,7 @@ describe('Device Visiblility Inspector', () => {
   });
   it('Verify if a FileDownload has device visiblility settings', () => {
     cy.visit('/');
-    cy.openAcordeon("collapse-4");
+    cy.openAcordeon("collapse-5");
     cy.get('[data-cy=controls-FileDownload]').drag('[data-cy=screen-drop-zone]', 'bottom');
     cy.get('[data-cy=screen-element-container]').click();
     cy.get('[data-cy=accordion-Advanced]').click();
@@ -67,7 +67,7 @@ describe('Device Visiblility Inspector', () => {
   });
   it('Verify if a FileUpload has device visiblility settings', () => {
     cy.visit('/');
-    cy.openAcordeon("collapse-4");
+    cy.openAcordeon("collapse-5");
     cy.get('[data-cy=controls-FileUpload]').drag('[data-cy=screen-drop-zone]', 'bottom');
     cy.get('[data-cy=screen-element-container]').click();
     cy.get('[data-cy=accordion-Advanced]').click();