@sapui5/sap.fe.test 1.142.2 → 1.144.0

package/src/sap/fe/test/api/APIHelper.js

@@ -47,28 +47,45 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 		createMenuAndListActionMatcher: function (vAction, bReturnAction) {
 			var vActionMatcher;
 			if (Utils.isOfType(vAction, String)) {
-				vAction = { text: vAction };
+				vAction = { text: vAction, title: vAction };
 			}
-			if (Utils.isOfType(vAction, Object)) {
-				if (vAction.visible === false) {
-					var mStatesWOVisible = Object.assign(vAction);
-					delete mStatesWOVisible.visible;
-					vActionMatcher = OpaBuilder.Matchers.some(
-						// either button is visible=false ...
-						OpaBuilder.Matchers.aggregationMatcher("items", FEBuilder.Matchers.states(vAction)),
-						// ... or it wasn't rendered at all (no match in the aggregation)
-						OpaBuilder.Matchers.not(
-							OpaBuilder.Matchers.aggregationMatcher("items", FEBuilder.Matchers.states(mStatesWOVisible))
-						)
-					);
-				} else {
-					vActionMatcher = bReturnAction
-						? [OpaBuilder.Matchers.aggregation("items", FEBuilder.Matchers.states(vAction)), FEBuilder.Matchers.atIndex(0)]
-						: OpaBuilder.Matchers.aggregationMatcher("items", FEBuilder.Matchers.states(vAction));
-				}
-			} else {
+			if (!Utils.isOfType(vAction, Object)) {
 				throw new Error("vAction parameter must be a string or object");
 			}
+			if (vAction.text && !vAction.title) {
+				vAction = Object.assign({}, vAction, { title: vAction.text });
+			}
+
+			var mText = Object.assign({}, vAction);
+			var mTitle = Object.assign({}, vAction);
+
+			delete mText.title;
+			delete mTitle.text;
+
+			var itemStateMatcher = OpaBuilder.Matchers.some(FEBuilder.Matchers.states(mText), FEBuilder.Matchers.states(mTitle));
+
+			if (vAction.visible === false) {
+				var mTextNoVis = Object.assign({}, mText);
+				delete mTextNoVis.visible;
+
+				var mTitleNoVis = Object.assign({}, mTitle);
+				delete mTitleNoVis.visible;
+
+				var itemStateMatcherNoVis = OpaBuilder.Matchers.some(
+					FEBuilder.Matchers.states(mTextNoVis),
+					FEBuilder.Matchers.states(mTitleNoVis)
+				);
+				vActionMatcher = OpaBuilder.Matchers.some(
+					// either it is visible=false...
+					OpaBuilder.Matchers.aggregationMatcher("items", itemStateMatcher),
+					// ...or it wasn't rendered at all
+					OpaBuilder.Matchers.not(OpaBuilder.Matchers.aggregationMatcher("items", itemStateMatcherNoVis))
+				);
+			} else {
+				vActionMatcher = bReturnAction
+					? [OpaBuilder.Matchers.aggregation("items", itemStateMatcher), FEBuilder.Matchers.atIndex(0)]
+					: OpaBuilder.Matchers.aggregationMatcher("items", itemStateMatcher);
+			}
 			return vActionMatcher;
 		},
 
@@ -103,11 +120,11 @@ sap.ui.define(["sap/fe/test/Utils", "sap/ui/test/OpaBuilder", "sap/fe/test/build
 			}
 
 			return FEBuilder.create()
-				.hasType("sap.m.SelectList")
+				.hasType("sap.m.List")
 				.isDialogElement(true)
 				.has(APIHelper.createMenuAndListActionMatcher(vAction, true))
 				.doPress()
-				.description(Utils.formatMessage("Executing action '{0}' from currently open selection list", vAction));
+				.description(Utils.formatMessage("Executing action '{0}' from currently open list", vAction));
 		}
 	};
 

package/src/sap/fe/test/api/BaseAPI.js

@@ -117,7 +117,7 @@ sap.ui.define(
 
 		/**
 		 * Gets a new builder instance based on the given one.
-		 * @returns {sap.ui.test.OpaBuilder} An OpaBuilder instance
+		 * @returns {module:sap/ui/test/OpaBuilder} An OpaBuilder instance
 		 * @public
 		 * @ui5-restricted
 		 */

package/src/sap/fe/test/api/TableAPI.js

@@ -255,7 +255,7 @@ sap.ui.define(
 		 * </pre></code>
 		 * @param {Function|Array|sap.ui.test.actions.Action} [vActions] The actions to be executed on found field
 		 * @param {string} sDescription The description of the check or adaptation
-		 * @param {sap.ui.test.OpaBuilder} oDialogBuilder The dialog builder
+		 * @param {module:sap/ui/test/OpaBuilder} oDialogBuilder The dialog builder
 		 * @param {Function} fnOpenDialog A callback for opening the dialog
 		 * @param {Function} fnCloseDialog A callback for closing the dialog
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements
@@ -344,7 +344,7 @@ sap.ui.define(
 		 * </pre></code>
 		 * @param {Function|Array|sap.ui.test.actions.Action} [vActions] The actions to be executed on found field
 		 * @param {string} sDescription The description of the check or adaptation
-		 * @param {sap.ui.test.OpaBuilder} oDialogBuilder The dialog builder
+		 * @param {module:sap/ui/test/OpaBuilder} oDialogBuilder The dialog builder
 		 * @param {Function} fnOpenDialog A callback for opening the dialog
 		 * @param {Function} fnCloseDialog A callback for closing the dialog
 		 * @returns {object} The result of the {@link sap.ui.test.Opa5#waitFor} function, to be used for chained statements

package/src/sap/fe/test/builder/FEBuilder.js

@@ -117,7 +117,7 @@ sap.ui.define(
 					 * Remark: Currently there is no official API to retrieve this button; an alternative way to achieve the same
 					 * result might be to check oMenuButton.getButtonMode() === "Split" && oMenuButton.getUseDefaultActionOnly()
 					 * first, and then call oMenuButton.fireDefaultAction(), but the interface parameter vContentAction expects
-					 * a sap.m.button nonetheless. Hence, we currently use the internal aggregation names as a workaround.
+					 * a sap.m.Button nonetheless. Hence, we currently use the internal aggregation names as a workaround.
 					 */
 					return oMenuButton.getAggregation("_button")
 						? oMenuButton.getAggregation("_button").getAggregation("_textButton")

package/src/sap/fe/test/builder/MdcTableBuilder.js

@@ -709,7 +709,7 @@ sap.ui.define(
 					 * Remark: Currently there is no official API to retrieve this button; an alternative way to achieve the same
 					 * result might be to check oMenuButton.getButtonMode() === "Split" && oMenuButton.getUseDefaultActionOnly()
 					 * first, and then call oMenuButton.fireDefaultAction(), but the interface parameter vAction expects
-					 * a sap.m.button nonetheless. Hence, we currently use the internal aggregation names as a workaround.
+					 * a sap.m.Button nonetheless. Hence, we currently use the internal aggregation names as a workaround.
 					 */
 					return oMenuButton.getAggregation("_button")
 						? oMenuButton.getAggregation("_button").getAggregation("_textButton")

package/src/sap/fe/test/builder/OverflowToolbarBuilder.js

@@ -80,7 +80,7 @@ sap.ui.define(
 					 * Remark: Currently there is no official API to retrieve this button; an alternative way to achieve the same
 					 * result might be to check oMenuButton.getButtonMode() === "Split" && oMenuButton.getUseDefaultActionOnly()
 					 * first, and then call oMenuButton.fireDefaultAction(), but the interface parameter vContentAction expects
-					 * a sap.m.button nonetheless. Hence, we currently use the internal aggregation names as a workaround.
+					 * a sap.m.Button nonetheless. Hence, we currently use the internal aggregation names as a workaround.
 					 */
 					return oMenuButton.getAggregation("_button")
 						? oMenuButton.getAggregation("_button").getAggregation("_textButton")

package/src/sap/fe/test/internal/FEArrangements.js

@@ -29,46 +29,6 @@ sap.ui.define(
 					)
 				);
 			},
-
-			iResetTestData: function (bIgnoreRedeploy) {
-				var that = this,
-					oUriParams = new URLSearchParams(window.location.search),
-					sBackendUrl = oUriParams.get("useBackendUrl"),
-					sProxyPrefix = sBackendUrl ? "/databinding/proxy/" + sBackendUrl.replace("://", "/") : "",
-					bSuccess = false;
-				var sTenantID = "";
-				if (window.__karma__ && window.__karma__.config && window.__karma__.config.ui5) {
-					sTenantID = window.__karma__.config.ui5.shardIndex;
-				} else {
-					sTenantID = window.location.href.includes("sap-client")
-						? new URL(window.location.href).searchParams.get("sap-client")
-						: "default";
-				}
-
-				return OpaBuilder.create(this)
-					.success(function () {
-						var oResetData = that.resetTestData(),
-							oRedeploy = bIgnoreRedeploy ? Promise.resolve() : jQuery.post(sProxyPrefix + "/redeploy?tenant=" + sTenantID);
-
-						Promise.all([oResetData, oRedeploy])
-							.finally(function () {
-								bSuccess = true;
-							})
-							.catch(function (oError) {
-								throw oError;
-							});
-
-						return OpaBuilder.create(this)
-							.timeout(60) // allow some time (redeployment on the Java stack is slow)
-							.check(function () {
-								return bSuccess;
-							})
-							.execute();
-					})
-					.description(Utils.formatMessage("Reset test data on tenant '{0}'", sTenantID))
-					.execute();
-			},
-
 			/**
 			 * Fail the test if there are errors logged to the browser console.
 			 * @param {Array<RegExp|string>} [aErrors] The allowed error messages. Either use regular expressions or strings. Pass undefined or an empty array to reject all error messages.

package/src/sap/fe/test/library.js

@@ -22,7 +22,7 @@ sap.ui.define(["sap/ui/core/Lib", "sap/ui/core/library"], function (Library, _li
     controls: [],
     elements: [],
     // eslint-disable-next-line no-template-curly-in-string
-    version: "1.142.2",
+    version: "1.144.0",
     noLibraryCSS: true
   });
   return thisLib;