@sap_oss/wdio-qmate-service 1.0.0 → 1.0.2

package/lib/reuse/modules/ui5/mockserver.js

@@ -4,15 +4,6 @@
 // E.g. `await lib.mockServerActionInBrowser(function (mockserver, method, fnAfterCallbackAsString, oParams, done){...})`
 // It is not required to check the type (function or string) - toString() function can be applied to a string too.
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Mockserver = void 0;
 /**
@@ -31,10 +22,8 @@ class Mockserver {
      * @param {Integer} interval - The intervals to use when waiting UI5 to load.
      * @example await ui5.mockserver.waitForUi5ApplicationLoad(100);
      */
-    waitForUi5ApplicationLoad(interval = 100) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.lib.waitUI5ToStabilize(); // Note: interval is hardcoded in  lib.js
-        });
+    async waitForUi5ApplicationLoad(interval = 100) {
+        await this.lib.waitUI5ToStabilize(); // Note: interval is hardcoded in  lib.js
     }
     ;
     /**
@@ -47,12 +36,10 @@ class Mockserver {
      * @param {String} oParams - Additional parameters you would like to inject in your client script function
      * @example await ui5.mockserver.interactWithMockServer("path/to/project/localService/main/mockserver", fnCallback, oParams);
      */
-    interactWithMockServer(mockServerPath, fnCallback, oParams) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // fnCallback-> function(mockServerInstance, oParams, done){...}
-            yield this.lib.mockServerActionInBrowser(fnCallback, mockServerPath, oParams);
-            return yield ui5.mockserver.waitForUi5ApplicationLoad();
-        });
+    async interactWithMockServer(mockServerPath, fnCallback, oParams) {
+        // fnCallback-> function(mockServerInstance, oParams, done){...}
+        await this.lib.mockServerActionInBrowser(fnCallback, mockServerPath, oParams);
+        return await ui5.mockserver.waitForUi5ApplicationLoad();
     }
     ;
     /**
@@ -65,22 +52,20 @@ class Mockserver {
      * @param {Object} oParams - Additional parameters you would like to inject in your client script function
      * @example await ui5.mockserver.attachFunctionBefore("GET", "path/to/project/localService/main/mockserver", fnBeforeCallback, oParams);
      */
-    attachFunctionBefore(method, mockServerPath, fnBeforeCallback, oParams) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fnBeforeCallbackString = fnBeforeCallback.toString();
-            yield this.lib.mockServerActionInBrowser(function (mockserver, method, fnBeforeCallbackString, oParams, done) {
-                const mockServerInst = mockserver.getMockServer();
-                if (!mockServerInst) {
-                    console.error("Mockserver not yet initialized or method getMockServer is missing");
-                    done();
-                }
-                const beforeCallback = "beforeCallback = " + fnBeforeCallbackString;
-                const fnFunction = eval(beforeCallback);
-                mockServerInst.attachBefore(method, fnFunction);
+    async attachFunctionBefore(method, mockServerPath, fnBeforeCallback, oParams) {
+        const fnBeforeCallbackString = fnBeforeCallback.toString();
+        await this.lib.mockServerActionInBrowser(function (mockserver, method, fnBeforeCallbackString, oParams, done) {
+            const mockServerInst = mockserver.getMockServer();
+            if (!mockServerInst) {
+                console.error("Mockserver not yet initialized or method getMockServer is missing");
                 done();
-            }, mockServerPath, method, fnBeforeCallbackString, oParams);
-            return yield ui5.mockserver.waitForUi5ApplicationLoad();
-        });
+            }
+            const beforeCallback = "beforeCallback = " + fnBeforeCallbackString;
+            const fnFunction = eval(beforeCallback);
+            mockServerInst.attachBefore(method, fnFunction);
+            done();
+        }, mockServerPath, method, fnBeforeCallbackString, oParams);
+        return await ui5.mockserver.waitForUi5ApplicationLoad();
     }
     ;
     /**
@@ -93,22 +78,20 @@ class Mockserver {
      * @param {Object} oParams - Additional parameters you would like to inject in your client script function
      * @example await ui5.mockserver.attachFunctionAfter("GET", "path/to/project/localService/main/mockserver",  fnAfterCallback);
      */
-    attachFunctionAfter(method, mockServerPath, fnAfterCallback, oParams) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const fnAfterCallbackString = fnAfterCallback.toString();
-            yield this.lib.mockServerActionInBrowser(function (mockserver, method, fnAfterCallbackString, oParams, done) {
-                var mockServerInst = mockserver.getMockServer();
-                if (!mockServerInst) {
-                    console.error("Mockserver not yet initialized or method getMockServer is missing");
-                    done();
-                }
-                var afterCallback = "afterCallback = " + fnAfterCallbackString;
-                var fnFunction = eval(afterCallback);
-                mockServerInst.attachAfter(method, fnFunction);
+    async attachFunctionAfter(method, mockServerPath, fnAfterCallback, oParams) {
+        const fnAfterCallbackString = fnAfterCallback.toString();
+        await this.lib.mockServerActionInBrowser(function (mockserver, method, fnAfterCallbackString, oParams, done) {
+            var mockServerInst = mockserver.getMockServer();
+            if (!mockServerInst) {
+                console.error("Mockserver not yet initialized or method getMockServer is missing");
                 done();
-            }, mockServerPath, method, fnAfterCallbackString, oParams);
-            return yield ui5.mockserver.waitForUi5ApplicationLoad();
-        });
+            }
+            var afterCallback = "afterCallback = " + fnAfterCallbackString;
+            var fnFunction = eval(afterCallback);
+            mockServerInst.attachAfter(method, fnFunction);
+            done();
+        }, mockServerPath, method, fnAfterCallbackString, oParams);
+        return await ui5.mockserver.waitForUi5ApplicationLoad();
     }
     ;
     /**
@@ -125,137 +108,135 @@ class Mockserver {
      * @param {String} responseLocation - Mocks the location response messages header
      * @example await ui5.mockserver.addNewRequest("GET","path/to/project/localService/main/mockserver", "*.Headers.*", "path/to/project/localService/main/mockdata/test.json", 200, true, JSON.stringify(msg));
      */
-    addNewRequest(method, mockServerPath, urlPathRegex, responseJsonPath, returnCode, isText, responseMessages, responseLocation) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var responseData = responseJsonPath;
-            try {
-                if (typeof responseJsonPath !== "string" && typeof responseJsonPath === "object") {
-                    responseData = JSON.stringify(responseJsonPath);
-                }
-            }
-            catch (error) {
-                throw new Error("Something went wrong with the conversion" + error);
-            }
-            // If undefined dont add any messages
-            if (!responseMessages) {
-                responseMessages = false;
+    async addNewRequest(method, mockServerPath, urlPathRegex, responseJsonPath, returnCode, isText, responseMessages, responseLocation) {
+        var responseData = responseJsonPath;
+        try {
+            if (typeof responseJsonPath !== "string" && typeof responseJsonPath === "object") {
+                responseData = JSON.stringify(responseJsonPath);
             }
-            // If undefined dont add any location
-            if (!responseLocation) {
-                responseLocation = false;
-            }
-            yield this.lib.mockServerActionInBrowser(function (mockserver, method, urlPathRegex, responseJsonPath, responseMessages, responseLocation, returnCode, isText, done) {
-                var mockServerInst = mockserver.getMockServer();
-                if (!mockServerInst)
-                    throw new Error("Mockserver not yet initialized or method getMockServer is missing");
-                var fnResponse = function (oXhr) {
-                    // If connection close dont redo response
-                    if (oXhr.readyState && oXhr.readyState === 4)
-                        return true;
-                    var oData = null;
-                    try {
+        }
+        catch (error) {
+            throw new Error("Something went wrong with the conversion" + error);
+        }
+        // If undefined dont add any messages
+        if (!responseMessages) {
+            responseMessages = false;
+        }
+        // If undefined dont add any location
+        if (!responseLocation) {
+            responseLocation = false;
+        }
+        await this.lib.mockServerActionInBrowser(function (mockserver, method, urlPathRegex, responseJsonPath, responseMessages, responseLocation, returnCode, isText, done) {
+            var mockServerInst = mockserver.getMockServer();
+            if (!mockServerInst)
+                throw new Error("Mockserver not yet initialized or method getMockServer is missing");
+            var fnResponse = function (oXhr) {
+                // If connection close dont redo response
+                if (oXhr.readyState && oXhr.readyState === 4)
+                    return true;
+                var oData = null;
+                try {
+                    if (isText && isText !== "false") {
+                        oData = responseJsonPath;
+                    }
+                    else {
+                        oData = JSON.parse(responseJsonPath);
+                    }
+                }
+                catch (e) {
+                    if (typeof responseJsonPath === "string" && !RegExp(".?([^\/\s]+\/)(.*)").test(responseJsonPath)) {
+                        oData = responseJsonPath;
+                    }
+                    else {
                         if (isText && isText !== "false") {
-                            oData = responseJsonPath;
+                            // @ts-ignore
+                            var oResponse = jQuery.sap.sjax({
+                                url: responseJsonPath,
+                                dataType: "text"
+                            });
                         }
                         else {
-                            oData = JSON.parse(responseJsonPath);
-                        }
-                    }
-                    catch (e) {
-                        if (typeof responseJsonPath === "string" && !RegExp(".?([^\/\s]+\/)(.*)").test(responseJsonPath)) {
-                            oData = responseJsonPath;
+                            // @ts-ignore
+                            oResponse = jQuery.sap.sjax({
+                                url: responseJsonPath,
+                                dataType: "json"
+                            });
                         }
-                        else {
-                            if (isText && isText !== "false") {
-                                // @ts-ignore
-                                var oResponse = jQuery.sap.sjax({
-                                    url: responseJsonPath,
-                                    dataType: "text"
-                                });
-                            }
-                            else {
-                                // @ts-ignore
-                                oResponse = jQuery.sap.sjax({
-                                    url: responseJsonPath,
-                                    dataType: "json"
-                                });
+                        if (oResponse.success) {
+                            if (isText && isText !== "false" && oResponse.data) {
+                                oData = oResponse.data;
                             }
-                            if (oResponse.success) {
-                                if (isText && isText !== "false" && oResponse.data) {
+                            else if (oResponse.data.d) {
+                                if (oResponse.data.d.results) {
                                     oData = oResponse.data;
                                 }
                                 else if (oResponse.data.d) {
-                                    if (oResponse.data.d.results) {
-                                        oData = oResponse.data;
-                                    }
-                                    else if (oResponse.data.d) {
-                                        // Function Import or single data
-                                        oData = oResponse.data;
-                                    }
-                                    else {
-                                        console.error("The mock data are invalid");
-                                    }
+                                    // Function Import or single data
+                                    oData = oResponse.data;
                                 }
                                 else {
-                                    if (Array.isArray(oResponse.data)) {
-                                        oData = oResponse.data;
-                                    }
-                                    else {
-                                        console.error("The mock data could not be loaded due to wrong format!");
-                                    }
+                                    console.error("The mock data are invalid");
+                                }
+                            }
+                            else {
+                                if (Array.isArray(oResponse.data)) {
+                                    oData = oResponse.data;
+                                }
+                                else {
+                                    console.error("The mock data could not be loaded due to wrong format!");
                                 }
                             }
                         }
                     }
-                    var resHeader = {};
-                    resHeader["content-encoding"] = "identity";
-                    // @ts-ignore
-                    let parsedReturnCode = parseInt(returnCode);
-                    if (isNaN(parsedReturnCode)) {
-                        parsedReturnCode = 200;
+                }
+                var resHeader = {};
+                resHeader["content-encoding"] = "identity";
+                // @ts-ignore
+                let parsedReturnCode = parseInt(returnCode);
+                if (isNaN(parsedReturnCode)) {
+                    parsedReturnCode = 200;
+                }
+                if (isText && isText !== "false") {
+                    if (responseMessages && responseMessages !== "false") {
+                        resHeader["sap-message"] = responseMessages;
                     }
-                    if (isText && isText !== "false") {
-                        if (responseMessages && responseMessages !== "false") {
-                            resHeader["sap-message"] = responseMessages;
-                        }
-                        if (responseLocation && responseLocation !== "false") {
-                            resHeader["location"] = responseLocation;
-                        }
-                        resHeader["Content-Type"] = "text/plain;charset=utf-8";
-                        oXhr.respond(parsedReturnCode, resHeader, oData);
+                    if (responseLocation && responseLocation !== "false") {
+                        resHeader["location"] = responseLocation;
                     }
-                    else {
-                        if (responseMessages && responseMessages !== "false") {
-                            resHeader["sap-message"] = responseMessages;
-                        }
-                        if (responseLocation && responseLocation !== "false") {
-                            resHeader["location"] = responseLocation;
-                        }
-                        resHeader["Content-Type"] = "application/json;charset=utf-8";
-                        oXhr.respond(parsedReturnCode, resHeader, JSON.stringify(oData));
+                    resHeader["Content-Type"] = "text/plain;charset=utf-8";
+                    oXhr.respond(parsedReturnCode, resHeader, oData);
+                }
+                else {
+                    if (responseMessages && responseMessages !== "false") {
+                        resHeader["sap-message"] = responseMessages;
                     }
-                    return true;
-                };
-                var aRequests = mockServerInst.getRequests();
-                const isOverride = false;
-                if (!isOverride) {
-                    if (!urlPathRegex) {
-                        console.error("path regex wasn't provided");
-                        done();
+                    if (responseLocation && responseLocation !== "false") {
+                        resHeader["location"] = responseLocation;
                     }
-                    //Remove regexp slashes so we read them if needed
-                    var urlPathEscRegex = urlPathRegex.substring(1, urlPathRegex.length - 1);
-                    aRequests.push({
-                        method: method,
-                        path: new RegExp(urlPathEscRegex),
-                        response: fnResponse
-                    });
-                    mockServerInst.setRequests(aRequests);
+                    resHeader["Content-Type"] = "application/json;charset=utf-8";
+                    oXhr.respond(parsedReturnCode, resHeader, JSON.stringify(oData));
                 }
-                done();
-            }, mockServerPath, method, urlPathRegex, responseData, responseMessages, responseLocation, returnCode, isText);
-            return yield ui5.mockserver.waitForUi5ApplicationLoad();
-        });
+                return true;
+            };
+            var aRequests = mockServerInst.getRequests();
+            const isOverride = false;
+            if (!isOverride) {
+                if (!urlPathRegex) {
+                    console.error("path regex wasn't provided");
+                    done();
+                }
+                //Remove regexp slashes so we read them if needed
+                var urlPathEscRegex = urlPathRegex.substring(1, urlPathRegex.length - 1);
+                aRequests.push({
+                    method: method,
+                    path: new RegExp(urlPathEscRegex),
+                    response: fnResponse
+                });
+                mockServerInst.setRequests(aRequests);
+            }
+            done();
+        }, mockServerPath, method, urlPathRegex, responseData, responseMessages, responseLocation, returnCode, isText);
+        return await ui5.mockserver.waitForUi5ApplicationLoad();
     }
     ;
     /**
@@ -267,33 +248,31 @@ class Mockserver {
      * @param {String} urlPathRegex - The url path regex to filter the requests
      * @example await ui5.mockserver.removeRequest("GET","path/to/project/localService/main/mockserver", "*.Headers.*");
      */
-    removeRequest(method, mockServerPath, urlPathRegex) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.lib.mockServerActionInBrowser(function (mockserver, method, urlPathRegex, done) {
-                var mockServerInst = mockserver.getMockServer();
-                if (!mockServerInst) {
-                    console.error("Mockserver not yet initialized or method getMockServer is missing");
-                    done();
-                }
-                var aExistingRequests = mockServerInst.getRequests();
-                var aRequests = [].concat(aExistingRequests);
-                var elemDeleted = false;
-                if (urlPathRegex && method && aExistingRequests) {
-                    //var urlRegEsc = RegExp(urlPathRegex).source.replace(/\\/g, "");
-                    for (let index = 0; index < aExistingRequests.length; index++) {
-                        const mockRequest = aExistingRequests[index];
-                        var regExpPath = mockRequest.path.toString();
-                        if (mockRequest.method === method && urlPathRegex === regExpPath) {
-                            aRequests.splice(index, 1);
-                            elemDeleted = true;
-                        }
+    async removeRequest(method, mockServerPath, urlPathRegex) {
+        await this.lib.mockServerActionInBrowser(function (mockserver, method, urlPathRegex, done) {
+            var mockServerInst = mockserver.getMockServer();
+            if (!mockServerInst) {
+                console.error("Mockserver not yet initialized or method getMockServer is missing");
+                done();
+            }
+            var aExistingRequests = mockServerInst.getRequests();
+            var aRequests = [].concat(aExistingRequests);
+            var elemDeleted = false;
+            if (urlPathRegex && method && aExistingRequests) {
+                //var urlRegEsc = RegExp(urlPathRegex).source.replace(/\\/g, "");
+                for (let index = 0; index < aExistingRequests.length; index++) {
+                    const mockRequest = aExistingRequests[index];
+                    var regExpPath = mockRequest.path.toString();
+                    if (mockRequest.method === method && urlPathRegex === regExpPath) {
+                        aRequests.splice(index, 1);
+                        elemDeleted = true;
                     }
                 }
-                mockServerInst.setRequests(aRequests);
-                done(elemDeleted);
-            }, mockServerPath, method, urlPathRegex);
-            return yield ui5.mockserver.waitForUi5ApplicationLoad();
-        });
+            }
+            mockServerInst.setRequests(aRequests);
+            done(elemDeleted);
+        }, mockServerPath, method, urlPathRegex);
+        return await ui5.mockserver.waitForUi5ApplicationLoad();
     }
     ;
     /**
@@ -310,136 +289,134 @@ class Mockserver {
      * @param {String} responseLocation - Mocks the location response messages header
      * @example await ui5.mockserver.addOrOverrideRequest("GET","path/to/project/localService/main/mockserver", "*.Headers.*", "path/to/project/localService/main/mockdata/test.json", 200, true, JSON.stringify(msg));
      */
-    addOrOverrideRequest(method, mockServerPath, urlPathRegex, responseJsonPath, returnCode, isText, responseMessages, responseLocation) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var responseData = responseJsonPath;
-            try {
-                if (typeof responseJsonPath !== "string" && typeof responseJsonPath === "object") {
-                    responseData = JSON.stringify(responseJsonPath);
-                }
-            }
-            catch (error) {
-                throw new Error("Something went wrong with the conversion" + error);
-            }
-            // If undefined dont add any messages
-            if (!responseMessages) {
-                responseMessages = false;
+    async addOrOverrideRequest(method, mockServerPath, urlPathRegex, responseJsonPath, returnCode, isText, responseMessages, responseLocation) {
+        var responseData = responseJsonPath;
+        try {
+            if (typeof responseJsonPath !== "string" && typeof responseJsonPath === "object") {
+                responseData = JSON.stringify(responseJsonPath);
             }
-            // If undefined dont add any location
-            if (!responseLocation) {
-                responseLocation = false;
-            }
-            yield this.lib.mockServerActionInBrowser(function (mockserver, method, urlPathRegex, responseJsonPath, responseMessages, responseLocation, returnCode, isText, done) {
-                var mockServerInst = mockserver.getMockServer();
-                if (!mockServerInst)
-                    throw new Error("Mockserver not yet initialized or method getMockServer is missing");
-                var fnResponse = function (oXhr) {
-                    // If connection close dont redo response
-                    if (oXhr.readyState && oXhr.readyState === 4)
-                        return true;
-                    var oData = null;
-                    try {
+        }
+        catch (error) {
+            throw new Error("Something went wrong with the conversion" + error);
+        }
+        // If undefined dont add any messages
+        if (!responseMessages) {
+            responseMessages = false;
+        }
+        // If undefined dont add any location
+        if (!responseLocation) {
+            responseLocation = false;
+        }
+        await this.lib.mockServerActionInBrowser(function (mockserver, method, urlPathRegex, responseJsonPath, responseMessages, responseLocation, returnCode, isText, done) {
+            var mockServerInst = mockserver.getMockServer();
+            if (!mockServerInst)
+                throw new Error("Mockserver not yet initialized or method getMockServer is missing");
+            var fnResponse = function (oXhr) {
+                // If connection close dont redo response
+                if (oXhr.readyState && oXhr.readyState === 4)
+                    return true;
+                var oData = null;
+                try {
+                    if (isText && isText !== "false") {
+                        oData = responseJsonPath;
+                    }
+                    else {
+                        oData = JSON.parse(responseJsonPath);
+                    }
+                }
+                catch (e) {
+                    if (typeof responseJsonPath === "string" && !RegExp(".?([^\/\s]+\/)(.*)").test(responseJsonPath)) {
+                        oData = responseJsonPath;
+                    }
+                    else {
                         if (isText && isText !== "false") {
-                            oData = responseJsonPath;
+                            // @ts-ignore
+                            var oResponse = jQuery.sap.sjax({
+                                url: responseJsonPath,
+                                dataType: "text"
+                            });
                         }
                         else {
-                            oData = JSON.parse(responseJsonPath);
+                            // @ts-ignore
+                            oResponse = jQuery.sap.sjax({
+                                url: responseJsonPath,
+                                dataType: "json"
+                            });
                         }
-                    }
-                    catch (e) {
-                        if (typeof responseJsonPath === "string" && !RegExp(".?([^\/\s]+\/)(.*)").test(responseJsonPath)) {
-                            oData = responseJsonPath;
-                        }
-                        else {
-                            if (isText && isText !== "false") {
-                                // @ts-ignore
-                                var oResponse = jQuery.sap.sjax({
-                                    url: responseJsonPath,
-                                    dataType: "text"
-                                });
-                            }
-                            else {
-                                // @ts-ignore
-                                oResponse = jQuery.sap.sjax({
-                                    url: responseJsonPath,
-                                    dataType: "json"
-                                });
+                        if (oResponse.success) {
+                            if (isText && isText !== "false" && oResponse.data) {
+                                oData = oResponse.data;
                             }
-                            if (oResponse.success) {
-                                if (isText && isText !== "false" && oResponse.data) {
+                            else if (oResponse.data.d) {
+                                if (oResponse.data.d.results) {
                                     oData = oResponse.data;
                                 }
                                 else if (oResponse.data.d) {
-                                    if (oResponse.data.d.results) {
-                                        oData = oResponse.data;
-                                    }
-                                    else if (oResponse.data.d) {
-                                        // Function Import or single data
-                                        oData = oResponse.data;
-                                    }
-                                    else {
-                                        console.error("The mock data are invalid");
-                                    }
+                                    // Function Import or single data
+                                    oData = oResponse.data;
+                                }
+                                else {
+                                    console.error("The mock data are invalid");
+                                }
+                            }
+                            else {
+                                if (Array.isArray(oResponse.data)) {
+                                    oData = oResponse.data;
                                 }
                                 else {
-                                    if (Array.isArray(oResponse.data)) {
-                                        oData = oResponse.data;
-                                    }
-                                    else {
-                                        console.error("The mock data could not be loaded due to wrong format!");
-                                    }
+                                    console.error("The mock data could not be loaded due to wrong format!");
                                 }
                             }
                         }
                     }
-                    var resHeader = {};
-                    resHeader["content-encoding"] = "identity";
-                    let parsedReturnCode = parseInt(returnCode);
-                    if (isNaN(parsedReturnCode)) {
-                        parsedReturnCode = 200;
+                }
+                var resHeader = {};
+                resHeader["content-encoding"] = "identity";
+                let parsedReturnCode = parseInt(returnCode);
+                if (isNaN(parsedReturnCode)) {
+                    parsedReturnCode = 200;
+                }
+                if (isText && isText !== "false") {
+                    if (responseMessages && responseMessages !== "false") {
+                        resHeader["sap-message"] = responseMessages;
                     }
-                    if (isText && isText !== "false") {
-                        if (responseMessages && responseMessages !== "false") {
-                            resHeader["sap-message"] = responseMessages;
-                        }
-                        if (responseLocation && responseLocation !== "false") {
-                            resHeader["location"] = responseLocation;
-                        }
-                        resHeader["Content-Type"] = "text/plain;charset=utf-8";
-                        oXhr.respond(parsedReturnCode, resHeader, oData);
+                    if (responseLocation && responseLocation !== "false") {
+                        resHeader["location"] = responseLocation;
                     }
-                    else {
-                        if (responseMessages && responseMessages !== "false") {
-                            resHeader["sap-message"] = responseMessages;
-                        }
-                        if (responseLocation && responseLocation !== "false") {
-                            resHeader["location"] = responseLocation;
-                        }
-                        resHeader["Content-Type"] = "application/json;charset=utf-8";
-                        oXhr.respond(parsedReturnCode, resHeader, JSON.stringify(oData));
+                    resHeader["Content-Type"] = "text/plain;charset=utf-8";
+                    oXhr.respond(parsedReturnCode, resHeader, oData);
+                }
+                else {
+                    if (responseMessages && responseMessages !== "false") {
+                        resHeader["sap-message"] = responseMessages;
                     }
-                    return true;
-                };
-                var aRequests = mockServerInst.getRequests();
-                const isOverride = false;
-                if (!isOverride) {
-                    if (!urlPathRegex) {
-                        console.error("path regex wasnt provided");
-                        done();
+                    if (responseLocation && responseLocation !== "false") {
+                        resHeader["location"] = responseLocation;
                     }
-                    //Remove regexp slashes so we read them if needed
-                    var urlPathEscRegex = urlPathRegex.substring(1, urlPathRegex.length - 1);
-                    aRequests.push({
-                        method: method,
-                        path: new RegExp(urlPathEscRegex),
-                        response: fnResponse
-                    });
-                    mockServerInst.setRequests(aRequests);
+                    resHeader["Content-Type"] = "application/json;charset=utf-8";
+                    oXhr.respond(parsedReturnCode, resHeader, JSON.stringify(oData));
                 }
-                done();
-            }, mockServerPath, method, urlPathRegex, responseData, responseMessages, responseLocation, returnCode, isText);
-            return yield ui5.mockserver.waitForUi5ApplicationLoad();
-        });
+                return true;
+            };
+            var aRequests = mockServerInst.getRequests();
+            const isOverride = false;
+            if (!isOverride) {
+                if (!urlPathRegex) {
+                    console.error("path regex wasnt provided");
+                    done();
+                }
+                //Remove regexp slashes so we read them if needed
+                var urlPathEscRegex = urlPathRegex.substring(1, urlPathRegex.length - 1);
+                aRequests.push({
+                    method: method,
+                    path: new RegExp(urlPathEscRegex),
+                    response: fnResponse
+                });
+                mockServerInst.setRequests(aRequests);
+            }
+            done();
+        }, mockServerPath, method, urlPathRegex, responseData, responseMessages, responseLocation, returnCode, isText);
+        return await ui5.mockserver.waitForUi5ApplicationLoad();
     }
     ;
     /**
@@ -449,19 +426,17 @@ class Mockserver {
      * @param {String} mockServerPath - The full path to your mockserver file [make sure you implemented getMockServer method in this file to return the mockserver instance].
      * @example await ui5.mockserver.startMockServer("path/to/project/localService/main/mockserver");
      */
-    startMockServer(mockServerPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.lib.mockServerActionInBrowser(function (mockserver, done) {
-                var mockServerInst = mockserver.getMockServer();
-                if (!mockServerInst) {
-                    console.error("Mockserver not yet initialized or method getMockServer is missing");
-                    done();
-                }
-                mockServerInst.start();
+    async startMockServer(mockServerPath) {
+        await this.lib.mockServerActionInBrowser(function (mockserver, done) {
+            var mockServerInst = mockserver.getMockServer();
+            if (!mockServerInst) {
+                console.error("Mockserver not yet initialized or method getMockServer is missing");
                 done();
-            }, mockServerPath);
-            return yield ui5.mockserver.waitForUi5ApplicationLoad();
-        });
+            }
+            mockServerInst.start();
+            done();
+        }, mockServerPath);
+        return await ui5.mockserver.waitForUi5ApplicationLoad();
     }
     ;
     /**
@@ -472,28 +447,26 @@ class Mockserver {
      * @param {String} mockServerOptions - The mock server options
      * @example await ui5.mockserver.initMockServer("path/to/project/localService/main/mockserver", mockServerOptions);
      */
-    initMockServer(mockServerPath, mockServerOptions) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var mockServerOpts = JSON.stringify(mockServerOptions);
-            return yield this.lib.mockServerActionInBrowser(function (mockserver, mockServerOpts, done) {
-                if (!mockserver) {
-                    console.error("Mockserver file not yet loaded or is missing");
-                    done();
-                }
-                mockserver.init(JSON.parse(mockServerOpts)).catch(function (oError) {
-                    // load MessageBox only when needed as it otherwise bypasses the preload of sap.m
-                    // eslint-disable-next-line no-undef
-                    sap.ui.require(["sap/m/MessageBox"], function (MessageBox) {
-                        MessageBox.error(oError.message);
-                    });
-                }).finally(function () {
-                    // initialize the embedded component on the HTML page
-                    // eslint-disable-next-line no-undef
-                    sap.ui.require(["sap/ui/core/ComponentSupport"]);
-                    done();
+    async initMockServer(mockServerPath, mockServerOptions) {
+        var mockServerOpts = JSON.stringify(mockServerOptions);
+        return await this.lib.mockServerActionInBrowser(function (mockserver, mockServerOpts, done) {
+            if (!mockserver) {
+                console.error("Mockserver file not yet loaded or is missing");
+                done();
+            }
+            mockserver.init(JSON.parse(mockServerOpts)).catch(function (oError) {
+                // load MessageBox only when needed as it otherwise bypasses the preload of sap.m
+                // eslint-disable-next-line no-undef
+                sap.ui.require(["sap/m/MessageBox"], function (MessageBox) {
+                    MessageBox.error(oError.message);
                 });
-            }, mockServerPath, mockServerOpts);
-        });
+            }).finally(function () {
+                // initialize the embedded component on the HTML page
+                // eslint-disable-next-line no-undef
+                sap.ui.require(["sap/ui/core/ComponentSupport"]);
+                done();
+            });
+        }, mockServerPath, mockServerOpts);
     }
     ;
     /**
@@ -503,19 +476,17 @@ class Mockserver {
      * @param {String} mockServerPath - The full path to your mockserver file [make sure you implemented getMockServer method in this file to return the mockserver instance].
      * @example await ui5.mockserver.initApplication("path/to/project/localService/main/mockserver");
      */
-    initApplication(mockServerPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.lib.mockServerActionInBrowser(function (mockserver, done) {
-                if (!mockserver) {
-                    console.error("Mockserver file not yet loaded or is missing");
-                    done();
-                }
-                // eslint-disable-next-line no-undef
-                sap.ushell.Container.createRenderer().placeAt("content");
+    async initApplication(mockServerPath) {
+        await this.lib.mockServerActionInBrowser(function (mockserver, done) {
+            if (!mockserver) {
+                console.error("Mockserver file not yet loaded or is missing");
                 done();
-            }, mockServerPath);
-            return yield ui5.mockserver.waitForUi5ApplicationLoad();
-        });
+            }
+            // eslint-disable-next-line no-undef
+            sap.ushell.Container.createRenderer().placeAt("content");
+            done();
+        }, mockServerPath);
+        return await ui5.mockserver.waitForUi5ApplicationLoad();
     }
     ;
     /**
@@ -525,18 +496,16 @@ class Mockserver {
      * @param {String} mockServerPath - The full path to your mockserver file [make sure you implemented getMockServer method in this file to return the mockserver instance].
      * @example await ui5.mockserver.stopMockServer("path/to/project/localService/main/mockserver");
      */
-    stopMockServer(mockServerPath) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.lib.mockServerActionInBrowser(function (mockserver, done) {
-                var mockServerInst = mockserver.getMockServer();
-                if (!mockServerInst) {
-                    console.error("Mockserver not yet initialized or method getMockServer is missing");
-                    done();
-                }
-                mockServerInst.stop();
+    async stopMockServer(mockServerPath) {
+        return await this.lib.mockServerActionInBrowser(function (mockserver, done) {
+            var mockServerInst = mockserver.getMockServer();
+            if (!mockServerInst) {
+                console.error("Mockserver not yet initialized or method getMockServer is missing");
                 done();
-            }, mockServerPath);
-        });
+            }
+            mockServerInst.stop();
+            done();
+        }, mockServerPath);
     }
     ;
     /**
@@ -548,10 +517,8 @@ class Mockserver {
      * @returns {String} The json object
      * @example await ui5.mockserver.loadMockDataFile("path/to/project/mockData/myData.json", true);
      */
-    loadMockDataFile(filePath, isText) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.lib.loadMockData(filePath, isText);
-        });
+    async loadMockDataFile(filePath, isText) {
+        return await this.lib.loadMockData(filePath, isText);
     }
     ;
     /**
@@ -563,18 +530,16 @@ class Mockserver {
      * @returns {Array} An array of json objects
      * @example await ui5.mockserver.getEntitySetData("path/to/project/localService/main/mockserver", "Headers");
      */
-    getEntitySetData(mockServerPath, entitySetName) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this.lib.mockServerActionInBrowser(function (mockserver, entitySetName, done) {
-                var mockServerInst = mockserver.getMockServer();
-                if (!mockServerInst) {
-                    console.error("Mockserver not yet initialized or method getMockServer is missing");
-                    done();
-                }
-                const oData = mockServerInst.getEntitySetData(entitySetName);
-                done(oData);
-            }, mockServerPath, entitySetName);
-        });
+    async getEntitySetData(mockServerPath, entitySetName) {
+        return await this.lib.mockServerActionInBrowser(function (mockserver, entitySetName, done) {
+            var mockServerInst = mockserver.getMockServer();
+            if (!mockServerInst) {
+                console.error("Mockserver not yet initialized or method getMockServer is missing");
+                done();
+            }
+            const oData = mockServerInst.getEntitySetData(entitySetName);
+            done(oData);
+        }, mockServerPath, entitySetName);
     }
     ;
     /**
@@ -586,76 +551,74 @@ class Mockserver {
      * @param {String} entries - The json object to be used as data to be inserted [use relative path from the html page started].
      * @example await ui5.mockserver.setEntitySetData("path/to/project/localService/main/mockserver", "Headers", entries);
      */
-    setEntitySetData(mockServerPath, entitySetName, entries) {
-        return __awaiter(this, void 0, void 0, function* () {
-            var responseData = entries;
-            try {
-                if (typeof entries !== "string" && typeof entries === "object") {
-                    responseData = JSON.stringify(entries);
-                }
+    async setEntitySetData(mockServerPath, entitySetName, entries) {
+        var responseData = entries;
+        try {
+            if (typeof entries !== "string" && typeof entries === "object") {
+                responseData = JSON.stringify(entries);
             }
-            catch (error) {
-                throw new Error("Something went wrong with the conversion" + error);
+        }
+        catch (error) {
+            throw new Error("Something went wrong with the conversion" + error);
+        }
+        return await this.lib.mockServerActionInBrowser(function (mockserver, entitySetName, entries, done) {
+            var mockServerInst = mockserver.getMockServer();
+            if (!mockServerInst) {
+                console.error("Mockserver not yet initialized or method getMockServer is missing");
+                done();
             }
-            return yield this.lib.mockServerActionInBrowser(function (mockserver, entitySetName, entries, done) {
-                var mockServerInst = mockserver.getMockServer();
-                if (!mockServerInst) {
-                    console.error("Mockserver not yet initialized or method getMockServer is missing");
-                    done();
-                }
-                var oData = [];
-                try {
-                    var tempOData = JSON.parse(entries);
-                    if (!Array.isArray(tempOData)) {
-                        if (tempOData.d.results)
-                            oData = [].concat(tempOData.d.results);
-                        else if (tempOData.d)
-                            oData = [].concat(tempOData.d);
-                        else
-                            oData = [].concat(tempOData);
-                    }
-                    else {
-                        // @ts-ignore
+            var oData = [];
+            try {
+                var tempOData = JSON.parse(entries);
+                if (!Array.isArray(tempOData)) {
+                    if (tempOData.d.results)
+                        oData = [].concat(tempOData.d.results);
+                    else if (tempOData.d)
+                        oData = [].concat(tempOData.d);
+                    else
                         oData = [].concat(tempOData);
-                    }
                 }
-                catch (e) {
+                else {
                     // @ts-ignore
-                    var oResponse = jQuery.sap.sjax({
-                        url: entries,
-                        dataType: "json"
-                    });
-                    if (oResponse.success) {
-                        if (oResponse.data.d) {
-                            if (oResponse.data.d.results) {
-                                oData = oResponse.data.d.results;
-                            }
-                            else if (oResponse.data.d) {
-                                // Single data
-                                oData.push(oResponse.data.d);
-                            }
-                            else if (oResponse.data) {
-                                // Fallback Single data
-                                oData.push(oResponse.data);
-                            }
-                            else {
-                                console.error("The mock data are invalid");
-                            }
+                    oData = [].concat(tempOData);
+                }
+            }
+            catch (e) {
+                // @ts-ignore
+                var oResponse = jQuery.sap.sjax({
+                    url: entries,
+                    dataType: "json"
+                });
+                if (oResponse.success) {
+                    if (oResponse.data.d) {
+                        if (oResponse.data.d.results) {
+                            oData = oResponse.data.d.results;
+                        }
+                        else if (oResponse.data.d) {
+                            // Single data
+                            oData.push(oResponse.data.d);
+                        }
+                        else if (oResponse.data) {
+                            // Fallback Single data
+                            oData.push(oResponse.data);
                         }
                         else {
-                            if (Array.isArray(oResponse.data)) {
-                                oData = [].concat(oResponse.data);
-                            }
-                            else {
-                                console.error("The mock data could not be loaded due to wrong format!");
-                            }
+                            console.error("The mock data are invalid");
+                        }
+                    }
+                    else {
+                        if (Array.isArray(oResponse.data)) {
+                            oData = [].concat(oResponse.data);
+                        }
+                        else {
+                            console.error("The mock data could not be loaded due to wrong format!");
                         }
                     }
                 }
-                mockServerInst.setEntitySetData(entitySetName, oData);
-                done(oData);
-            }, mockServerPath, entitySetName, responseData);
-        });
+            }
+            mockServerInst.setEntitySetData(entitySetName, oData);
+            done(oData);
+        }, mockServerPath, entitySetName, responseData);
     }
     ;
 }