From 5b5b477ed3a26c7eb04c4966802769fe973e1631 Mon Sep 17 00:00:00 2001
From: Simona Domnisoru <simona.domnisoru@gmail.com>
Date: Wed, 20 Nov 2024 10:35:20 +0100
Subject: [PATCH 1/2] fix: [DHIS2-18444] stabilize possible duplicate modal
 cypress test (#3886)

---
 cypress/e2e/NewPage/NewPage.js                            | 8 ++++----
 .../TeiWorkingLists/TeiBulkActions/TeiBulkActions.feature | 6 ++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/cypress/e2e/NewPage/NewPage.js b/cypress/e2e/NewPage/NewPage.js
index 9ef6ab3440..a4a7579656 100644
--- a/cypress/e2e/NewPage/NewPage.js
+++ b/cypress/e2e/NewPage/NewPage.js
@@ -469,14 +469,14 @@ And('you fill the WHO RMNCH program registration form with its required unique v
 });
 
 And('you fill the WHO RMNCH program registration form with its required values', () => {
-    cy.get('[data-test="capture-ui-input"]')
-        .eq(2)
-        .type('Ava');
-
     cy.get('[data-test="capture-ui-input"]')
         .eq(3)
         .type('Didriksson');
 
+    cy.get('[data-test="capture-ui-input"]')
+        .eq(2)
+        .type('Ava');
+
     cy.get('[data-test="capture-ui-input"]')
         .eq(9)
         .type('1985-10-01')
diff --git a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiBulkActions/TeiBulkActions.feature b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiBulkActions/TeiBulkActions.feature
index 06eb0a2fb1..f79f4faf87 100644
--- a/cypress/e2e/WorkingLists/TeiWorkingLists/TeiBulkActions/TeiBulkActions.feature
+++ b/cypress/e2e/WorkingLists/TeiWorkingLists/TeiBulkActions/TeiBulkActions.feature
@@ -51,6 +51,8 @@ Feature: User facing tests for bulk actions on Tracked Entity working lists
     When you confirm 3 active enrollments successfully
     Then the bulk complete enrollments modal should close
 
+#DHIS2-18447
+@skip
   Scenario: the user should be able to bulk complete enrollments without completing events
     Given you open the main page with Ngelehun and Malaria Case diagnosis context
     And you select row number 1
@@ -61,6 +63,8 @@ Feature: User facing tests for bulk actions on Tracked Entity working lists
     When you confirm 1 active enrollment without completing events successfully
     Then the bulk complete enrollments modal should close
 
+#DHIS2-18447
+@skip
   Scenario: the user should be able to bulk delete enrollments
     Given you open the main page with Ngelehun and Malaria Case diagnosis context
     And you select the first 3 rows
@@ -69,6 +73,8 @@ Feature: User facing tests for bulk actions on Tracked Entity working lists
     When you confirm deleting 3 enrollments
     Then the bulk delete enrollments modal should close
 
+#DHIS2-18447
+@skip
   Scenario: the user should be able to bulk delete only active enrollments
     Given you open the main page with Ngelehun and Malaria Case diagnosis context
     And you select the first 3 rows

From f7bed5249c2a1e43964da918121b1533c4dce651 Mon Sep 17 00:00:00 2001
From: "@dhis2-bot" <apps@dhis2.org>
Date: Wed, 20 Nov 2024 09:39:39 +0000
Subject: [PATCH 2/2] chore(release): cut 101.16.3 [skip release]

## [101.16.3](https://github.com/dhis2/capture-app/compare/v101.16.2...v101.16.3) (2024-11-20)

### Bug Fixes

* [DHIS2-18444] stabilize possible duplicate modal cypress test ([#3886](https://github.com/dhis2/capture-app/issues/3886)) ([5b5b477](https://github.com/dhis2/capture-app/commit/5b5b477ed3a26c7eb04c4966802769fe973e1631))
---
 CHANGELOG.md                       | 7 +++++++
 package.json                       | 4 ++--
 packages/rules-engine/package.json | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb83bc17af..6d288debbb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [101.16.3](https://github.com/dhis2/capture-app/compare/v101.16.2...v101.16.3) (2024-11-20)
+
+
+### Bug Fixes
+
+* [DHIS2-18444] stabilize possible duplicate modal cypress test ([#3886](https://github.com/dhis2/capture-app/issues/3886)) ([5b5b477](https://github.com/dhis2/capture-app/commit/5b5b477ed3a26c7eb04c4966802769fe973e1631))
+
 ## [101.16.2](https://github.com/dhis2/capture-app/compare/v101.16.1...v101.16.2) (2024-11-19)
 
 
diff --git a/package.json b/package.json
index 3af3dfcf5c..ddb1f4697e 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "capture-app",
     "homepage": ".",
-    "version": "101.16.2",
+    "version": "101.16.3",
     "cacheVersion": "7",
     "serverVersion": "38",
     "license": "BSD-3-Clause",
@@ -10,7 +10,7 @@
         "packages/rules-engine"
     ],
     "dependencies": {
-        "@dhis2/rules-engine-javascript": "101.16.2",
+        "@dhis2/rules-engine-javascript": "101.16.3",
         "@dhis2/app-runtime": "^3.9.3",
         "@dhis2/d2-i18n": "^1.1.0",
         "@dhis2/d2-icons": "^1.0.1",
diff --git a/packages/rules-engine/package.json b/packages/rules-engine/package.json
index f2b60b8805..245c8abb46 100644
--- a/packages/rules-engine/package.json
+++ b/packages/rules-engine/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@dhis2/rules-engine-javascript",
-    "version": "101.16.2",
+    "version": "101.16.3",
     "license": "BSD-3-Clause",
     "main": "./build/cjs/index.js",
     "scripts": {