@openui5/sap.ui.core 1.128.0 → 1.130.0

package/src/sap/ui/qunit/utils/ControlIterator.js

@@ -53,7 +53,7 @@ sap.ui.define(['sap/ui/core/Core', "sap/ui/VersionInfo", "sap/ui/core/Lib"],
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/qunit/utils/MemoryLeakCheck.js

@@ -30,7 +30,7 @@ sap.ui.define([ 'sap/ui/core/ElementRegistry', 'sap/ui/core/Control', "sap/ui/qu
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 *
 	 * @public
 	 * @since 1.48.0

package/src/sap/ui/test/TestUtils.js

@@ -313,12 +313,12 @@ sap.ui.define([
 		 * The function uses <a href="http://sinonjs.org/docs/">Sinon.js</a> and expects that it
 		 * has been loaded.
 		 *
-		 * POST requests ending on "/$batch" are handled automatically. They are expected to be
-		 * multipart-mime requests where each part is a DELETE, GET, PATCH, MERGE, or POST request.
-		 * The response has a multipart-mime message containing responses to these inner requests.
-		 * If an inner request is not a DELETE, a MERGE, a PATCH, or a POST, and it is not found in
-		 * the fixture, or its message is not JSON, it is responded with an error code.
-		 * The batch itself is always responded with code 200.
+		 * POST requests ending on "/$batch" are handled automatically, unless a matching fixture is
+		 * given. They are expected to be multipart-mime requests where each part is a DELETE, GET,
+		 * PATCH, MERGE, or POST request. The response has a multipart-mime message containing
+		 * responses to these inner requests. If an inner request is not a DELETE, a MERGE, a PATCH,
+		 * or a POST, and it is not found in the fixture, or its message is not JSON, it is
+		 * responded with an error code. The batch itself is always responded with code 200.
 		 *
 		 * "$batch" requests with an OData change set are supported, too. For each request in the
 		 * change set a response is searched in the fixture. As long as all responses are success
@@ -378,6 +378,7 @@ sap.ui.define([
 		 *   PATCH, or POST. A missing URL is ignored.
 		 * @param {boolean} [bStrict]
 		 *   Whether responses are created from the given fixture only, without defaults per method.
+		 *   It does not prevent the automatic handling of <code>$batch</code>.
 		 * @returns {object}
 		 *   The SinonJS fake server instance
 		 *
@@ -401,7 +402,7 @@ sap.ui.define([
 					mODataHeaders = getODataHeaders(oRequest);
 
 				if (fnOnRequest) {
-					fnOnRequest(oRequest.requestBody);
+					fnOnRequest(oRequest.requestBody, oRequest.method + " " + oRequest.url);
 				}
 
 				oRequest.respond(200,
@@ -477,16 +478,26 @@ sap.ui.define([
 				return "application/x-octet-stream";
 			}
 
-			// Logs and returns a response for the given error
-			function error(iCode, oRequest, sMessage) {
-				Log.error(oRequest.requestLine
-					|| oRequest.method + " " + TestUtils.makeUrlReadable(oRequest.url), sMessage,
+			/*
+			 * Logs and returns a response for the given error.
+			 * @param {number} iCode - The response code
+			 * @param {object} oRequest - The request object
+			 * @param {string|Error} vMessage - The error
+			 * @returns {object} The reponse object
+			 */
+			function error(iCode, oRequest, vMessage) {
+				Log.error(oRequest.method + " " + TestUtils.makeUrlReadable(oRequest.url), vMessage,
 					"sap.ui.test.TestUtils");
 
 				return {
 					code : iCode,
-					headers : {"Content-Type" : "text/plain"},
-					message : sMessage
+					headers : {"Content-Type" : sJson},
+					message : JSON.stringify({
+						error : {
+							code : "TestUtils",
+							message : vMessage instanceof Error ? vMessage.message : vMessage
+						}
+					})
 				};
 			}
 
@@ -602,12 +613,16 @@ sap.ui.define([
 
 			/*
 			 * Determines the matching response for the request. Returns an error response if no
-			 * match was found.
+			 * match was found, unless <code>bTry</code> was given.
 			 *
 			 * @param {object} oRequest The Sinon request object
 			 * @param {string} [sContentId] The content ID
+			 * @param {boolean} [bTry]
+			 *   Whether to do nothing and return <code>undefined</code> if no fixture matches; also
+			 *   prevents defaulting for non-GET requests
+			 * @returns {object|undefined} The response object or <code>undefined</code>
 			 */
-			function getResponseFromFixture(oRequest, sContentId) {
+			function getResponseFromFixture(oRequest, sContentId, bTry) {
 				var iAlternative,
 					oMatch = getMatchingResponse(oRequest.method, oRequest.url),
 					oResponse,
@@ -626,13 +641,13 @@ sap.ui.define([
 						try {
 							oResponse.buildResponse(oMatch.match, oResponse, oRequest);
 						} catch (oError) {
-							oResponse = error(500, oRequest, oError.stack);
+							oResponse = error(500, oRequest, oError);
 						}
 					}
 					if (oMatch.responses.length > 1) {
 						iAlternative = oMatch.responses.indexOf(oResponse);
 					}
-				} else if (!bStrict) {
+				} else if (!bStrict && !bTry) {
 					switch (oRequest.method) {
 						case "HEAD":
 							oResponse = {code : 200};
@@ -662,6 +677,8 @@ sap.ui.define([
 						// Note: JSON.stringify(oRequest.requestHeaders) outputs too much for now
 						'{"If-Match":' + JSON.stringify(oRequest.requestHeaders["If-Match"]) + "}",
 						"sap.ui.test.TestUtils");
+				} else if (bTry) {
+					return undefined;
 				} else {
 					oResponse = error(404, oRequest, "No mock data found");
 				}
@@ -738,7 +755,9 @@ sap.ui.define([
 				var sUrl = oRequest.url;
 
 				if (rBatch.test(sUrl)) {
-					batch(sUrl.slice(0, sUrl.indexOf("/$batch") + 1), oRequest);
+					if (!respondFromFixture(oRequest, true)) {
+						batch(sUrl.slice(0, sUrl.indexOf("/$batch") + 1), oRequest);
+					}
 				} else {
 					respondFromFixture(oRequest);
 				}
@@ -771,14 +790,21 @@ sap.ui.define([
 			 * Searches the response in the fixture and responds.
 			 *
 			 * @param {object} oRequest The Sinon request object
+			 * @param {boolean} [bTry]
+			 *   Whether to do nothing and return <code>false</code> if no fixture matches
+			 * @returns {boolean} Whether the request was processed
 			 */
-			function respondFromFixture(oRequest) {
-				var oResponse = getResponseFromFixture(oRequest);
+			function respondFromFixture(oRequest, bTry) {
+				var oResponse = getResponseFromFixture(oRequest, undefined, bTry);
 
+				if (!oResponse) {
+					return false;
+				}
 				if (fnOnRequest) {
-					fnOnRequest(oRequest.requestBody);
+					fnOnRequest(oRequest.requestBody, oRequest.method + " " + oRequest.url);
 				}
 				oRequest.respond(oResponse.code, oResponse.headers, oResponse.message);
+				return true;
 			}
 
 			function setupServer() {
@@ -961,12 +987,13 @@ sap.ui.define([
 		},
 
 		/**
-		 * Sets a callback function which is called when the fake server responds with a fake
-		 * request. The function will be called with the request body as first parameter.
+		 * Sets a listener function which is called when the fake server responds. The function will
+		 * be called with the request body as first parameter and the request HTTP verb plus request
+		 * URL as second parameter e.g. "GET /foo/bar".
 		 *
 		 * Pass <code>null</code> to remove the listener.
 		 *
-		 * @param {function(string)} [fnCallback] - The function
+		 * @param {function(string, string)} [fnCallback] - The listener function
 		 *
 		 * @ui5-restricted sap.ui.model.odata.v4
 		 */

package/src/sap/ui/test/generic/TestBase.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.base.Object
 	 * @abstract
 	 * @author SAP SE
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @since 1.100
 	 */
 	return BaseObject.extend("sap.ui.test.generic.TestBase", {

package/src/sap/ui/test/gherkin/opa5TestHarness.js

@@ -11,6 +11,7 @@
 sap.ui.define([
 	"sap/base/Log",
 	"sap/base/util/ObjectPath",
+	"sap/base/future",
 	"sap/ui/test/opaQunit",
 	"sap/ui/test/Opa5",
 	"sap/ui/test/gherkin/GherkinTestGenerator",
@@ -20,7 +21,7 @@ sap.ui.define([
 	"sap/ui/test/launchers/iFrameLauncher",
 	"sap/ui/qunit/qunit-junit",
 	"sap/ui/qunit/qunit-coverage"
-], function(Log, ObjectPath, opaTest, Opa5, GherkinTestGenerator, dataTableUtils, StepDefinitions, componentLauncher,
+], function(Log, ObjectPath, future, opaTest, Opa5, GherkinTestGenerator, dataTableUtils, StepDefinitions, componentLauncher,
 	iFrameLauncher) {
 	"use strict";
 
@@ -79,7 +80,10 @@ sap.ui.define([
 				};
 			} else {
 				func = function(Given, When, Then) {
-					Log.info("[GHERKIN] Generated Step (eval): " + sToEval);
+					future.errorThrows("[GHERKIN]: Deprecated Step Generation method (eval) detected! Replace the following with an OPA5 page object call: " + sToEval);
+					/**
+					 * @deprecated
+					 */
 					eval(sToEval);
 				};
 			}

package/src/sap/ui/util/Storage.js

@@ -277,7 +277,7 @@ sap.ui.define(["sap/base/assert"], function (assert) {
 	 *
 	 * @enum {string}
 	 * @public
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 */
 	Storage.Type = {
 		/**

package/src/sap/ui/util/_enforceNoReturnValue.js

@@ -21,7 +21,7 @@ sap.ui.define([
 				});
 			}
 			// for any return value other than 'undefined'
-			future.fatalThrows(`The registered Event Listener ${sFunctionName}must not have a return value.`, mLogInfo.component);
+			future.fatalThrows(`${mLogInfo.component}: The registered Event Listener ${sFunctionName}must not have a return value.`);
 		}
 	}
 	return _enforceNoReturnValue;

package/src/ui5loader.js

@@ -2680,7 +2680,7 @@
 	/**
 	 * Root namespace for JavaScript functionality provided by SAP SE.
 	 *
-	 * @version 1.128.0
+	 * @version 1.130.0
 	 * @namespace
 	 * @public
 	 * @name sap