jsf.js_next_gen 1.0.0-beta-19 → 4.0.0-beta-2

package/src/main/typescript/myfaces/OamSubmit.ts

@@ -14,10 +14,12 @@
  * limitations under the License.
  */
 
+import {DQ, Stream} from "mona-dish";
+
 /**
  * legacy code to enable various aspects
  * of myfaces, used to be rendered inline
- * for jsf 2.0 we can externalized it into its own custom resource
+ * for jsf 2.0 we can externalize it into its own custom resource
  *
  * note this is a straight 1:1 port from the existing codebase
  * (not too much work has been spent here, the important thing is, that
@@ -29,123 +31,88 @@ declare const window: any;
 declare const myfaces: any;
 
 export module oam {
-
     /**
      * sets a hidden input field
-     * @param formname the formName
+     * @param formName the formName
      * @param name the hidden field
      * @param value the value to be rendered
      */
-    export const setHiddenInput = function (formname, name, value) {
-        let form: HTMLFormElement = document.forms[formname];
-        if (typeof form == 'undefined') {
-            form = document.getElementById(formname) as HTMLFormElement;
-        }
-
-        if (typeof form.elements[name] != 'undefined' && (form.elements[name].nodeName == 'INPUT' || form.elements[name].nodeName == 'input')) {
-            (form.elements[name] as HTMLInputElement).value = value;
-        } else {
-            let newInput = document.createElement('input');
-            newInput.setAttribute('type', 'hidden');
-            newInput.setAttribute('id', name);
-            newInput.setAttribute('name', name);
-            newInput.setAttribute('value', value);
-            form.appendChild(newInput);
-        }
+    export const setHiddenInput = function (formName: string, name: string, value: string) {
+        DQ.byId(document.forms[formName])
+            .each(form => {
+                const input = form.querySelectorAll(`input[type='hidden'][name='${name}']`);
+                if (input.isPresent()) {
+                    input.inputValue.value = value;
+                } else {
+                    const newInput = DQ.fromMarkup(`<input type='hidden' id='${name}' name='${name}'>`);
+                    newInput.inputValue.value = value;
+                    newInput.appendTo(form);
+                }
+            });
     };
 
     /**
      * clears a hidden input field
      *
-     * @param formname formName for the input
+     * @param formName formName for the input
      * @param name the name of the input field
      */
-    export const clearHiddenInput = function (formname: string, name: string) {
-        let form: HTMLFormElement = document.forms[formname];
-
-        if (typeof form == 'undefined') {
-            form = document.getElementById(formname) as HTMLFormElement;
-        }
-
-        let hInput = form.elements[name];
-        if (typeof hInput != 'undefined') {
-            form.removeChild(hInput);
+    export const clearHiddenInput = function (formName: string, name: string) {
+        let element = document.forms?.[formName]?.elements?.[name];
+        if(!element) {
+            return;
         }
+        DQ.byId(element).delete();
     };
 
     // noinspection JSUnusedGlobalSymbols
     /**
      * does special form submit remapping
-     * remaps the issuing command link into something
-     * the decode of the command link on the server can understand
+     * re-maps the issuing command link into something,
+     * a decode of the command link on the server can understand
      *
      * @param formName
      * @param linkId
      * @param target
      * @param params
      */
-    export const submitForm = function (formName: string, linkId: string, target: HTMLElement, params: { [key: string]: any }) {
-
+    export const submitForm = function (formName: string, linkId: string, target: string, params: { [key: string]: any }) {
         let clearFn = 'clearFormHiddenParams_' + formName.replace(/-/g, '\$:').replace(/:/g, '_');
-        if (typeof window[clearFn] == 'function') {
-            window[clearFn](formName);
-        }
-
-        let form = document.forms[formName];
-        if (typeof form == 'undefined') {
-            form = document.getElementById(formName);
-        }
+        window?.[clearFn]?.(formName);
 
         //autoscroll code
-        if ((window as any)?.myfaces?.core?.config.autoScroll && typeof (window as any)?.getScrolling != 'undefined') {
+        if (window?.myfaces?.core?.config?.autoScroll && window?.getScrolling) {
             myfaces.oam.setHiddenInput(formName, 'autoScroll', window?.getScrolling());
         }
+        Stream.ofAssoc(params).each((param: [string, any]) => {
+            myfaces.oam.setHiddenInput(formName, param[0], param[1]);
+        });
 
-        let oldTarget = form.target;
-        if (target != null) {
-            form.target = target;
-        }
-        if ((typeof params != 'undefined') && params != null) {
-            for (let i = 0, param; (param = params[i]); i++) {
-                myfaces.oam.setHiddenInput(formName, param[0], param[1]);
-            }
+        //we call the namespaced function, to allow decoration, via a direct call we would
+        myfaces.oam.setHiddenInput(formName, `${formName}:_idcl`, linkId);
 
-        }
+        DQ.byId(document.forms[formName]).each(form => {
+            const ATTR_TARGET = "target";
+            const formElement = form.getAsElem(0).value as HTMLFormElement;
+            const oldTarget = form.attr(ATTR_TARGET).value;
+            form.attr(ATTR_TARGET).value = target;
 
-        myfaces.oam.setHiddenInput(formName, formName + ':' + '_idcl', linkId);
+            const result = formElement?.onsubmit?.(null);
 
-        if (form.onsubmit) {
-            let result = form.onsubmit();
-            if ((typeof result == 'undefined') || result) {
-                try {
-                    form.submit();
-                } catch (e) {
-                    if (window.console) {
-                        console.error(e);
-                    }
-                }
-            }
-
-        } else {
             try {
-                form.submit();
-            } catch (e) {
-                if (window.console) {
-                    console.error(e);
+                if ((!!result) || 'undefined' == typeof result) {
+                    formElement.submit();
                 }
+            } catch (e) {
+                window?.console.error(e);
             }
-        }
-
-        form.target = oldTarget;
-        if ((typeof params != 'undefined') && params != null) {
-
-            for (let i = 0, param; (param = params[i]); i++) {
-                myfaces.oam.clearHiddenInput(formName, param[0], param[1]);
-            }
-
-        }
 
-        myfaces.oam.clearHiddenInput(formName, formName + ':' + '_idcl', linkId);
+            form.attr(ATTR_TARGET).value = oldTarget;
+            Stream.ofAssoc(params).each((param: [string, any]) => {
+                myfaces.oam.clearHiddenInput(formName, param[0]);
+            });
+            myfaces.oam.clearHiddenInput(formName, `${formName}:_idcl`);
+        });
         return false;
     };
 }

package/src/main/typescript/test/frameworkBase/_ext/monadish/MonadTest.spec.ts

@@ -119,7 +119,6 @@ describe('Config tests', () => {
     it('array config', () => {
         let config = setup();
         config.assign("hello[5]", "world[3]", "from[5]").value = "me";
-        console.debug(JSON.stringify(config.toJson()));
         expect(config.getIf("hello[5]", "world[3]", "from[5]").value).to.be.eq("me");
         expect(config.value.hello[5].world[3].from[5]).to.be.eq("me");
         structure(config.value);
@@ -129,7 +128,6 @@ describe('Config tests', () => {
         let config = setup();
         config.assign("[5]", "world[3]", "from").value = "me";
         expect(config.getIf("[5]", "world[3]", "from").value).to.be.eq("me");
-        console.debug(JSON.stringify(config.toJson()));
         expect(config.value[5].world[3].from).to.be.eq("me");
         structureBroken(config.value);
     });
@@ -138,7 +136,6 @@ describe('Config tests', () => {
         let config = setup();
         config.assign("[5]", "[3]", "from").value = "me";
         expect(config.getIf("[5]", "[3]", "from").value).to.be.eq("me");
-        console.debug(JSON.stringify(config.toJson()));
         expect(config.value[5][3].from).to.be.eq("me");
         structureBroken(config.value);
     });
@@ -147,7 +144,6 @@ describe('Config tests', () => {
         let config = setup();
         config.assign("[5]", "[3]", "[2]").value = "me";
         expect(config.getIf("[5]", "[3]", "[2]").value).to.be.eq("me");
-        console.debug(JSON.stringify(config.toJson()));
         expect(config.value[5][3][2]).to.be.eq("me");
         structureBroken(config.value);
     });
@@ -156,7 +152,6 @@ describe('Config tests', () => {
         let config = setup();
         config.assign("[5]", "world[3]", "from[2]").value = "me";
         expect(config.getIf("[5]", "world[3]", "from[2]").value).to.be.eq("me");
-        console.debug(JSON.stringify(config.toJson()));
         expect(config.value[5].world[3].from[2]).to.be.eq("me");
         structureBroken(config.value);
     });

package/src/main/typescript/test/frameworkBase/_ext/shared/StandardInits.ts

@@ -16,9 +16,10 @@
 
 
 import {DomQuery} from "mona-dish";
+import {remapNamespacesFor23, remapNamespacesFor40} from "../../../../impl/core/Const";
 
 declare let global;
-declare let jsf: any;
+declare let faces: any;
 declare let myfaces: any;
 
 /**
@@ -60,7 +61,7 @@ export module StandardInits {
 <body>
 <form id="blarg">
     <input type="text" id="blarg:input_1" name="blarg:input_1" value="input_1_val"></input>
-    <input type="hidden" id="javax.faces.ViewState" name="javax.faces.ViewState" value="blubbblubblubb"></input>
+    <input type="hidden" id="jakarta.faces.ViewState" name="jakarta.faces.ViewState" value="blubbblubblubb"></input>
     <input type="button" id="blarg:input_2" name="blarg:input_2" value="input_1_val"></input>
     <div id="shadowDomArea">
             <input type="button" id="blarg:input_3" name="blarg:input_3" value="input_3_val"></input>
@@ -70,7 +71,7 @@ export module StandardInits {
 </html>`;
 
     /**
-     * a page simulating basically a simple jsf form
+     * a page simulating basically a simple faces form
      */
     const HTML_FORM_DEFAULT = `<!DOCTYPE html>
 <html lang="en">
@@ -81,14 +82,16 @@ export module StandardInits {
 <body>
 <form id="blarg">
     <input type="text" id="input_1" name="input_1" value="input_1_val"></input>
-    <input type="hidden" id="javax.faces.ViewState" name="javax.faces.ViewState" value="blubbblubblubb"></input>
+    <input type="hidden" id="jakarta.faces.ViewState" name="jakarta.faces.ViewState" value="blubbblubblubb"></input>
     <input type="button" id="input_2" name="input_2" value="input_1_val"></input>
 </form>
 </body>
 </html>`;
 
+
+
     /**
-     * a page simulating basically a simple jsf form
+     * a page simulating basically a simple faces form
      */
     const HTML_FILE_FORM_DEFAULT = `<!DOCTYPE html>
 <html lang="en">
@@ -100,7 +103,7 @@ export module StandardInits {
 <form id="blarg" enctype="multipart/form-data">
     <input type="file" id="fíleupload"></input>
     <input type="text" id="input_1" name="input_1" value="input_1_val"></input>
-    <input type="hidden" id="javax.faces.ViewState" name="javax.faces.ViewState" value="blubbblubblubb"></input>
+    <input type="hidden" id="jakarta.faces.ViewState" name="jakarta.faces.ViewState" value="blubbblubblubb"></input>
     <input type="button" id="input_2" name="input_2" value="input_1_val"></input>
 </form>
 </body>
@@ -108,21 +111,21 @@ export module StandardInits {
 
 
 
-    export const STD_XML = `<?xml version="1.0" encoding="utf-8"?><partial-response><changes><update id="value_1"><![CDATA[<span id="out1">2</span>]]></update><update id="javax.faces.ViewState"><![CDATA[j_id1:j_id3]]></update></changes></partial-response>`;
+    export const STD_XML = `<?xml version="1.0" encoding="utf-8"?><partial-response><changes><update id="value_1"><![CDATA[<span id="out1">2</span>]]></update><update id="jakarta.faces.ViewState"><![CDATA[j_id1:j_id3]]></update></changes></partial-response>`;
 
     /**
-     * a page containing a jsf.js input with a new separator char
+     * a page containing a faces.js input with a new separator char
      * @param separatorChar
      * @constructor
      */
-    function HTML_DEFAULT_SEPARATOR_CHAR(separatorChar: string) {
+    function HTML_DEFAULT_SEPARATOR_CHAR(separatorChar: string, IS_40=true) {
         return `<!DOCTYPE html>
 <html lang="en">
 <head>
     <meta charset="UTF-8">
     <title>Title</title>
     <script type="text/javascript"
-            src="/wfmportal/javax.faces.resource/jsf.js.jsf?ln=javax.faces&separator=${separatorChar}"></script>
+            src="/wfmportal/${IS_40 ? 'jakarta' : 'javax'}.faces.resource/${IS_40 ? 'faces': 'jsf'}.js.jsf?ln=jakarta.faces&separator=${separatorChar}"></script>
 </head>
 <body>
 <form id="blarg">
@@ -140,7 +143,7 @@ export module StandardInits {
      * testing the various aspects of the protocol
      * under pure html conditions
      *
-     * We get the jsf out of the way and bascially simulate what the browser sees
+     * We get the jsf out of the way and basically simulate what the browser sees
      */
     export const PROTOCOL_PAGE = `<!DOCTYPE html>
 <html lang="en">
@@ -183,7 +186,7 @@ export module StandardInits {
 
     <form id="form1" action="boog.html">
     
-        <input type="hidden" id="javax.faces.ViewState" name="javax.faces.ViewState" value="blubbblubblubb"></input>
+        <input type="hidden" id="jakarta.faces.ViewState" name="jakarta.faces.ViewState" value="blubbblubblubb"></input>
     
         <input type="button" id="cmd_eval" value="eval"
                onclick="emitPPR(this, ('undefined' == typeof event)? null: event, 'eval1');"/>
@@ -213,7 +216,7 @@ export module StandardInits {
                onclick="emitPPR(this, ('undefined' == typeof event)? null: event, 'errors');"/>
 
         <input type="button" id="cmd_error_component" value="Error: no component given"
-               onclick="jsf.ajax.request(null, event, {}); return false"/>
+               onclick="faces.ajax.request(null, event, {}); return false"/>
 
     </form>
 
@@ -223,11 +226,9 @@ export module StandardInits {
         var target = "./test.mockup";
 
         function emitPPR(source, event, action, useIframe, formName) {
-            debugger;
-            console.debug("emitting;");
             document.getElementById(formName || "form1").action = target;
 
-            jsf.ajax.request(/*String|Dom Node*/ source, /*|EVENT|*/ (window.event) ? window.event : event, /*{|OPTIONS|}*/ {op: action});
+            faces.ajax.request(/*String|Dom Node*/ source, /*|EVENT|*/ (window.event) ? window.event : event, /*{|OPTIONS|}*/ {op: action});
         }
     </script>
 </div>
@@ -256,13 +257,22 @@ export module StandardInits {
     export function defaultHtml(withJsf = true): Promise<() => void> {
         return init(HTML_DEFAULT, withJsf);
     }
+    export function defaultHtml_23(withJsf = true): Promise<() => void> {
+        return init(HTML_DEFAULT.replace(/jakarta/gi, "javax"), withJsf, false);
+    }
 
     export function defaultMyFaces(withJsf = true): Promise<() => void> {
         return init(HTML_FORM_DEFAULT, withJsf);
     }
+    export function defaultMyFaces23(withJsf = true): Promise<() => void> {
+        return init(HTML_FORM_DEFAULT.replace(/jakarta/gi, "javax"), withJsf, false);
+    }
     export function defaultFileForm(withJsf = true): Promise<() => void> {
         return init(HTML_FILE_FORM_DEFAULT, withJsf);
     }
+    export function defaultFileForm_23(withJsf = true): Promise<() => void> {
+        return init(HTML_FILE_FORM_DEFAULT.replace(/jakarta/gi, "javax"), withJsf, false);
+    }
 
     export function shadowDomMyFaces(withJsf = true): Promise<() => void> {
         return <Promise<() => void>>init(HTML_SHADOW, withJsf).then((close) => {
@@ -275,12 +285,12 @@ export module StandardInits {
         });
     }
 
-    export function protocolPage(withJsf = true): Promise<() => void> {
-        return <any>init(PROTOCOL_PAGE, withJsf);
+    export function protocolPage(withJsf = true, IS_40 = true): Promise<() => void> {
+        return <any>init((IS_40) ? PROTOCOL_PAGE : PROTOCOL_PAGE.replace(/jakarta/gi,"javax"), withJsf, IS_40);
     }
 
-    export function defaultSeparatorChar(separatorChar: string, withJsf = true): Promise<() => void> {
-        let template = HTML_DEFAULT_SEPARATOR_CHAR(separatorChar);
+    export function defaultSeparatorChar(separatorChar: string, withJsf = true, IS_40 = true): Promise<() => void> {
+        let template = HTML_DEFAULT_SEPARATOR_CHAR(separatorChar, IS_40);
         return init(template, withJsf);
     }
 
@@ -298,17 +308,31 @@ export module StandardInits {
      * @param Implementation
      */
     let applyJsfToGlobals = function (data, Implementation, PushImpl) {
+        (<any>global).faces = data.faces;
+        (<any>global).myfaces = data.myfaces;
+        (<any>global).window.faces = data.faces;
+        (<any>global).window.myfaces = data.myfaces;
+        (<any>global).Implementation = Implementation.Implementation;
+        (<any>global).PushImpl = PushImpl.PushImpl;
+        //bypass a bug on windows jsdom, domparser not an auto global but on window only
+        (<any>global).DOMParser = (<any>global)?.DOMParser ?? window.DOMParser;
+        (<any>global).document = (<any>global)?.document ?? window.document;
+    };
+
+    let applyJsfToGlobals23 = function (data, Implementation, PushImpl) {
         (<any>global).jsf = data.jsf;
         (<any>global).myfaces = data.myfaces;
         (<any>global).window.jsf = data.jsf;
         (<any>global).window.myfaces = data.myfaces;
         (<any>global).Implementation = Implementation.Implementation;
+        (<any>global).window.Implementation = Implementation.Implementation;
         (<any>global).PushImpl = PushImpl.PushImpl;
         //bypass a bug on windows jsdom, domparser not an auto global but on window only
         (<any>global).DOMParser = (<any>global)?.DOMParser ?? window.DOMParser;
         (<any>global).document = (<any>global)?.document ?? window.document;
     };
 
+
     /**
      * init the jsdom global
      * @param clean
@@ -317,22 +341,27 @@ export module StandardInits {
     let initJSDOM = async function (template: string) {
         // @ts-ignore
         return import('jsdom-global').then((domIt) => {
-            return domIt(template, {
+            let params = {
                 contentType: "text/html",
                 runScripts: "dangerously"
-            });
+            };
+            //we have two different apis depending whether we allow module interop with sinon or not
+            return (domIt?.default ?? domIt)?.(template, params) ;
         });
     };
 
     /**
      * init the jsf subsystem
      */
-    let initJSF = async function () {
+    let initJSF = async function (IS_40: boolean = true) {
         // @ts-ignore
-        return import("../../../../api/Jsf").then((data) => {
+
+        const facesImport = IS_40 ? import("../../../../api/faces") : import("../../../../api/jsf");
+
+        return facesImport.then((data) => {
             let Implementation = require("../../../../impl/AjaxImpl");
             let PushImpl = require("../../../../impl/PushImpl");
-            applyJsfToGlobals(data, Implementation, PushImpl);
+            IS_40 ? applyJsfToGlobals(data, Implementation, PushImpl): applyJsfToGlobals23(data, Implementation, PushImpl);
         }).catch(err => {
             console.error(err);
         });
@@ -345,10 +374,12 @@ export module StandardInits {
         (<any>global)?.Implementation?.reset();
         (<any>global)?.PushImpl?.reset();
 
-        delete (<any>global).jsf;
+        ((<any>global).faces) ? delete (<any>global).faces : null;
+        ((<any>global).jsf) ? delete (<any>global).jsf : null;
         delete (<any>global).myfaces;
-        delete (<any>global).Implementation;
+        ((<any>global).Implementation) ? delete (<any>global).Implementation : null;
         delete (<any>global).PushImpl;
+        remapNamespacesFor40();
     };
 
     /**
@@ -357,7 +388,7 @@ export module StandardInits {
      * @param template
      * @param withJsf
      */
-    async function init(template: string, withJsf = true): Promise<() => void> {
+    async function init(template: string, withJsf = true, IS_JSF_40 = true): Promise<() => void> {
         //let dom2 = new JSDOM(template)
         //return initMyFacesFromDom(dom2);
         let clean = null;
@@ -368,11 +399,11 @@ export module StandardInits {
             resetGlobals();
             // @ts-ignore
             await initJSDOM(template).then(data => clean = data);
-            await initJSF();
+            await initJSF(IS_JSF_40);
         } else {
             // @ts-ignore
             await import('jsdom-global').then((domIt) => {
-                clean = domIt(template);
+                clean = (domIt?.default ?? domIt)?.(template);
             });
         }
         //the async is returning a promise on the caller level

package/src/main/typescript/test/frameworkBase/_ext/shared/XmlResponses.ts

@@ -59,7 +59,7 @@ export class XmlResponses {
     static VIEWSTATE_1 = `
     <partial-response>
     <changes>
-        <update id="javax.faces.ViewState"><![CDATA[hello world]]></update>
+        <update id="jakarta.faces.ViewState"><![CDATA[hello world]]></update>
     </changes>
     </partial-response>
     `;
@@ -94,7 +94,7 @@ export class XmlResponses {
 
     static BODY_REPLACEMENT = `<partial-response>
     <changes>
-        <update id="javax.faces.ViewBody"><![CDATA[
+        <update id="jakarta.faces.ViewBody"><![CDATA[
             <body id="the_id" class="tundra">
             <div id='centerDiv'>
                 <h1>Test for body change done</h1>
@@ -121,7 +121,7 @@ export class XmlResponses {
 
     static HEAD_REPLACEMENT = `<partial-response>
     <changes>
-        <update id="javax.faces.ViewHead"><![CDATA[
+        <update id="jakarta.faces.ViewHead"><![CDATA[
             <head>
                 <meta blarg="blarg2"></meta>
                 <script type='text/javascript'>
@@ -137,7 +137,7 @@ export class XmlResponses {
 
     static VIEW_ROOT_REPLACEMENT = `<partial-response>
     <changes>
-        <update id="javax.faces.ViewRoot"><![CDATA[
+        <update id="jakarta.faces.ViewRoot"><![CDATA[
             <html>
             <head>
                 <meta blarg="blarg2"></meta>

package/src/main/typescript/test/impl/ImplTest.spec.ts

@@ -27,35 +27,35 @@ import {P_EXECUTE, P_RENDER} from "../../impl/core/Const";
 
 sinon.reset();
 
-declare var jsf: any;
+declare var faces: any;
 declare var Implementation: any;
 
 /**
- * testing the jsf.ajax.request api without triggering any
+ * testing the faces.ajax.request api without triggering any
  * xhr request...
  * the idea is to shim the code which triggers the request out and check what is going in
  * and what is coming out
  */
 
-describe('jsf.ajax.request test suite', () => {
+describe('faces.ajax.request test suite', () => {
 
-    beforeEach(() => {
-        return defaultMyFaces();
+    beforeEach(async () => {
+        return await defaultMyFaces();
     });
 
-    it("jsf.ajax.request can be called", () => {
+    it("faces.ajax.request can be called", () => {
         //we stub the addRequestToQueue, to enable the request check only
         //without any xhr and response, both will be tested separately for
         //proper behavior
         const Impl = Implementation;
         const addRequestToQueue = sinon.stub(Impl.queueHandler, "addRequestToQueue");
-        //now the jsf.ajax.request should trigger but should not go into
+        //now the faces.ajax.request should trigger but should not go into
         //the asynchronous event loop.
         //lets check it out
 
         try {
             DomQuery.byId("input_2").addEventListener("click", (event: Event) => {
-                jsf.ajax.request(null, event, {render: '@all', execute: '@form'})
+                faces.ajax.request(null, event, {render: '@all', execute: '@form'})
             }).click();
 
             expect(addRequestToQueue.called).to.be.true;
@@ -74,12 +74,12 @@ describe('jsf.ajax.request test suite', () => {
 
     });
 
-    it("jsf.ajax.request passthroughs must end up in passthrough", (done) => {
+    it("faces.ajax.request passthroughs must end up in passthrough", (done) => {
         //TODO implementation
         done();
     });
 
-    it("jsf.util.chain must work", () => {
+    it("faces.util.chain must work", () => {
         let called = {};
         (<any>window).called = called;
 
@@ -108,7 +108,7 @@ describe('jsf.ajax.request test suite', () => {
             return false;
         };
 
-        jsf.util.chain(this, called, func1, func2, func3, func4, func5);
+        faces.util.chain(this, called, func1, func2, func3, func4, func5);
 
         expect(called["func1"]).to.be.true;
         expect(called["func2"]).to.be.true;
@@ -117,7 +117,7 @@ describe('jsf.ajax.request test suite', () => {
         expect(!!called["func5"]).to.be.false;
 
         called = {};
-        jsf.util.chain(this, called, func1, func2, func4, func5);
+        faces.util.chain(this, called, func1, func2, func4, func5);
         expect(called["func1"]).to.be.true;
         expect(called["func2"]).to.be.true;
         expect(!!called["func4"]).to.be.true;