npm - jsf.js_next_gen - Versions diffs - 1.0.0-beta-20 → 4.0.0-RC-1 - Mend

jsf.js_next_gen 1.0.0-beta-20 → 4.0.0-RC-1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (343) hide show

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

@@ -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
@@ -17,7 +17,9 @@
 import {DomQuery} from "mona-dish";
 declare let global;
+declare let faces: any;
 declare let jsf: any;
 declare let myfaces: any;
@@ -60,7 +62,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 +72,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 +83,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 +104,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 +112,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 +144,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">
@@ -175,21 +179,33 @@ export module StandardInits {
         <div id="attributeChange">attributes changes area</div>
+        <div id="resource_area_1"></div>
+        <div id="resource_area_2"></div>
+        <div id="resource_area_3"></div>
+        <div id="nonce_result"></div>
     </div>
     <h2>Call actions via normal ppr</h2>
     <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');"/>
         <input type="button" id="cmd_update_insert" value="update insert"
                onclick="emitPPR(this, ('undefined' == typeof event)? null: event, 'updateinsert1');"/>
+        <input type="button" id="cmd_simple_resource" value="simple resource"
+               onclick="emitPPR(this, ('undefined' == typeof event)? null: event, 'simpleresource');"/>
+        <input type="button" id="cmd_complex_resource" value="complex resource"
+               onclick="emitPPR(this, ('undefined' == typeof event)? null: event, 'complex_resource');"/>
+        <input type="button" id="cmd_complex_resource2" value="complex resource2"
+               onclick="emitPPR(this, ('undefined' == typeof event)? null: event, 'complex_resource2');"/>
         <input type="button" id="cmd_update_insert2" value="update insert second protocol path"
                onclick="emitPPR(this, ('undefined' == typeof event)? null: event, 'updateinsert2');"/>
@@ -213,7 +229,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="(window.faces || window.jsf).ajax.request(null, event, {}); return false"/>
     </form>
@@ -225,7 +241,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});
+            (window?.faces ?? window.jsf).ajax.request(/*String|Dom Node*/ source, /*|EVENT|*/ (window.event) ? window.event : event, /*{|OPTIONS|}*/ {op: action});
         }
     </script>
 </div>
@@ -254,13 +270,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 +298,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 +321,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 +356,27 @@ export module StandardInits {
         return import('jsdom-global').then((domIt) => {
             let params = {
                 contentType: "text/html",
-                runScripts: "dangerously"
+                runScripts: "dangerously",
+                resources: "usable",
+                url: `file://${__dirname}/index.html`
             };
             //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,9 +389,10 @@ 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;
     };
@@ -357,7 +402,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 +413,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 CHANGED Viewed

@@ -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>
@@ -170,5 +170,45 @@ export class XmlResponses {
 </partial-response>
 `;
+    static SIMPLE_RESOURCE_RESPONSE = `
+<partial-response>
+<changes>
+<update id="jakarta.faces.Resource">
+    <![CDATA[<script src="../../../xhrCore/fixtures/addedViewHead1.js"></script>]]>
+</update>
+</changes>
+</partial-response>
+`;
+    static MULTIPLE_RESOURCE_RESPONSE = `
+<partial-response id="j_id__v_0"><changes><update id="jakarta.faces.Resource">
+    <![CDATA[
+    <script src="../../../xhrCore/fixtures/addedViewHead2.js"></script>
+    <style type="text/css" rel="../../../xhrCore/fixtures/addedViewHead2.css"></style>
+    ]]>
+</update>
+</changes>
+</partial-response>
+`
+    static EMBEDDED_SCRIPTS_RESOURCE_RESPONSE = `
+<partial-response id="j_id__v_0"><changes><update id="jakarta.faces.Resource">
+    <![CDATA[
+        <script src="../../../xhrCore/fixtures/addedViewHead3.js"></script>
+        <style type="text/css" rel="../../../xhrCore/fixtures/addedViewHead2.css"></style>
+        <script type="text/javascript">
+            document.getElementById('resource_area_1').innerHTML = 'booga';
+        </script>
+    ]]>
+</update>
+</changes>
+</partial-response>
+`
+    static NONCE_REPLY = `
+    <partial-response><changes><update id='nonce_result'>
+    <![CDATA[<script nonce='test12d3' type='text/javascript' src='http://foobaz/nonce_script.js'></script>]]>
+    </update></changes></partial-response>
+    `;
     static ILLEGAL_RESP = `>>>> xxxx >YYYY-!->>>`;
 }

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

@@ -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
@@ -14,54 +14,50 @@
  * limitations under the License.
  */
-import {Config} from "mona-dish";
+import {Config, DomQuery} from "mona-dish";
 import {describe, it} from 'mocha';
 import {expect} from 'chai';
 import * as sinon from 'sinon';
-import {DomQuery} from "mona-dish";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
-import defaultMyFaces = StandardInits.defaultMyFaces;
 import {P_EXECUTE, P_RENDER} from "../../impl/core/Const";
+import defaultMyFaces = StandardInits.defaultMyFaces;
 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
+        const addRequestToQueue = sinon.stub(Implementation.queueHandler, "addRequestToQueue");
+        //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;
             expect(addRequestToQueue.callCount).to.eq(1);
-            const argElement = <Config>addRequestToQueue.args[0][2];
             const context = (<Config>addRequestToQueue.args[0][2]);
             expect(context.getIf("passThrgh", P_RENDER).value).eq("@all");
@@ -74,14 +70,14 @@ 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;
+        window.called = called;
         let func1 = () => {
             called["func1"] = true;
@@ -108,7 +104,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 +113,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;

package/src/main/typescript/test/impl/ImplTest_23.spec.ts ADDED Viewed

@@ -0,0 +1,129 @@
+/*! 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
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import {Config, DomQuery} from "mona-dish";
+import {describe, it} from 'mocha';
+import {expect} from 'chai';
+import * as sinon from 'sinon';
+import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
+import {P_EXECUTE, P_RENDER} from "../../impl/core/Const";
+import defaultMyFaces23 = StandardInits.defaultMyFaces23;
+sinon.reset();
+declare var jsf: any;
+declare var Implementation: any;
+/**
+ * testing the javax.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('javax.ajax.request test suite', () => {
+    beforeEach(async () => {
+        return await defaultMyFaces23();
+    });
+    it("jsf.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 addRequestToQueue = sinon.stub(Implementation.queueHandler, "addRequestToQueue");
+        //now the javax.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'})
+            }).click();
+            expect(addRequestToQueue.called).to.be.true;
+            expect(addRequestToQueue.callCount).to.eq(1);
+            const context = (<Config>addRequestToQueue.args[0][2]);
+            expect(context.getIf("passThrgh", P_RENDER).value).eq("@all");
+            //Execute issuing form due to @form and always the issuing element
+            expect(context.getIf("passThrgh", P_EXECUTE).value).eq("blarg input_2");
+        } finally {
+            //once done we restore the proper state
+            addRequestToQueue.restore();
+        }
+    });
+    it("javax.ajax.request passthroughs must end up in passthrough", (done) => {
+        //TODO implementation
+        done();
+    });
+    it("javax.util.chain must work", () => {
+        let called = {};
+        window.called = called;
+        let func1 = () => {
+            called["func1"] = true;
+            return true;
+        }
+        let func2 = `function func2(called) {
+            called["func2"] = true;
+            return true;
+        }`;
+        let func3 = () => {
+            called["func3"] = true;
+            return false;
+        }
+        let func4 = `return (function func4(called) {
+            called["func4"] = true;
+            return false;
+        })(event)`;
+        let func5 = () => {
+            called["func5"] = true;
+            return false;
+        };
+        window.jsf.util.chain(this, called, func1, func2, func3, func4, func5);
+        expect(called["func1"]).to.be.true;
+        expect(called["func2"]).to.be.true;
+        expect(!!called["func3"]).to.be.true;
+        expect(!!called["func4"]).to.be.false;
+        expect(!!called["func5"]).to.be.false;
+        called = {};
+        window.jsf.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;
+        expect(!!called["func5"]).to.be.false;
+    });
+});

package/src/main/typescript/test/impl/SeparatorCharsTest.spec.ts CHANGED Viewed

@@ -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
@@ -21,11 +21,9 @@ import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
 import defaultMyFaces = StandardInits.defaultMyFaces;
 import defaultSeparatorChar = StandardInits.defaultSeparatorChar;
-const jsdom = require("jsdom");
-const {JSDOM} = jsdom;
 sinon.reset();
-declare var jsf: any;
+declare var faces: any;
 declare var Implementation: any;
 describe('various tests for get separator char', () => {
@@ -35,7 +33,7 @@ describe('various tests for get separator char', () => {
         let waitForResult = defaultMyFaces();
         waitForResult.then((close) => {
             try {
-                let separator = jsf.separatorchar;
+                let separator = faces.separatorchar;
                 expect(separator).to.eq(":");
             } finally {
                 Implementation.reset();
@@ -47,12 +45,15 @@ describe('various tests for get separator char', () => {
     it("should have a custom separator char", (done) => {
-        let waitForResult = defaultSeparatorChar("$");
+        let waitForResult = defaultSeparatorChar("$", false);
         waitForResult.then((close) => {
             try {
                 let separator = Implementation.getSeparatorChar();
                 expect(separator).to.eq("$");
                 done();
+            } catch(ex) {
+                console.error(ex);
+                expect(false).to.eq(true);
             } finally {
                 Implementation.reset();
                 close();