jsf.js_next_gen 4.0.0-RC.22 → 4.0.0-RC.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jsf.js_next_gen",
-  "version": "4.0.0-RC.22",
+  "version": "4.0.0-RC.25",
   "description": "A next generation typescript reimplementation of jsf.js",
   "main": "dist/window/faces.js",
   "scripts": {
@@ -48,6 +48,6 @@
     "webpack-dev-server": "^4.11.1"
   },
   "dependencies": {
-    "mona-dish": "^0.24.3"
+    "mona-dish": "^0.24.4"
   }
 }

package/src/main/typescript/impl/AjaxImpl.ts

@@ -48,13 +48,20 @@ import {
     P_WINDOW_ID,
     CTX_PARAM_RENDER,
     SOURCE,
-    HTML_TAG_FORM, CTX_OPTIONS_PARAMS, VIEW_ID, $faces, EMPTY_STR
+    HTML_TAG_FORM,
+    CTX_OPTIONS_PARAMS,
+    VIEW_ID,
+    $faces,
+    EMPTY_STR,
+    CTX_PARAM_MF_INTERNAL,
+    NAMED_VIEWROOT,
+    NAMING_CONTAINER_ID
 } from "./core/Const";
 import {
     resolveDefaults,
     resolveDelay,
     resolveForm,
-    resolveTimeout, resolveViewId
+    resolveTimeout, resolveViewId, resolveViewRootId, resoveNamingContainerMapper
 } from "./xhrCore/RequestDataResolver";
 
 /*
@@ -337,6 +344,7 @@ export module Implementation {
         assignClientWindowId(form, requestCtx);
         assignExecute(options, requestCtx, form, elementId);
         assignRender(options, requestCtx, form, elementId);
+        assignNamingContainerData(internalCtx, form);
 
         //now we enqueue the request as asynchronous runnable into our request
         //queue and let the queue take over the rest
@@ -522,7 +530,10 @@ export module Implementation {
             throw new Error(getMessage("ERR_VIEWSTATE"));
         }
 
-        let formData = new XhrFormData(element);
+        const dummyContext = new Config({});
+        assignNamingContainerData(dummyContext, DQ.byId(form))
+
+        let formData = new XhrFormData(element, resoveNamingContainerMapper(dummyContext));
         return formData.toString();
     }
 
@@ -603,6 +614,23 @@ export module Implementation {
         }
     }
 
+    /**
+     * determines the current naming container
+     * and assigns it internally
+     *
+     * @param internalContext
+     * @param formElement
+     * @private
+     */
+    function assignNamingContainerData(internalContext: Config, formElement: DQ) {
+        const viewRootId = resolveViewRootId(formElement);
+
+        if(!!viewRootId) {
+            internalContext.assign(NAMED_VIEWROOT).value = true;
+            internalContext.assign(NAMING_CONTAINER_ID).value = viewRootId;
+        }
+    }
+
     /**
      * transforms the user values to the expected one
      * with the proper none all form and this handling

package/src/main/typescript/impl/core/Const.ts

@@ -22,7 +22,7 @@ export const XML_ATTR_NAMED_VIEWROOT = "namedViewRoot";
 export const NAMED_VIEWROOT = "namedViewRoot";
 
 export const P_PARTIAL_SOURCE = "jakarta.faces.source";
-export const PARTIAL_ID = "partialId";
+export const NAMING_CONTAINER_ID = "myfaces.partialId";
 
 export const VIEW_ID = "myfaces.viewId";
 export const P_VIEWSTATE = "jakarta.faces.ViewState";

package/src/main/typescript/impl/xhrCore/IResponseProcessor.ts

@@ -149,4 +149,11 @@ export interface IResponseProcessor {
      * send last event
      */
     done(): void;
+
+    /**
+     * update internal state to
+     * check whether we still are in a named view root
+     * (can change after a navigation)
+     */
+    updateNamedViewRootState();
 }

package/src/main/typescript/impl/xhrCore/RequestDataResolver.ts

@@ -23,7 +23,7 @@ import {
     DELAY_NONE,
     EMPTY_FUNC,
     EMPTY_STR,
-    ENCODED_URL,
+    ENCODED_URL, NAMED_VIEWROOT, NAMING_CONTAINER_ID,
     P_VIEWSTATE,
     REQ_TYPE_GET,
     REQ_TYPE_POST
@@ -50,6 +50,7 @@ import {Assertions} from "../util/Assertions";
  * @param funcName
  */
 export function resolveHandlerFunc(requestContext: Config, responseContext: Config, funcName: string) {
+    responseContext = responseContext || new Config({});
     return responseContext.getIf(funcName)
         .orElseLazy(() =>requestContext.getIf(funcName).value)
         .orElse(EMPTY_FUNC).value;
@@ -89,6 +90,32 @@ export function resolveViewId(form: DQ): string {
     return form.id.value.indexOf(viewStateViewId) === 0 ? viewStateViewId : "";
 }
 
+export function resolveViewRootId(form: DQ): string {
+    const viewState = form.querySelectorAll(`input[type='hidden'][name*='${$nsp(P_VIEWSTATE)}']`).attr("name").orElse("").value;
+    const divider = $faces().separatorchar;
+    const viewId = viewState.split(divider, 2)[0];
+    //different to the identifier the form id is never prepended to the viewstate
+    return viewId.indexOf($nsp(P_VIEWSTATE)) === -1 ? viewId : "";
+}
+
+/**
+ * as per jsdoc before the request it must be ensured that every post argument
+ * is prefixed with the naming container id (there is an exception in mojarra with
+ * the element=element param, which we have to follow here as well.
+ * (inputs are prefixed by name anyway normally this only affects our standard parameters)
+ * @private
+ */
+export function resoveNamingContainerMapper(internalContext: Config): (key: string, value: any) => [string, any] {
+    const isNamedViewRoot = internalContext.getIf(NAMED_VIEWROOT).isPresent();
+    if(!isNamedViewRoot) {
+        return;
+    }
+    const partialId = internalContext.getIf(NAMING_CONTAINER_ID).value;
+    const SEP = $faces().separatorchar;
+    const prefix = partialId + SEP;
+    return (key: string, value: any) => (key.indexOf(prefix) == 0) ? [key, value] : [prefix + key, value];
+}
+
 export function resolveTimeout(options: Config): number {
     let getCfg = ExtLang.getLocalOrGlobalConfig;
     return options.getIf(CTX_OPTIONS_TIMEOUT).value ?? getCfg(options.value, CTX_OPTIONS_TIMEOUT, 0);

package/src/main/typescript/impl/xhrCore/Response.ts

@@ -32,11 +32,11 @@ import {
     P_VIEWBODY,
     P_VIEWHEAD,
     P_VIEWROOT,
-    PARTIAL_ID,
+    NAMING_CONTAINER_ID,
     XML_TAG_PARTIAL_RESP,
     RESPONSE_XML,
     XML_TAG_AFTER,
-    XML_TAG_BEFORE, NAMED_VIEWROOT, XML_ATTR_NAMED_VIEWROOT
+    XML_TAG_BEFORE, NAMED_VIEWROOT, XML_ATTR_NAMED_VIEWROOT, P_VIEWSTATE, $faces
 } from "../core/Const";
 import {resolveContexts, resolveResponseXML} from "./ResonseDataResolver";
 import {ExtConfig} from "../util/ExtDomQuery";
@@ -76,6 +76,7 @@ export module Response {
         // doing any evaluations even on embedded scripts.
         // Usually this does not matter, the client window comes in almost last always anyway
         // we maybe drop this deferred assignment in the future, but myfaces did it until now.
+        responseProcessor.updateNamedViewRootState();
         responseProcessor.fixViewStates();
         responseProcessor.fixClientWindow();
         responseProcessor.globalEval();
@@ -86,21 +87,25 @@ export module Response {
     /**
      * highest node partial-response from there the main operations are triggered
      */
-     function processPartialTag(node: XMLQuery, responseProcessor: IResponseProcessor, internalContext) {
-
-        let namedAttr = node.attr(XML_ATTR_NAMED_VIEWROOT);
-        // MyFaces.
-        // there are two differences here on how we determine the naming container scenario
-        // mojarra only partial reponse identifier, and if there is none we do not have any naming container
-        // myfaces either uses the reponse identifier
-        let namedViewRoot = namedAttr.isPresent() ?  namedAttr.value === "true" : false;
-        if(!namedAttr.isPresent() && node.id) { // defauts fallback if namedViewRoot is not set, if node id is set
-                                                // it defaults to a naming container
-            namedViewRoot = !(document?.head?.id);
-        }
+    function processPartialTag(node: XMLQuery, responseProcessor: IResponseProcessor, internalContext) {
+
+
+        /*
+        https://javaee.github.io/javaserverfaces/docs/2.2/javadocs/web-partialresponse.html#ns_xsd
+        The "partial-response" element is the root of the partial response information hierarchy,
+        and contains nested elements for all possible elements that can exist in the response.
+        This element must have an "id" attribute whose value is the return from calling getContainerClientId()
+        on the UIViewRoot to which this response pertains.
+         */
+        // we can determine whether we are in a naming container scenario by checking whether the passed view id is present in the page
+        // under or in body as identifier
 
-        internalContext.assignIf(node?.id ?? document?.head.id, PARTIAL_ID).value = node?.id ?? document?.head.id; // second case mojarra
-        internalContext.assign(NAMED_VIEWROOT).value = namedViewRoot;
+        let partialId:string = node?.id?.value;
+        internalContext.assignIf(!!partialId, NAMING_CONTAINER_ID).value = partialId; // second case mojarra
+
+        // there must be at least one container viewstate element resembling the viewroot that we know
+        // this is named
+        responseProcessor.updateNamedViewRootState();
 
         const SEL_SUB_TAGS = [XML_TAG_ERROR, XML_TAG_REDIRECT, XML_TAG_CHANGES].join(",");
 
@@ -122,12 +127,12 @@ export module Response {
     }
 
     let processInsert = function (responseProcessor: IResponseProcessor, node: XMLQuery) {
-         // path1 insert after as child tags
-         if(node.querySelectorAll([XML_TAG_BEFORE, XML_TAG_AFTER].join(",")).length) {
-             responseProcessor.insertWithSubTags(node);
-         } else { // insert before after with id
-             responseProcessor.insert(node);
-         }
+        // path1 insert after as child tags
+        if(node.querySelectorAll([XML_TAG_BEFORE, XML_TAG_AFTER].join(",")).length) {
+            responseProcessor.insertWithSubTags(node);
+        } else { // insert before after with id
+            responseProcessor.insert(node);
+        }
 
     };
 
@@ -137,7 +142,7 @@ export module Response {
      * @param node
      * @param responseProcessor
      */
-     function processChangesTag(node: XMLQuery, responseProcessor: IResponseProcessor): boolean {
+    function processChangesTag(node: XMLQuery, responseProcessor: IResponseProcessor): boolean {
         const ALLOWED_TAGS = [XML_TAG_UPDATE, XML_TAG_EVAL, XML_TAG_INSERT, XML_TAG_DELETE, XML_TAG_ATTRIBUTES, XML_TAG_EXTENSION].join(", ");
         node.querySelectorAll(ALLOWED_TAGS).each(
             (node: XMLQuery) => {
@@ -190,8 +195,8 @@ export module Response {
      * @param node
      * @param responseProcessor
      */
-     function processUpdateTag(node: XMLQuery, responseProcessor: IResponseProcessor) {
-         // early state storing, if no state we perform a normal update cycle
+    function processUpdateTag(node: XMLQuery, responseProcessor: IResponseProcessor) {
+        // early state storing, if no state we perform a normal update cycle
         if (!storeState(responseProcessor, node)) {
             handleElementUpdate(node, responseProcessor);
         }
@@ -203,7 +208,7 @@ export module Response {
      * @param node
      * @param responseProcessor
      */
-     function handleElementUpdate(node: XMLQuery, responseProcessor: IResponseProcessor) {
+    function handleElementUpdate(node: XMLQuery, responseProcessor: IResponseProcessor) {
         let cdataBlock = node.cDATAAsString;
         switch (node.id.value) {
             case $nsp(P_VIEWROOT) :

package/src/main/typescript/impl/xhrCore/ResponseProcessor.ts

@@ -50,7 +50,7 @@ import {
     P_RENDER,
     P_RENDER_OVERRIDE,
     P_VIEWSTATE,
-    PARTIAL_ID,
+    NAMING_CONTAINER_ID,
     RESPONSE_XML,
     SEL_CLIENT_WINDOW_ELEM,
     SEL_VIEWSTATE_ELEM,
@@ -348,8 +348,8 @@ export class ResponseProcessor implements IResponseProcessor {
     fixViewStates() {
         Stream.ofAssoc<StateHolder>(this.internalContext.getIf(APPLIED_VST).orElse({}).value)
             .each(([, value]) => {
-                const namingContainerId = this.internalContext.getIf(PARTIAL_ID);
-                const namedViewRoot = !!this.internalContext.getIf(PARTIAL_ID).value
+                const namingContainerId = this.internalContext.getIf(NAMING_CONTAINER_ID);
+                const namedViewRoot = !!this.internalContext.getIf(NAMED_VIEWROOT).value
                 const affectedForms = this.getContainerForms(namingContainerId)
                     .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
 
@@ -366,7 +366,7 @@ export class ResponseProcessor implements IResponseProcessor {
     fixClientWindow() {
         Stream.ofAssoc<StateHolder>(this.internalContext.getIf(APPLIED_CLIENT_WINDOW).orElse({}).value)
             .each(([, value]) => {
-                const namingContainerId = this.internalContext.getIf(PARTIAL_ID);
+                const namingContainerId = this.internalContext.getIf(NAMING_CONTAINER_ID);
                 const namedViewRoot = !!this.internalContext.getIf(NAMED_VIEWROOT).value;
                 const affectedForms = this.getContainerForms(namingContainerId)
                     .filter(affectedForm => this.isInExecuteOrRender(affectedForm));
@@ -375,6 +375,18 @@ export class ResponseProcessor implements IResponseProcessor {
             });
     }
 
+    updateNamedViewRootState() {
+        let partialId = this.internalContext.getIf(NAMING_CONTAINER_ID);
+        let namedViewRoot = this.internalContext.getIf(NAMED_VIEWROOT);
+        if(partialId.isPresent() &&
+            (namedViewRoot.isAbsent() ||
+                !namedViewRoot.value)) {
+            const SEP = $faces().separatorchar;
+            this.internalContext.assign(NAMED_VIEWROOT).value = (!!document.getElementById(partialId.value)) || DQ$(`input[name*='${$nsp(P_VIEWSTATE)}']`)
+                .filter(node => node.attr("name").value.indexOf(partialId.value + SEP) == 0).length > 0;
+        }
+    }
+
     /**
      * all processing done we can close the request and send the appropriate events
      */

package/src/main/typescript/impl/xhrCore/XhrFormData.ts

@@ -14,11 +14,14 @@
  * limitations under the License.
  */
 import {ArrayCollector, Config, DQ, Lang, LazyStream, Stream} from "mona-dish";
-import {EMPTY_STR, IDENT_ALL, IDENT_FORM, P_VIEWSTATE} from "../core/Const";
+import {$nsp, EMPTY_STR, IDENT_ALL, IDENT_FORM, P_VIEWSTATE} from "../core/Const";
 import isString = Lang.isString;
 import {ExtConfig, ExtDomQuery} from "../util/ExtDomQuery";
 
 
+type ParamsMapper<V, K> = (key: V, item: K) => [V, K];
+const defaultParamsMapper: ParamsMapper<string, any> = (key, item) => [key, item];
+
 /**
  * A unified form data class
  * which builds upon our configuration.
@@ -49,7 +52,7 @@ export class XhrFormData extends Config {
      * @param executes the executes id list for the elements to being processed
      * @param partialIds partial ids to collect, to reduce the data sent down
      */
-    constructor(private dataSource: DQ | string, viewState?: string, executes?: string[], private partialIds?: string[]) {
+    constructor(private dataSource: DQ | string, private paramsMapper: ParamsMapper<string, any> = defaultParamsMapper, viewState?: string, executes?: string[], private partialIds?: string[]) {
         super({});
         //a call to getViewState before must pass the encoded line
         //a call from getViewState passes the form element as datasource,
@@ -109,10 +112,10 @@ export class XhrFormData extends Config {
      * @param form the form holding the view state value
      */
     private applyViewState(form: DQ) {
-        let viewStateElement = form.querySelectorAllDeep(`[name*='${P_VIEWSTATE}'`);
+        let viewStateElement = form.querySelectorAllDeep(`[name*='${$nsp(P_VIEWSTATE)}'`);
         let viewState = viewStateElement.inputValue;
         // this.appendIf(viewState.isPresent(), P_VIEWSTATE).value = viewState.value;
-        this.appendIf(viewState.isPresent(), viewStateElement.name.value).value = viewState.value;
+        this.appendIf(viewState.isPresent(), this.remapKeyForNamingContainer(viewStateElement.name.value)).value = viewState.value;
     }
 
     /**
@@ -143,11 +146,11 @@ export class XhrFormData extends Config {
             return keyVal.length < 3 ? [keyVal?.[0] ?? [], keyVal?.[1] ?? []] : keyVal;
         }
 
-        //TODO fix files...
         Stream.of(...keyValueEntries)
             .map(line => splitToKeyVal(line))
             //special case of having keys without values
             .map(keyVal => fixKeyWithoutVal(keyVal))
+            .map(keyVal => this.paramsMapper(keyVal[0] as string, keyVal[1]))
             .each(keyVal => {
                 toMerge.append(keyVal[0] as string).value = keyVal?.splice(1)?.join("") ?? "";
             });
@@ -156,6 +159,7 @@ export class XhrFormData extends Config {
     }
 
     /**
+     * @param paramsMapper ... pre encode the params if needed, default is to map them 1:1
      * @returns a Form data representation, this is needed for file submits
      */
     toFormData(): FormData {
@@ -175,17 +179,18 @@ export class XhrFormData extends Config {
      *
      * @param defaultStr optional default value if nothing is there to encode
      */
-    toString(defaultStr = EMPTY_STR): string {
+    toString( defaultStr = EMPTY_STR): string {
         if (this.isAbsent()) {
             return defaultStr;
         }
         let entries = LazyStream.of(...Object.keys(this.value))
             .filter(key => this.value.hasOwnProperty(key))
-            .flatMap(key => Stream.of(...this.value[key]).map(val => [key, val])
-                //we cannot encode file elements that is handled by multipart requests anyway
-                .filter(([, value]) => !(value instanceof ExtDomQuery.global().File))
-                .collect(new ArrayCollector()))
-
+            .flatMap(key => Stream.of(...this.value[key])
+                .map(val => {
+                    return this.paramsMapper(key, val)
+                }))
+            //we cannot encode file elements that is handled by multipart requests anyway
+            .filter(([, value]) => !(value instanceof ExtDomQuery.global().File))
             .map(keyVal => {
                 return `${encodeURIComponent(keyVal[0])}=${encodeURIComponent(keyVal[1])}`;
             })
@@ -222,8 +227,7 @@ export class XhrFormData extends Config {
          *
          */
         this.encodeSubmittableFields(this, <DQ>this.dataSource, this.partialIds);
-
-        if (this.getIf(P_VIEWSTATE).isPresent()) {
+        if (this.getIf($nsp(P_VIEWSTATE)).isPresent()) {
             return;
         }
 
@@ -251,13 +255,31 @@ export class XhrFormData extends Config {
         }
 
         //lets encode the form elements
-        this.shallowMerge(toEncode.deepElements.encodeFormElement());
+        let formElements = toEncode.deepElements.encodeFormElement();
+        const mapped = this.remapKeysForNamingCoontainer(formElements);
+        this.shallowMerge(mapped);
+    }
+
+    private remapKeysForNamingCoontainer(formElements: Config): Config {
+        let ret = new Config({});
+        formElements.stream.map(([key, item]) => this.paramsMapper(key, item))
+            .each( ([key, item]) => {
+            ret.assign(key).value = item;
+        });
+        return ret;
+
+    }
+
+    private remapKeyForNamingContainer(key: string): string {
+        return this.paramsMapper(key, "")[0];
     }
 
     private appendInputs(ret: any) {
-        Stream.of(...Object.keys(this.value))
-            .each(key => {
-                Stream.of(...this.value[key]).each(item => ret.append(key, item));
-            });
+        Stream.ofAssoc(this.value)
+            .flatMap(([key, item]) =>
+                Stream.of(...(item as Array<any>)).map(item => {
+                    return {key, item};
+                }))
+            .each(({key, item}) => ret.append(key, item))
     }
 }

package/src/main/typescript/impl/xhrCore/XhrRequest.ts

@@ -15,7 +15,7 @@
  */
 
 import {AsyncRunnable} from "../util/AsyncRunnable";
-import {Config, DQ, Stream} from "mona-dish";
+import {Config, DQ, DQ$, Stream} from "mona-dish";
 import {Implementation} from "../AjaxImpl";
 
 import {XhrFormData} from "./XhrFormData";
@@ -23,7 +23,7 @@ import {ErrorData} from "./ErrorData";
 import {EventData} from "./EventData";
 import {ExtLang} from "../util/Lang";
 import {
-    $faces,
+    $faces, $nsp,
     BEGIN,
     COMPLETE,
     CONTENT_TYPE,
@@ -31,10 +31,10 @@ import {
     CTX_PARAM_REQ_PASS_THR,
     ERROR,
     HEAD_FACES_REQ,
-    MALFORMEDXML,
+    MALFORMEDXML, NAMED_VIEWROOT,
     NO_TIMEOUT,
     ON_ERROR,
-    ON_EVENT, P_EXECUTE, P_PARTIAL_SOURCE,
+    ON_EVENT, P_EXECUTE, P_PARTIAL_SOURCE, P_VIEWSTATE, NAMING_CONTAINER_ID,
     REQ_ACCEPT,
     REQ_TYPE_GET,
     REQ_TYPE_POST, SOURCE,
@@ -43,9 +43,15 @@ import {
     URL_ENCODED,
     VAL_AJAX
 } from "../core/Const";
-import {resolveFinalUrl, resolveHandlerFunc} from "./RequestDataResolver";
+import {
+    resolveFinalUrl,
+    resolveHandlerFunc,
+    resolveViewRootId,
+    resoveNamingContainerMapper
+} from "./RequestDataResolver";
 import failSaveExecute = ExtLang.failSaveExecute;
 import {ExtConfig} from "../util/ExtDomQuery";
+import {ResponseProcessor} from "./ResponseProcessor";
 
 /**
  * Faces XHR Request Wrapper
@@ -115,10 +121,11 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
         let executesArr = () => {
             return this.requestContext.getIf(CTX_PARAM_REQ_PASS_THR, P_EXECUTE).get("none").value.split(/\s+/gi);
         };
-        try {
 
+        try {
             let formElement = this.sourceForm.getAsElem(0).value;
             let viewState = $faces().getViewState(formElement);
+
             // encoded we need to decode
             // We generated a base representation of the current form
             // in case someone has overloaded the viewState with additional decorators we merge
@@ -128,7 +135,7 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
             // the partialIdsArray arr is almost deprecated legacy code where we allowed to send a separate list of partial
             // ids for reduced load and server processing, this will be removed soon, we can handle the same via execute
             // anyway TODO remove the partial ids array
-            let formData: XhrFormData = new XhrFormData(this.sourceForm, viewState, executesArr(), this.partialIdsArray);
+            let formData: XhrFormData = new XhrFormData(this.sourceForm, resoveNamingContainerMapper(this.internalContext), viewState, executesArr(), this.partialIdsArray);
 
             this.contentType = formData.isMultipartRequest ? "undefined" : this.contentType;
 
@@ -178,8 +185,9 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
             // setting, they accept headers automatically
             ignoreErr(() => xhrObject.setRequestHeader(REQ_ACCEPT, STD_ACCEPT));
 
-            this.sendEvent(BEGIN);
 
+
+            this.sendEvent(BEGIN);
             this.sendRequest(formData);
 
         } catch (e) {
@@ -374,4 +382,5 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
         Implementation.sendError(errorData, eventHandler);
     }
 
+
 }

package/src/main/typescript/test/xhrCore/FileUploadTest.spec.ts

@@ -66,6 +66,8 @@ describe('Tests on the xhr core when it starts to call the request', function ()
         const CONTENT_TYPE = "Content-Type";
         const POST = "POST";
 
+        global["debug_f"] = true;
+
         try {
 
             let button = DomQuery.byId("input_1");

package/src/main/typescript/test/xhrCore/NamespacesRequestTest.spec.ts

@@ -174,11 +174,11 @@ describe('Namespacing tests', function () {
             let resultsMap = {};
             for (let val of arsArr) {
                 let keyVal = val.split("=");
-                resultsMap[keyVal[0]] = keyVal[1];
+                resultsMap[unescape(keyVal[0])] = unescape(keyVal[1]);
             }
-
-            expect(resultsMap["pass1"]).to.eq("pass1");
-            expect(resultsMap["pass2"]).to.eq("pass2");
+            const NAMING_CONTAINER_PREF = "jd_0:";
+            expect(resultsMap[NAMING_CONTAINER_PREF + "pass1"]).to.eq("pass1");
+            expect(resultsMap[NAMING_CONTAINER_PREF + "pass2"]).to.eq("pass2");
             expect(!!resultsMap["render"]).to.be.false;
             expect(!!resultsMap["execute"]).to.be.false;
 
@@ -191,10 +191,10 @@ describe('Namespacing tests', function () {
             let viewState = Stream.ofAssoc(resultsMap).filter(data => data[0].indexOf(P_VIEWSTATE) != -1).map(item => item[1]).first().value;
 
             expect(viewState).to.eq("booga");
-            expect(resultsMap[P_PARTIAL_SOURCE]).to.eq(escape("jd_0:input_2"));
-            expect(resultsMap[P_AJAX]).to.eq("true");
-            expect(resultsMap[P_RENDER]).to.eq(escape("jd_0:blarg jd_0:input_2"));
-            expect(resultsMap[P_EXECUTE]).to.eq(escape("jd_0:input_1 jd_0:input_2"));
+            expect(resultsMap[NAMING_CONTAINER_PREF + P_PARTIAL_SOURCE]).to.eq("jd_0:input_2");
+            expect(resultsMap[NAMING_CONTAINER_PREF + P_AJAX]).to.eq("true");
+            expect(resultsMap[NAMING_CONTAINER_PREF + P_RENDER]).to.eq("jd_0:blarg jd_0:input_2");
+            expect(resultsMap[NAMING_CONTAINER_PREF + P_EXECUTE]).to.eq("jd_0:input_1 jd_0:input_2");
         } finally {
             send.restore();
         }

package/src/main/typescript/test/xhrCore/ResponseTest.spec.ts

@@ -225,7 +225,7 @@ describe('Tests of the various aspects of the response protocol functionality',
 
     });
 
-    it("must have updated the viewstates properly", function () {
+    it("must have updated the viewstates properly", function (done) {
         DQ.byId("cmd_eval").click();
         /*js full submit form, coming from the integration tests*/
         window.document.body.innerHTML = `<form id="j_id__v_0" name="j_id__v_0" method="post" action="/IntegrationJSTest/integrationtestsjasmine/test7-eventtest.jsf"
@@ -252,10 +252,11 @@ describe('Tests of the various aspects of the response protocol functionality',
             </changes>
         </partial-response>`);
 
-
-        expect(DQ$("[name*='jakarta.faces.ViewState']").isPresent()).to.be.true;
-
-        expect(DQ$("[name*='jakarta.faces.ViewState']").val == "RTUyRDI0NzE4QzAxM0E5RDAwMDAwMDVD").to.be.true;
+        setTimeout(() => {
+            expect(DQ$("[name*='jakarta.faces.ViewState']").isPresent()).to.be.true;
+            expect(DQ$("[name*='jakarta.faces.ViewState']").val == "RTUyRDI0NzE4QzAxM0E5RDAwMDAwMDVD").to.be.true;
+            done();
+        }, 100);
     });
 
 

package/src/main/typescript/test/xhrCore/ResponseTest23.spec.ts

@@ -228,7 +228,7 @@ describe('Tests of the various aspects of the response protocol functionality',
 
     });
 
-    it("must have updated the viewstates properly", function () {
+    it("must have updated the viewstates properly 2.3", function () {
         DQ.byId("cmd_eval").click();
         /*js full submit form, coming from the integration tests*/
         window.document.body.innerHTML = `<form id="j_id__v_0" name="j_id__v_0" method="post" action="/IntegrationJSTest/integrationtestsjasmine/test7-eventtest.jsf"
@@ -263,7 +263,7 @@ describe('Tests of the various aspects of the response protocol functionality',
     });
 
 
-    it("must have updated the viewstates properly with lenient update block", function () {
+    it("must have updated the viewstates properly with lenient update block 2.3", function () {
         DQ.byId("cmd_eval").click();
         /*js full submit form, coming from the integration tests*/
         window.document.body.innerHTML = `<form id="j_id__v_0" name="j_id__v_0" method="post" action="/IntegrationJSTest/integrationtestsjasmine/test7-eventtest.jsf"

package/src/main/typescript/test/xhrCore/XhrFormDataTest.spec.ts

@@ -84,6 +84,7 @@ describe('XhrFormData tests', function () {
       </div>
     </form>`;
 
+    global.debugf2=true;
     const xhrFormData = new XhrFormData(DQ.byId("page::form"));
     const formData = xhrFormData.toString();