@openui5/sap.ui.core 1.100.0 → 1.101.0

package/src/sap/ui/model/odata/v4/lib/_Requestor.js

@@ -25,6 +25,20 @@ sap.ui.define([
 		rSystemQueryOptionWithPlaceholder = /(\$\w+)=~/g,
 		rTimeout = /^\d+$/;
 
+	/**
+	 * Clones the given headers and deletes the X-CSRF-Token within the returned cloned headers.
+	 *
+	 * @param {object} mHeaders The headers to be cloned
+	 * @returns {object} The cloned headers w/o X-CSRF-Token header
+	 */
+	function getHeadersWithoutCSRFToken(mHeaders) {
+		var oClone = Object.assign({}, mHeaders);
+
+		delete oClone["X-CSRF-Token"];
+
+		return oClone;
+	}
+
 	/**
 	 * The getResponseHeader() method imitates the jqXHR.getResponseHeader() method for a $batch
 	 * error response.
@@ -85,7 +99,7 @@ sap.ui.define([
 	 */
 	function _Requestor(sServiceUrl, mHeaders, mQueryParams, oModelInterface) {
 		this.mBatchQueue = {};
-		this.bFirstBatchSent = false;
+		this.bBatchSent = false;
 		this.mHeaders = mHeaders || {};
 		this.aLockedGroupLocks = [];
 		this.oModelInterface = oModelInterface;
@@ -872,17 +886,6 @@ sap.ui.define([
 		return this.oModelInterface;
 	};
 
-	/**
-	 * Returns <code>true</code> if the first $batch request was already sent.
-	 *
-	 * @returns {boolean} Whether the first $batch was already sent
-	 *
-	 * @public
-	 */
-	_Requestor.prototype.isFirstBatchSent = function () {
-		return this.bFirstBatchSent;
-	};
-
 	/**
 	 * Get the batch queue for the given group or create it if it does not exist yet.
 	 *
@@ -987,6 +990,24 @@ sap.ui.define([
 		return this.sServiceUrl;
 	};
 
+	/**
+	 * Returns an unlocked copy of the given group lock if the corresponding group ID has submit
+	 * mode "Auto" (or "Direct"); else returns a new group lock for "$auto" with the same owner.
+	 *
+	 * @param {sap.ui.model.odata.v4.lib._GroupLock} oGroupLock - The original
+	 * @returns {sap.ui.model.odata.v4.lib._GroupLock}
+	 *   An unlocked copy w/ submit mode "Auto", see above
+	 *
+	 * @public
+	 */
+	_Requestor.prototype.getUnlockedAutoCopy = function (oGroupLock) {
+		if (this.getGroupSubmitMode(oGroupLock.getGroupId()) !== "API") {
+			return oGroupLock.getUnlockedCopy();
+		}
+
+		return this.lockGroup("$auto", oGroupLock.getOwner());
+	};
+
 	/**
 	 * Tells whether there are changes (that is, updates via PATCH or bound actions via POST) for
 	 * the given group ID and given entity.
@@ -1068,6 +1089,17 @@ sap.ui.define([
 		return false;
 	};
 
+	/**
+	 * Returns <code>true</code> if a non-optimistic batch request was already sent.
+	 *
+	 * @returns {boolean} Whether a non-optimistic batch was already sent
+	 *
+	 * @public
+	 */
+	_Requestor.prototype.isBatchSent = function () {
+		return this.bBatchSent;
+	};
+
 	/**
 	 * Tells whether change sets are optional. For OData V4, this is true.
 	 *
@@ -1237,7 +1269,6 @@ sap.ui.define([
 			});
 		}
 
-		this.bFirstBatchSent = true;
 		delete this.mBatchQueue[sGroupId];
 		onSubmit(aRequests);
 		bHasChanges = this.cleanUpChangeSets(aRequests);
@@ -1245,6 +1276,7 @@ sap.ui.define([
 			return Promise.resolve();
 		}
 
+		this.bBatchSent = true;
 		aRequests = this.mergeGetRequests(aRequests);
 		this.batchRequestSent(sGroupId, aRequests, bHasChanges);
 		return this.sendBatch(aRequests, sGroupId)
@@ -1317,25 +1349,25 @@ sap.ui.define([
 	/**
 	 * This function has two tasks:
 	 *   <ul>
-	 *     <li>We are in the 1st app start, no optimistic batch payload stored so far. If no
-	 *       optimistic batch was already sent and if optimistic batch handling is enabled via
+	 *     <li>We are in the 1st app start, no optimistic batch payload stored so far. If optimistic
+	 *       batch handling is enabled via
 	*        {@link sap.ui.model.odata.v4.ODataModel#setOptimisticBatchEnabler}, this function
 	 *       stores the current batch requests in cache.
-	 *     <li>If an optimistic batch was already sent, it returns its result.
+	 *     <li>If an optimistic batch was already sent, it returns its result promise.
 	 *   </ul>
 	 *
-	 * @param {object[]} aRequests The current batch GET requests
+	 * @param {object[]} aRequests The requests of the current batch
 	 * @param {string} sGroupId The group ID
 	 * @returns {Promise|undefined}
-	 *   The optimistic batch result or <code>undefined</code> if the $batch should be sent
+	 *   The optimistic batch result or <code>undefined</code> if the batch should be sent
 	 *   normally. <code>undefined</code> can have the following reasons:
 	 *   <ul>
 	 *     <li>We are in the 1st app start, no optimistic batch payload stored so far, or
 	 *     <li>the optimistic batch was sent, but its payload did not match to the current one, or
 	 *     <li>we are not in the first #sendBatch call within the _Requestors lifecycle, or
 	 *     <li>#sendBatch was called before first batch payload could be read via CacheManager or
-	 *     <li>we are in the first #sendBatch but the $batch is modifying, means contains others
-	 *       than GET requests.
+	 *     <li>we are in the first #sendBatch but the batch is modifying, means contains others than
+	 *       GET requests.
 	 *   </ul>
 	 *
 	 * @private
@@ -1347,7 +1379,7 @@ sap.ui.define([
 			fnOptimisticBatchEnabler,
 			that = this;
 
-		if (!this.oOptimisticBatch) {
+		if (!oOptimisticBatch) {
 			return;
 		}
 
@@ -1356,11 +1388,11 @@ sap.ui.define([
 		if (oOptimisticBatch.result) { // n+1 app start, consume optimistic batch result
 			if (_Requestor.matchesOptimisticBatch(aRequests, sGroupId,
 					oOptimisticBatch.firstBatch.requests, oOptimisticBatch.firstBatch.groupId)) {
-				Log.info("optimistic$batch: success, response consumed", sKey, sClassName);
+				Log.info("optimistic batch: success, response consumed", sKey, sClassName);
 				return oOptimisticBatch.result;
 			}
 			CacheManager.del(sCachePrefix + sKey).catch(this.oModelInterface.getReporter());
-			Log.warning("optimistic$batch: mismatch, response skipped", sKey, sClassName);
+			Log.warning("optimistic batch: mismatch, response skipped", sKey, sClassName);
 		}
 
 		fnOptimisticBatchEnabler = this.oModelInterface.getOptimisticBatchEnabler();
@@ -1369,7 +1401,7 @@ sap.ui.define([
 					return Array.isArray(oRequest) || oRequest.method !== "GET";
 				});
 			if (bIsModifyingBatch) {
-				Log.warning("optimistic$batch: modifying $batch not supported", sKey, sClassName);
+				Log.warning("optimistic batch: modifying batch not supported", sKey, sClassName);
 				return;
 			}
 
@@ -1379,18 +1411,17 @@ sap.ui.define([
 						groupId : sGroupId,
 						requests : aRequests.map(function (oRequest) {
 							return {
-								headers : oRequest.headers,
-								method : oRequest.method,
+								headers : getHeadersWithoutCSRFToken(oRequest.headers),
+								method : "GET",
 								url : oRequest.url
 							};
 						})
 					}).then(function () {
-						Log.info("optimistic$batch: enabled, $batch payload saved", sKey,
+						Log.info("optimistic batch: enabled, batch payload saved", sKey,
 							sClassName);
 					});
-				} else {
-					Log.info("optimistic$batch: disabled", sKey, sClassName);
 				}
+				Log.info("optimistic batch: disabled", sKey, sClassName);
 			}).catch(that.oModelInterface.getReporter());
 		}
 	};
@@ -1787,7 +1818,7 @@ sap.ui.define([
 	};
 
 	/**
-	 * Checks whether a first batch from a earlier app start was recorded and sends it immediately
+	 * Checks whether a first batch from an earlier app start was recorded and sends it immediately
 	 * out as optimistic batch in order to have its response at the earliest point in time.
 	 */
 	_Requestor.prototype.sendOptimisticBatch = function () {
@@ -1798,15 +1829,15 @@ sap.ui.define([
 			var oOptimisticBatch = {key : sKey};
 
 			if (oFirstBatch) {
-				if (that.isFirstBatchSent()) {
-					Log.error("optimistic$batch: #processBatch called before optimistic batch "
+				if (that.isBatchSent()) {
+					Log.error("optimistic batch: #sendBatch called before optimistic batch "
 						+ "payload could be read", undefined, sClassName);
 					return;
 				}
 				oOptimisticBatch.firstBatch = oFirstBatch;
 				oOptimisticBatch.result
 					= that.sendBatch(oFirstBatch.requests, oFirstBatch.groupId);
-				Log.info("optimistic$batch: sent ", sKey, sClassName);
+				Log.info("optimistic batch: sent ", sKey, sClassName);
 			}
 			that.oOptimisticBatch = oOptimisticBatch; // this has to be done after #sendBatch call
 		}).catch(this.oModelInterface.getReporter());
@@ -2009,6 +2040,23 @@ sap.ui.define([
 		});
 	};
 
+	/**
+	 * Waits until a batch response has been received for the given group ID.
+	 *
+	 * @param {string} sGroupId
+	 *   The group ID
+	 * @returns {sap.ui.base.SyncPromise}
+	 *   A promise that resolves without a defined result when a batch response has been received
+	 *   for the given group ID, no matter if the batch succeeded or failed
+	 *
+	 * @public
+	 * @see #batchResponseReceived
+	 */
+	_Requestor.prototype.waitForBatchResponseReceived = function (sGroupId) {
+		// Note: this currently works only in case there is at least one change request already
+		return this.mBatchQueue[sGroupId][0][0].$promise;
+	};
+
 	/**
 	 * Waits for all currently running change requests for the given group ID.
 	 *
@@ -2034,14 +2082,14 @@ sap.ui.define([
 
 	/**
 	 * Checks whether the actual payload and group ID of a batch request matches to the optimistic
-	 * $batch payload and group ID.
+	 * batch payload and group ID.
 	 *
-	 * @param {object[]} aActualRequests The requests of the actual $batch
-	 * @param {string} sActualGroupId The group ID of the actual $batch
-	 * @param {object[]} aOptimisticRequests The requests of the optimistic $batch
-	 * @param {string} sOptimisticGroupId The group ID of the optimistic $batch
+	 * @param {object[]} aActualRequests The requests of the actual batch
+	 * @param {string} sActualGroupId The group ID of the actual batch
+	 * @param {object[]} aOptimisticRequests The requests of the optimistic batch
+	 * @param {string} sOptimisticGroupId The group ID of the optimistic batch
 	 * @returns {boolean}
-	 *   Whether the actual $batch requests and group ID matches to the optimistic one
+	 *   Whether the actual batch requests and group ID matches the optimistic one
 	 */
 	_Requestor.matchesOptimisticBatch = function (aActualRequests, sActualGroupId,
 		aOptimisticRequests, sOptimisticGroupId) {
@@ -2051,7 +2099,10 @@ sap.ui.define([
 			&& aActualRequests.every(function (oActual, i) {
 				// the payload is ignored because only GET requests are expected
 				return oActual.url === aOptimisticRequests[i].url
-					&& _Helper.deepEqual(oActual.headers, aOptimisticRequests[i].headers);
+					&& _Helper.deepEqual(
+						getHeadersWithoutCSRFToken(oActual.headers),
+						aOptimisticRequests[i].headers
+					);
 			});
 	};
 

package/src/sap/ui/model/resource/ResourceModel.js

@@ -228,7 +228,7 @@ sap.ui.define([
 	 *
 	 * @extends sap.ui.model.Model
 	 * @public
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 */
 	var ResourceModel = Model.extend("sap.ui.model.resource.ResourceModel", /** @lends sap.ui.model.resource.ResourceModel.prototype */ {
 

package/src/sap/ui/model/type/Boolean.js

@@ -19,7 +19,7 @@ sap.ui.define(['sap/ui/model/SimpleType', 'sap/ui/model/FormatException', 'sap/u
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Currency.js

@@ -32,7 +32,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Date.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateInterval.js

@@ -33,7 +33,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.CompositeType
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateInstance DateFormat}.

package/src/sap/ui/model/type/DateTime.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/DateTimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getDateTimeInstance DateFormat}.

package/src/sap/ui/model/type/FileSize.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] formatting options. Supports the same options as {@link sap.ui.core.format.FileSizeFormat.getInstance FileSizeFormat.getInstance}

package/src/sap/ui/model/type/Float.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.

package/src/sap/ui/model/type/Integer.js

@@ -26,7 +26,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.NumberFormat NumberFormat}.

package/src/sap/ui/model/type/String.js

@@ -24,7 +24,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.SimpleType
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @alias sap.ui.model.type.String
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/type/Time.js

@@ -19,7 +19,7 @@ sap.ui.define(['./Date', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.Date
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/TimeInterval.js

@@ -19,7 +19,7 @@ sap.ui.define(['./DateInterval', 'sap/ui/core/format/DateFormat'],
 	 * @extends sap.ui.model.type.DateInterval
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions] Formatting options. For a list of all available options, see {@link sap.ui.core.format.DateFormat.getTimeInstance DateFormat}.

package/src/sap/ui/model/type/Unit.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 *
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @param {object} [oFormatOptions]

package/src/sap/ui/model/xml/XMLModel.js

@@ -47,7 +47,7 @@ sap.ui.define([
 	 * @extends sap.ui.model.ClientModel
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @param {object} oData either the URL where to load the XML from or an XML
 	 * @public

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

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

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

@@ -27,7 +27,7 @@ sap.ui.define([ 'sap/ui/core/Element', 'sap/ui/core/Control', 'sap/ui/core/Core'
 	 * @namespace
 	 *
 	 * @author SAP SE
-	 * @version 1.100.0
+	 * @version 1.101.0
 	 *
 	 * @public
 	 * @since 1.48.0

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

@@ -25,7 +25,9 @@ sap.ui.define([
 		'sap/ui/dom/includeStylesheet',
 		'sap/ui/thirdparty/jquery',
 		'sap/ui/test/_OpaUriParameterParser',
-		"sap/ui/test/_ValidationParameters"
+		'sap/ui/test/_ValidationParameters',
+		'sap/base/util/extend',
+		'sap/base/util/isPlainObject'
 ],
 	function (Opa,
 			OpaPlugin,
@@ -47,7 +49,9 @@ sap.ui.define([
 			includeStylesheet,
 			$,
 			_OpaUriParameterParser,
-			_ValidationParameters) {
+			_ValidationParameters,
+			extend,
+			isPlainObject) {
 		"use strict";
 
 		var oLogger = _OpaLogger.getLogger("sap.ui.test.Opa5"),
@@ -1390,9 +1394,9 @@ sap.ui.define([
 		function _getPathToExpansion(options) {
 			var aPath;
 			["ancestor", "descendant", "sibling"].forEach(function (sMatcher) {
-				if (options[sMatcher] && jQuery.isPlainObject(options[sMatcher])) {
+				if (options[sMatcher] && isPlainObject(options[sMatcher])) {
 					aPath = [sMatcher];
-				} else if (options.matchers && options.matchers[sMatcher] && jQuery.isPlainObject(options.matchers[sMatcher])) {
+				} else if (options.matchers && options.matchers[sMatcher] && isPlainObject(options.matchers[sMatcher])) {
 					aPath = ["matchers", sMatcher];
 				}
 			});
@@ -1416,7 +1420,7 @@ sap.ui.define([
 		// return a new object ("options" remains unchanged)
 		function _substituteExpansion(options, aPath, oControl) {
 			if (aPath) {
-				var oResult = jQuery.extend({}, options);
+				var oResult = extend({}, options);
 				var oPath = oResult;
 				var i = 0;
 				while (i < aPath.length - 1) {

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

@@ -803,7 +803,8 @@ sap.ui.define([
 
 		/**
 		 * @returns {boolean|undefined}
-		 *   <code>true</code> if optimistic $batch should be used, undefined if not specified.
+		 *   <code>true</code> if optimistic batch should be used, <code>undefined</code> if not
+		 *   specified.
 		 */
 		isOptimisticBatch : function () {
 			return bOptimisticBatch;

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

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

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

@@ -15,10 +15,19 @@ if (!window.QUnit || !window.QUnit.test) {
 
 // put qunit-coverage last so library files don't get measured
 sap.ui.define([
-  "jquery.sap.global", "sap/base/Log", "sap/base/util/ObjectPath", "sap/ui/test/opaQunit", "sap/ui/test/Opa5",
-  "sap/ui/test/gherkin/GherkinTestGenerator", "sap/ui/test/gherkin/dataTableUtils", "sap/ui/test/gherkin/StepDefinitions",
-  "sap/ui/test/launchers/componentLauncher", "sap/ui/test/launchers/iFrameLauncher", "sap/ui/qunit/qunit-css",
-  "sap/ui/qunit/qunit-junit", "sap/ui/qunit/qunit-coverage"
+  "jquery.sap.global",
+  "sap/base/Log",
+  "sap/base/util/ObjectPath",
+  "sap/ui/test/opaQunit",
+  "sap/ui/test/Opa5",
+  "sap/ui/test/gherkin/GherkinTestGenerator",
+  "sap/ui/test/gherkin/dataTableUtils",
+  "sap/ui/test/gherkin/StepDefinitions",
+  "sap/ui/test/launchers/componentLauncher",
+  "sap/ui/test/launchers/iFrameLauncher",
+  "sap/ui/qunit/qunit-css",
+  "sap/ui/qunit/qunit-junit",
+  "sap/ui/qunit/qunit-coverage"
 ], function($, Log, ObjectPath, opaTest, Opa5, GherkinTestGenerator, dataTableUtils, StepDefinitions, componentLauncher,
   iFrameLauncher) {
   "use strict";
@@ -31,7 +40,7 @@ sap.ui.define([
   });
 
   QUnit.done(function() {
-    if (jQuery.sap.getUriParameters().get("closeFrame")) {
+    if (new URLSearchParams(window.location.search).has("closeFrame")) {
       Opa5.emptyQueue();
     }
   });

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

@@ -5,23 +5,24 @@
  */
 /*global QUnit */
 sap.ui.define([
-	'sap/ui/thirdparty/URI',
+	'sap/base/util/each',
 	'sap/ui/test/Opa',
 	'sap/ui/test/Opa5',
-	"sap/ui/thirdparty/jquery",
-	'sap/ui/test/qunitPause'
-], function(URI, Opa, Opa5, jQueryDOM, QUnitPause) {
+	'sap/ui/test/qunitPause',
+	'sap/ui/thirdparty/jquery'
+], function(each, Opa, Opa5, QUnitPause, jQuery) {
 	"use strict";
 
 	QUnitPause.setupAfterQUnit();
 
 	QUnit.begin(function (oDetails) {
 		// add ui5 version in the user agent string bar
-		if (sap && sap.ui && jQueryDOM('#qunit-userAgent').length > 0) {
-			jQueryDOM('#qunit-userAgent')[0].innerText += "; UI5: " + sap.ui.version;
+		var oQUnitUserAgent = document.getElementById("#qunit-userAgent");
+		if (sap && sap.ui && oQUnitUserAgent) {
+			oQUnitUserAgent.innerText += "; UI5: " + sap.ui.version;
 		}
 
-		Opa._usageReport.begin({uri: new URI().toString(), totalTests: oDetails.totalTests});
+		Opa._usageReport.begin({uri: window.location.href, totalTests: oDetails.totalTests});
 	});
 
 	QUnit.moduleStart(function (oDetails) {
@@ -120,10 +121,10 @@ sap.ui.define([
 				QUnitPause.emitPause();
 			}
 
-			var oPauseDeferred = jQueryDOM.Deferred();
+			var oPauseDeferred = jQuery.Deferred();
 			QUnitPause.onResume(function () {
 				// let OPA finish before QUnit starts executing the next test
-				// call fnStart only if QUnit did not timeout
+				// call fnDone only if QUnit did not timeout
 				if (!oOptions.qunitTimeout) {
 					setTimeout(fnDone, 0);
 				}
@@ -284,7 +285,7 @@ sap.ui.define([
 		var oParams = oEvent.getParameters();
 		if (oParams.extension.getAssertions) {
 			var oAssertions = oParams.extension.getAssertions();
-			jQueryDOM.each(oAssertions,function(sName,fnAssertion) {
+			each(oAssertions, function(sName,fnAssertion) {
 				QUnit.assert[sName] = function() {
 					var qunitThis = this;
 					// call the assertion in the app window

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

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

package/src/ui5loader.js

@@ -1089,8 +1089,10 @@
 	 * When loading modules via script tag, only the onload handler knows the relationship between executed sap.ui.define calls and
 	 * module name. It then resolves the pending modules in the queue. Only one entry can get the name of the module
 	 * if there are more entries, then this is an error
+	 *
+	 * @param {boolean} [nested] Whether this is a nested queue used during sync execution of a module
 	 */
-	function ModuleDefinitionQueue() {
+	function ModuleDefinitionQueue(nested) {
 		var aQueue = [],
 			iRun = 0,
 			vTimer;
@@ -1101,16 +1103,18 @@
 					+ (document.currentScript ? " from " + document.currentScript.src : "")
 					+ " to define queue #" + iRun);
 			}
+
+			var sModule = document.currentScript && document.currentScript.getAttribute('data-sap-ui-module');
 			aQueue.push({
 				name: name,
 				deps: deps,
 				factory: factory,
 				_export: _export,
-				guess: document.currentScript && document.currentScript.getAttribute('data-sap-ui-module')
+				guess: sModule
 			});
 
 			// trigger queue processing via a timer in case the currently executing script is not managed by the loader
-			if ( !vTimer ) {
+			if ( !vTimer && !nested && sModule == null ) {
 				vTimer = setTimeout(this.process.bind(this, null, "timer"));
 			}
 		};
@@ -1586,7 +1590,7 @@
 			try {
 
 				bForceSyncDefines = !bAsync;
-				queue = new ModuleDefinitionQueue();
+				queue = new ModuleDefinitionQueue(true);
 
 				if ( bLoggable ) {
 					if ( typeof oModule.data === "string" ) {