jsf.js_next_gen 1.0.0-beta-20 → 4.0.0-beta-4

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0
@@ -45,8 +45,8 @@ export module Response {
 
 
     /**
-     * Standardized jsf.js response
-     * this one is called straight from jsf.js.response
+     * Standardized faces.js response
+     * this one is called straight from faces.js.response
      *
      * The processing follows the spec by going for the responseXML
      * and processing its tags

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0
@@ -55,6 +55,8 @@ import {
 import trim = Lang.trim;
 import {ExtDomquery} from "../util/ExtDomQuery";
 
+declare const window: any;
+
 /**
  * Response processor
  *
@@ -438,7 +440,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * @returns true of it ii
      */
     private static isViewStateNode(node: XMLQuery): boolean {
-        let separatorChar = (<any>window).jsf.separatorchar;
+        let separatorChar = (window?.faces ?? window?.jsf).separatorchar;
         return "undefined" != typeof node?.id?.value && (node?.id?.value == P_VIEWSTATE ||
             node?.id?.value?.indexOf([separatorChar, P_VIEWSTATE].join(EMPTY_STR)) != -1 ||
             node?.id?.value?.indexOf([P_VIEWSTATE, separatorChar].join(EMPTY_STR)) != -1);
@@ -451,7 +453,7 @@ export class ResponseProcessor implements IResponseProcessor {
      * @returns true of it ii
      */
     private static isClientWindowNode(node: XMLQuery): boolean {
-        let separatorChar = (<any>window).jsf.separatorchar;
+        let separatorChar = (window?.faces ?? window?.jsf).separatorchar;
         return "undefined" != typeof node?.id?.value && (node?.id?.value == P_CLIENT_WINDOW ||
             node?.id?.value?.indexOf([separatorChar, P_CLIENT_WINDOW].join(EMPTY_STR)) != -1 ||
             node?.id?.value?.indexOf([P_CLIENT_WINDOW, separatorChar].join(EMPTY_STR)) != -1);

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0
@@ -24,7 +24,7 @@ import isString = Lang.isString;
  *
  * We cannot use standard html5 forms everywhere
  * due to api constraints on the HTML Form object in IE11
- * and due to the url encoding constraint given by the jsf.js spec
+ * and due to the url encoding constraint given by the faces.js spec
  *
  * probably only one needed and one overlay!
  * the entire file input storing probably is redundant now
@@ -201,7 +201,7 @@ export class XhrFormData extends Config {
         /*
          * Spec. 13.3.1
          * Collect and encode input elements.
-         * Additionally the hidden element javax.faces.ViewState
+         * Additionally the hidden element jakarta.faces.ViewState
          * Enhancement partial page submit
          *
          */

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0
@@ -46,7 +46,7 @@ import {resolveFinalUrl, resolveHandlerFunc} from "./RequestDataResolver";
 import failSaveExecute = ExtLang.failSaveExecute;
 
 /**
- * JSFed XHR Request Wrapper
+ * Faces XHR Request Wrapper
  * as Asyncrunnable for our Asynchronous queue
  *
  * The idea is that we basically just enqueue
@@ -54,8 +54,7 @@ import failSaveExecute = ExtLang.failSaveExecute;
  * and let the queue do the processing.
  *
  */
-
-declare let jsf: any;
+declare const window: any;
 
 export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
 
@@ -118,7 +117,7 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
         try {
 
             let formElement = this.sourceForm.getAsElem(0).value;
-            let viewState = jsf.getViewState(formElement);
+            let viewState = (window?.faces ?? window?.jsf).getViewState(formElement);
             //encoded we need to decode
             //We generated a base representation of the current form
             //in case someone has overloaded the viewstate with addtional decorators we merge
@@ -275,7 +274,7 @@ export class XhrRequest implements AsyncRunnable<XMLHttpRequest> {
             return;
         }
 
-        jsf.ajax.response(this.xhrObject, this.responseContext.value ?? {});
+        (window?.faces ?? window.jsf).ajax.response(this.xhrObject, this.responseContext.value ?? {});
     }
 
     private handleMalFormedXML(resolve: Function) {

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0
@@ -30,7 +30,6 @@ import {DQ, Stream} from "mona-dish";
 declare const window: any;
 declare const myfaces: any;
 
-//TODO add unit tests to check all this here that it works just as before
 export module oam {
     /**
      * sets a hidden input field

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

@@ -1,6 +1,6 @@
 // noinspection HtmlUnknownAttribute
 
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0

package/src/main/typescript/test/frameworkBase/_ext/monadish/MappingProbes.ts

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0

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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0
@@ -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>
 
@@ -225,7 +228,7 @@ export module StandardInits {
         function emitPPR(source, event, action, useIframe, formName) {
             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>
@@ -254,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) => {
@@ -273,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);
     }
 
@@ -296,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
@@ -320,19 +346,22 @@ export module StandardInits {
                 runScripts: "dangerously"
             };
             //we have two different apis depending whether we allow module interop with sinon or not
-            return domIt?.default?.(template, params) ?? domIt?.(template, params);
+            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

@@ -1,4 +1,4 @@
-/* Licensed to the Apache Software Foundation (ASF) under one or more
+/*! Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to you under the Apache License, Version 2.0
@@ -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;