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

package/src/main/typescript/test/myfaces/OamSubmit.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
@@ -15,22 +15,20 @@
  */
 
 import {describe, it} from "mocha";
-import * as sinon from "sinon";
+
 import {expect} from "chai";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
 import defaultMyFaces = StandardInits.defaultMyFaces;
+import {oam} from "../../myfaces/OamSubmit";
+import setHiddenInput = oam.setHiddenInput;
+import {DomQuery} from "mona-dish";
+import clearHiddenInput = oam.clearHiddenInput;
+import submitForm = oam.submitForm;
+import Sinon from "sinon";
 
-declare var jsf: any;
-declare var Implementation: any;
 
-let issueStdReq = function (element) {
-    jsf.ajax.request(element, null, {
-        execute: "input_1",
-        render: "@form",
-        pass1: "pass1",
-        pass2: "pass2"
-    });
-};
+declare var myfaces: any;
+
 /**
  * specialized tests testing the xhr core behavior when it hits the xmlHttpRequest object
  */
@@ -38,13 +36,97 @@ describe('Tests on the xhr core when it starts to call the request', function ()
 
     beforeEach(() => {
         return defaultMyFaces();
-    });
+    })
 
     it('namespace must exist', function() {
-        expect(!!global?.myfaces?.oam).to.eq(true);
-        expect(!!global?.myfaces?.oam?.setHiddenInput).to.eq(true);
-        expect(!!global?.myfaces?.oam?.clearHiddenInput).to.eq(true);
-        expect(!!global?.myfaces?.oam?.submitForm).to.eq(true);
+        expect(!!myfaces?.oam).to.eq(true);
+        expect(!!myfaces?.oam?.setHiddenInput).to.eq(true);
+        expect(!!myfaces?.oam?.clearHiddenInput).to.eq(true);
+        expect(!!myfaces?.oam?.submitForm).to.eq(true);
     });
+
+    it('hidden input setting must work', function() {
+        let FORM_ID = "blarg";
+        setHiddenInput(FORM_ID, "new_hidden", "hiddenvalue");
+        expect(DomQuery.byId(FORM_ID).querySelectorAll("input[name='new_hidden']").isPresent());
+        expect(DomQuery.byId(FORM_ID).querySelectorAll("input[name='new_hidden']").inputValue.value).to.eq("hiddenvalue");
+    })
+
+    it('resetting the hidden input must work', function() {
+        let FORM_ID = "blarg";
+        setHiddenInput(FORM_ID, "new_hidden", "hiddenvalue");
+        clearHiddenInput(FORM_ID, "new_hidden");
+        expect(DomQuery.byId(FORM_ID).querySelectorAll("input[name='new_hidden']").isAbsent()).to.eq(true);
+    })
+
+    it('submit form must work', function() {
+        let FORM_ID = "blarg";
+        let form = DomQuery.byId(FORM_ID);
+        const submit_spy = Sinon.spy(() => {
+            expect(form.querySelectorAll('input[name=\'booga1\']').isPresent()).to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga1\']').length == 1).to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga1\']').inputValue.value == 'val_booga1').to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga2\']').isPresent()).to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga2\']').length == 1).to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga2\']').inputValue.value == 'val_booga2').to.eq(true);
+            expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).isPresent()).to.eq(true);
+            expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).length == 1).to.eq(true);
+            expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).inputValue.value == 'mylink').to.eq(true);
+            expect(form.attr("target").value).to.eq('target1');
+        });
+        (form.value.value as any).submit = submit_spy;
+
+
+        submitForm(FORM_ID, 'mylink', 'target1', {
+            booga1: "val_booga1",
+            booga2: "val_booga2"
+        });
+
+        expect(submit_spy.called).to.eq(true);
+        form = DomQuery.byId(FORM_ID);
+        expect(form.querySelectorAll('input[name=\'booga1\']').isAbsent()).to.eq(true);
+        expect(form.querySelectorAll('input[name=\'booga2\']').isAbsent()).to.eq(true);
+        expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).isAbsent()).to.eq(true);
+
+    })
+
+    it('onsubmit form must work', function() {
+        let FORM_ID = "blarg";
+        let form = DomQuery.byId(FORM_ID);
+        const onsumbit = () => {
+            expect(form.querySelectorAll('input[name=\'booga1\']').isPresent()).to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga1\']').length == 1).to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga1\']').inputValue.value == 'val_booga1').to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga2\']').isPresent()).to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga2\']').length == 1).to.eq(true);
+            expect(form.querySelectorAll('input[name=\'booga2\']').inputValue.value == 'val_booga2').to.eq(true);
+            expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).isPresent()).to.eq(true);
+            expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).length == 1).to.eq(true);
+            expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).inputValue.value == 'mylink').to.eq(true);
+            expect(form.attr("target").value).to.eq('target1');
+            return false;
+        }
+        const os_spy = Sinon.spy(onsumbit);
+        const submit_spy = Sinon.spy(() => {});
+        (form.value.value as any).onsubmit = os_spy;
+        (form.value.value as any).submit = submit_spy;
+
+
+        submitForm(FORM_ID, 'mylink', 'target1', {
+            booga1: "val_booga1",
+            booga2: "val_booga2"
+        });
+
+        //we also have to interceot onsbumit
+        expect(os_spy.called).to.eq(true);
+        expect(submit_spy.called).to.eq(false);
+
+        form = DomQuery.byId(FORM_ID);
+        expect(form.querySelectorAll('input[name=\'booga1\']').isAbsent()).to.eq(true);
+        expect(form.querySelectorAll('input[name=\'booga2\']').isAbsent()).to.eq(true);
+        expect(form.querySelectorAll(`input[name='${FORM_ID}:_idcl']`).isAbsent()).to.eq(true);
+        // expect(submit_spy.called).to.eq(true);
+    })
+
     // further tests will follow if needed, for now the namespace must be restored
 });

package/src/main/typescript/test/queue/AsynchronousProbe.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/queue/AsynchronousQueueTest.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
@@ -38,12 +38,12 @@ describe('Asynchronous Queue tests', () => {
                 this.requests.push(xhr);
             };
             (<any>global).XMLHttpRequest = this.xhr;
-            (<any>window).XMLHttpRequest = this.xhr;
+            window.XMLHttpRequest = this.xhr;
 
-            this.jsfAjaxResponse = sinon.stub((<any>global).jsf.ajax, "response");
+            this.jsfAjaxResponse = sinon.stub((<any>global).faces.ajax, "response");
 
             this.closeIt = () => {
-                (<any>global).XMLHttpRequest = (<any>window).XMLHttpRequest = this.xhr.restore();
+                (<any>global).XMLHttpRequest = window.XMLHttpRequest = this.xhr.restore();
                 this.jsfAjaxResponse.restore();
                 Implementation.reset();
                 close();

package/src/main/typescript/test/xhrCore/EventTests.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
@@ -24,10 +24,11 @@ import protocolPage = StandardInits.protocolPage;
 import {DQ} from "mona-dish";
 import {XmlResponses} from "../frameworkBase/_ext/shared/XmlResponses";
 
-declare var jsf: any;
+declare var faces: any;
 
 describe('tests the addOnEvent and addOnError handling', function () {
 
+    // noinspection DuplicatedCode
     beforeEach(async function () {
         let waitForResult = protocolPage();
         return waitForResult.then((close) => {
@@ -36,7 +37,7 @@ describe('tests the addOnEvent and addOnError handling', function () {
             this.requests = [];
 
             this.respond = (response: string): XMLHttpRequest => {
-                let xhrReq = this.requests.shift();
+                let xhrReq = (this.requests as Array<any>).shift();
                 xhrReq.responsetype = "text/xml";
                 xhrReq.respond(200, {'Content-Type': 'text/xml'}, response);
                 return xhrReq;
@@ -46,10 +47,10 @@ describe('tests the addOnEvent and addOnError handling', function () {
                 this.requests.push(xhr);
             };
             (<any>global).XMLHttpRequest = this.xhr;
-            (<any>window).XMLHttpRequest = this.xhr;
+            window.XMLHttpRequest = this.xhr;
 
             this.closeIt = () => {
-                (<any>global).XMLHttpRequest = (<any>window).XMLHttpRequest = this.xhr.restore();
+                (<any>global).XMLHttpRequest = window.XMLHttpRequest = this.xhr.restore();
                 Implementation.reset();
                 close();
             }
@@ -59,18 +60,11 @@ describe('tests the addOnEvent and addOnError handling', function () {
     afterEach(function () {
         this.closeIt();
     });
-
-    let allowedStati = {
-        "begin": true,
-        "complete": true,
-        "success": true,
-    };
-
     it("must have a global add on event call with all three phases passed", function () {
         let onEventCalled1 = 0;
         let onEventCalled2 = 0;
 
-        jsf.ajax.addOnEvent((data: any) => {
+        faces.ajax.addOnEvent((data: any) => {
             onEventCalled1++;
             if (onEventCalled1 == 1 && data.status != "begin") {
                 throw ("Wrong status")
@@ -82,11 +76,10 @@ describe('tests the addOnEvent and addOnError handling', function () {
                 throw ("Wrong status")
             }
         });
-        jsf.ajax.addOnEvent((data: any) => {
+        faces.ajax.addOnEvent(() => {
             onEventCalled2++;
-
         });
-        let issuer = DQ.byId("cmd_update_insert").click();
+        DQ.byId("cmd_update_insert").click();
         this.respond(XmlResponses.UPDATE_INSERT_1);
 
         expect(onEventCalled1).to.eq(3);
@@ -99,17 +92,17 @@ describe('tests the addOnEvent and addOnError handling', function () {
 
         let errorTitle = '';
         let errorMessage = '';
-        jsf.ajax.addOnError((data: any) => {
+        faces.ajax.addOnError((data: any) => {
             errorTitle = data.errorName;
             errorMessage = data.errorMessage;
             onErrorCalled1++
         });
-        jsf.ajax.addOnError((data: any) => {
+        faces.ajax.addOnError(() => {
             onErrorCalled2++;
         });
 
         //cmd_error_component
-        let issuer = DQ.byId("cmd_error_component").click();
+        DQ.byId("cmd_error_component").click();
         this.respond(XmlResponses.ERROR_2);
 
         expect(onErrorCalled1).to.eq(1);
@@ -119,21 +112,20 @@ describe('tests the addOnEvent and addOnError handling', function () {
     });
 
     it("must have an id set if there is an emitting element", function () {
-        let onEventCalled1 = 0;
         let onEventCalled2 = 0;
 
         let assertSourceExists = (data: any) => {
             expect(!!data?.source?.id).to.be.true;
         }
 
-        jsf.ajax.addOnEvent((data: any) => {
+        faces.ajax.addOnEvent((data: any) => {
             assertSourceExists(data);
         });
-        jsf.ajax.addOnEvent((data: any) => {
+        faces.ajax.addOnEvent(() => {
             onEventCalled2++;
 
         });
-        let issuer = DQ.byId("cmd_update_insert").click();
+        DQ.byId("cmd_update_insert").click();
         this.respond(XmlResponses.UPDATE_INSERT_1);
 
     });

package/src/main/typescript/test/xhrCore/FakeWebsocket.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
@@ -19,14 +19,14 @@ export class FakeWebsocket {
     onmessage: Function = () => {}
     onclose: Function = () => {}
 
-    constructor(data?: any) {
+    constructor() {
         setTimeout(() => {
             this.onopen();
         }, 10);
     }
 
 
-    send(msg: any) {
+    send() {
     }
 
     _respond(response: any) {

package/src/main/typescript/test/xhrCore/FileUploadTest.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
@@ -18,33 +18,10 @@ import * as sinon from "sinon";
 import {expect} from "chai";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
 import {DomQuery} from "mona-dish";
-import {
-    COMPLETE,
-    P_AJAX,
-    P_EXECUTE,
-    P_PARTIAL_SOURCE,
-    P_RENDER,
-    P_VIEWSTATE,
-    P_WINDOW_ID,
-    SUCCESS
-} from "../../impl/core/Const";
-import defaultMyFaces = StandardInits.defaultMyFaces;
-import STD_XML = StandardInits.STD_XML;
 import defaultFileForm = StandardInits.defaultFileForm;
 import {Implementation} from "../../impl/AjaxImpl";
 
-declare var jsf: any;
-declare var Impl
-
-
-let issueStdReq = function (element) {
-    jsf.ajax.request(element, null, {
-        execute: "input_1",
-        render: "@form",
-        pass1: "pass1",
-        pass2: "pass2"
-    });
-};
+declare var faces: any;
 
 /**
  * specialized tests testing the xhr core behavior when it hits the xmlHttpRequest object
@@ -69,10 +46,10 @@ describe('Tests on the xhr core when it starts to call the request', function ()
                 this.requests.push(xhr);
             };
             (<any>global).XMLHttpRequest = this.xhr;
-            (<any>window).XMLHttpRequest = this.xhr;
+            window.XMLHttpRequest = this.xhr;
 
             this.closeIt = () => {
-                (<any>global).XMLHttpRequest = (<any>window).XMLHttpRequest = this.xhr.restore();
+                (<any>global).XMLHttpRequest = window.XMLHttpRequest = this.xhr.restore();
                 Implementation.reset();
                 close();
             }
@@ -87,7 +64,6 @@ describe('Tests on the xhr core when it starts to call the request', function ()
     it('must have sent a form multipart request', function (done) {
         let send = sinon.spy(XMLHttpRequest.prototype, "send");
         const CONTENT_TYPE = "Content-Type";
-        const MULTIPART_FORM = "multipart/form-data";
         const POST = "POST";
 
         try {
@@ -95,7 +71,7 @@ describe('Tests on the xhr core when it starts to call the request', function ()
             let button = DomQuery.byId("input_1");
 
             button.addEventListener("click", (event: Event) => {
-                jsf.ajax.request(event.target, event, {render: '@all', execute: '@form'})
+                faces.ajax.request(event.target, event, {render: '@all', execute: '@form'})
             }).click();
             //this.resonse("ok");
 
@@ -119,14 +95,13 @@ describe('Tests on the xhr core when it starts to call the request', function ()
         let send = sinon.spy(XMLHttpRequest.prototype, "send");
 
         const CONTENT_TYPE = "Content-Type";
-        const MULTIPART_FORM = "multipart/form-data";
         const POST = "POST";
 
         try {
             let button = DomQuery.byId("input_1");
 
             button.addEventListener("click", (event: Event) => {
-                jsf.ajax.request(event.target, event, {render: '@all', execute: 'input_1 fíleupload'})
+                faces.ajax.request(event.target, event, {render: '@all', execute: 'input_1 fíleupload'})
             }).click();
             //this.resonse("ok");
 
@@ -157,7 +132,7 @@ describe('Tests on the xhr core when it starts to call the request', function ()
             let button = DomQuery.byId("input_1");
 
             button.addEventListener("click", (event: Event) => {
-                jsf.ajax.request(event.target, event, {render: '@all', execute: 'input_1 fileupload'});
+                faces.ajax.request(event.target, event, {render: '@all', execute: 'input_1 fileupload'});
             }).click();
 
             expect(this.requests.length).to.eq(1);

package/src/main/typescript/test/xhrCore/RequestParamsTest.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
@@ -16,43 +16,22 @@
 import * as sinon from "sinon";
 import {Implementation} from "../../impl/AjaxImpl";
 import {StandardInits} from "../frameworkBase/_ext/shared/StandardInits";
-import defaultMyFaces = StandardInits.defaultMyFaces;
+
 import protocolPage = StandardInits.protocolPage;
 import {DQ} from "mona-dish";
 import {XhrFormData} from "../../impl/xhrCore/XhrFormData";
 import { expect } from "chai";
 
 describe("test for proper request param patterns identical to the old implementation", function () {
-    const DELETE_PATTERN = {
-        op: "delete1",
-        "javax.faces.source": "cmd_delete",
-        "javax.faces.partial.event": "click",
-        "javax.faces.partial.ajax": "true",
-        "javax.faces.partial.execute": "cmd_delete",
-        "form1": "form1",
-        "javax.faces.ViewState": "blubbblubblubb"
-    }
-
     const UPDATE_INSERT_2 = {
         "op": "updateinsert2",
-        "javax.faces.partial.event": "click",
-        "javax.faces.source": "cmd_update_insert2",
-        "javax.faces.partial.ajax": "true",
-        "javax.faces.partial.execute": "cmd_update_insert2",
+        "jakarta.faces.partial.event": "click",
+        "jakarta.faces.source": "cmd_update_insert2",
+        "jakarta.faces.partial.ajax": "true",
+        "jakarta.faces.partial.execute": "cmd_update_insert2",
         "form1": "form1",
-        "javax.faces.ViewState": "blubbblubblubb"
+        "jakarta.faces.ViewState": "blubbblubblubb"
     }
-
-    const ERRORS = {
-        "op": "errors",
-        "javax.faces.partial.event": "click",
-        "javax.faces.source": "cmd_error",
-        "javax.faces.partial.ajax": "true",
-        "javax.faces.partial.execute": "cmd_error",
-        "form1": "form1",
-        "javax.faces.ViewState": "blubbblubblubb"
-    }
-
     /**
      * matches two maps for absolute identicality
      */
@@ -81,12 +60,12 @@ describe("test for proper request param patterns identical to the old implementa
                 this.requests.push(xhr);
             };
             (<any>global).XMLHttpRequest = this.xhr;
-            (<any>window).XMLHttpRequest = this.xhr;
+            window.XMLHttpRequest = this.xhr;
 
-            this.jsfAjaxResponse = sinon.stub((<any>global).jsf.ajax, "response");
+            this.jsfAjaxResponse = sinon.stub((<any>global).faces.ajax, "response");
 
             this.closeIt = () => {
-                (<any>global).XMLHttpRequest = (<any>window).XMLHttpRequest = this.xhr.restore();
+                (<any>global).XMLHttpRequest = window.XMLHttpRequest = this.xhr.restore();
                 this.jsfAjaxResponse.restore();
                 Implementation.reset();
                 close();
@@ -111,37 +90,37 @@ describe("test for proper request param patterns identical to the old implementa
 
     it("must handle base64 encoded strings properly as request data", function() {
         let probe = "YWFhYWFhc1Rlc3RpdCDDpGtvNDU5NjczMDA9PSsrNDU5MGV3b3UkJiUmLyQmJQ==";
-        DQ.byId("javax.faces.ViewState").inputValue.value = probe;
+        DQ.byId("jakarta.faces.ViewState").inputValue.value = probe;
         DQ.byId("cmd_update_insert2").click();
         let requestBody = this.requests[0].requestBody;
         //We check if the base64 encoded string matches the original
         let formData = new XhrFormData(requestBody);
 
-        expect(decodeURIComponent(formData.getIf("javax.faces.ViewState").value) == probe).to.be.true;
+        expect(decodeURIComponent(formData.getIf("jakarta.faces.ViewState").value) == probe).to.be.true;
     });
 
 
     it("must handle empty parameters properly", function() {
         let probe = "";
-        DQ.byId("javax.faces.ViewState").inputValue.value = probe;
+        DQ.byId("jakarta.faces.ViewState").inputValue.value = probe;
         DQ.byId("cmd_update_insert2").click();
         let requestBody = this.requests[0].requestBody;
         //We check if the base64 encoded string matches the original
         let formData = new XhrFormData(requestBody);
 
-        expect(decodeURIComponent(formData.getIf("javax.faces.ViewState").value) == probe).to.be.true;
+        expect(decodeURIComponent(formData.getIf("jakarta.faces.ViewState").value) == probe).to.be.true;
     });
 
     //KssbpZfCe+0lwDhgMRQ44wRFkaM1o1lbMMUO3lini5YhXWm6
 
     it("must handle base64 special cases properly (+ in encoding)", function() {
         let probe = "KssbpZfCe+0lwDhgMRQ44wRFkaM1o1lbMMUO3lini5YhXWm6";
-        DQ.byId("javax.faces.ViewState").inputValue.value = probe;
+        DQ.byId("jakarta.faces.ViewState").inputValue.value = probe;
         DQ.byId("cmd_update_insert2").click();
         let requestBody = this.requests[0].requestBody;
         //We check if the base64 encoded string matches the original
         let formData = new XhrFormData(requestBody);
 
-        expect(decodeURIComponent(formData.getIf("javax.faces.ViewState").value) == probe).to.be.true;
+        expect(decodeURIComponent(formData.getIf("jakarta.faces.ViewState").value) == probe).to.be.true;
     });
 });

package/src/main/typescript/test/xhrCore/RequestTest.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
@@ -32,11 +32,11 @@ import {
 import defaultMyFaces = StandardInits.defaultMyFaces;
 import STD_XML = StandardInits.STD_XML;
 
-declare var jsf: any;
+declare var faces: any;
 declare var Implementation: any;
 
 let issueStdReq = function (element) {
-    jsf.ajax.request(element, null, {
+    faces.ajax.request(element, null, {
         execute: "input_1",
         render: "@form",
         pass1: "pass1",
@@ -60,12 +60,12 @@ describe('Tests on the xhr core when it starts to call the request', function ()
                 this.requests.push(xhr);
             };
             (<any>global).XMLHttpRequest = this.xhr;
-            (<any>window).XMLHttpRequest = this.xhr;
+            window.XMLHttpRequest = this.xhr;
 
-            this.jsfAjaxResponse = sinon.spy((<any>global).jsf.ajax, "response");
+            this.jsfAjaxResponse = sinon.spy((<any>global).faces.ajax, "response");
 
             this.closeIt = () => {
-                (<any>global).XMLHttpRequest = (<any>window).XMLHttpRequest = this.xhr.restore();
+                (<any>global).XMLHttpRequest = window.XMLHttpRequest = this.xhr.restore();
                 this.jsfAjaxResponse.restore();
                 Implementation.reset();
                 close();
@@ -78,7 +78,7 @@ describe('Tests on the xhr core when it starts to call the request', function ()
     });
 
     it('must have the standard parameters all in', function (done) {
-        //issue a standard jsf.ajax.request upon the standard simple form case and check the passed parameters
+        //issue a standard faces.ajax.request upon the standard simple form case and check the passed parameters
         //and whether send was called
         let send = sinon.spy(XMLHttpRequest.prototype, "send");
 
@@ -92,7 +92,7 @@ describe('Tests on the xhr core when it starts to call the request', function ()
             expect(send.called).to.be.true;
             expect(send.callCount).to.eq(1);
 
-            //sent params javax.faces.ViewState=null&execute=input_1&render=%40form&pass1=pass1&pass2=pass2&javax.faces.windowId=null&javax.faces.source=input_2&javax.faces.partial.ajax=input_2&blarg=blarg&javax.faces.partial.execute=input_1%20input_2&javax.faces.partial.render=blarg
+            //sent params jakarta.faces.ViewState=null&execute=input_1&render=%40form&pass1=pass1&pass2=pass2&jakarta.faces.windowId=null&jakarta.faces.source=input_2&jakarta.faces.partial.ajax=input_2&blarg=blarg&jakarta.faces.partial.execute=input_1%20input_2&jakarta.faces.partial.render=blarg
 
         } finally {
 
@@ -165,12 +165,13 @@ describe('Tests after core when it hits response', function () {
                 this.requests.push(xhr);
             };
             (<any>global).XMLHttpRequest = this.xhr = sinon.useFakeXMLHttpRequest();
-            (<any>window).XMLHttpRequest = this.xhr = sinon.useFakeXMLHttpRequest();
+            // @ts-ignore
+            window.XMLHttpRequest = this.xhr = sinon.useFakeXMLHttpRequest() as XMLHttpRequest;
 
-            this.jsfAjaxResponse = sinon.spy((<any>global).jsf.ajax, "response");
+            this.jsfAjaxResponse = sinon.spy((<any>global).faces.ajax, "response");
 
             this.closeIt = () => {
-                (<any>global).XMLHttpRequest = (<any>window).XMLHttpRequest = this.xhr.restore();
+                (<any>global).XMLHttpRequest = window.XMLHttpRequest = this.xhr.restore();
                 this.jsfAjaxResponse.restore();
                 Implementation.reset();
                 close();
@@ -189,10 +190,10 @@ describe('Tests after core when it hits response', function () {
         let localCnt = 0;
         try {
             let element = DomQuery.byId("input_2").getAsElem(0).value;
-            jsf.ajax.addOnEvent(() => {
+            faces.ajax.addOnEvent(() => {
                 globalCnt++;
             });
-            jsf.ajax.request(element, null, {
+            faces.ajax.request(element, null, {
                 execute: "input_1",
                 render: "@form",
                 pass1: "pass1",
@@ -227,12 +228,12 @@ describe('Tests after core when it hits response', function () {
 
         try {
             let element = DomQuery.byId("input_2").getAsElem(0).value;
-            jsf.ajax.addOnEvent(() => {
+            faces.ajax.addOnEvent(() => {
                 globalCnt++;
             });
 
 
-            jsf.ajax.request(element, null, {
+            faces.ajax.request(element, null, {
                 execute: "input_1",
                 render: "@form",
                 pass1: "pass1",
@@ -292,7 +293,7 @@ describe('Tests after core when it hits response', function () {
         try {
             let errorCnt = 0;
             let element = DomQuery.byId("input_2").getAsElem(0).value;
-            jsf.ajax.request(element, null, {
+            faces.ajax.request(element, null, {
                 execute: "input_1",
                 render: "@form",
                 pass1: "pass1",