Merge pull request #819 from werpu/main

https://issues.apache.org/jira/browse/MYFACES-4699:
apache · Dec 6, 2024 · 0c7ec24 · 0c7ec24
2 parents 05f4a6a + 38235a0
commit 0c7ec24
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 12 deletions.
diff --git a/api/src/client/package-lock.json b/api/src/client/package-lock.json
diff --git a/api/src/client/package.json b/api/src/client/package.json
@@ -24,7 +24,7 @@
     "html-webpack-plugin": "^5.5.1",
     "jsdom": "^21.1.1",
     "jsdom-global": "^3.0.2",
-    "jsf.js_next_gen": "4.0.4-beta.4",
+    "jsf.js_next_gen": "4.0.4-beta.5",
     "mocha": "^10.2.0",
     "npm-check-updates": "^16.10.8",
     "nyc": "^15.1.0",

diff --git a/api/src/client/typescript/faces/@types/definitions/index.d.ts b/api/src/client/typescript/faces/@types/definitions/index.d.ts
@@ -62,7 +62,7 @@ declare global {
         serverErrorName: string;
         serverErrorMessage: string;
         source: any;
-        responseCode: string;
+        responseCode: number;
         responseText: string;
         responseXML: string;
     }

diff --git a/api/src/client/typescript/faces/impl/xhrCore/ErrorData.ts b/api/src/client/typescript/faces/impl/xhrCore/ErrorData.ts
@@ -75,7 +75,7 @@ export class ErrorData extends EventData implements IErrorData {
 
         //tck requires that the type is prefixed to the message itself (jsdoc also) in case of a server error
         this.errorMessage = errorMessage;
-        this.responseCode = `${responseCode}`;
+        this.responseCode = responseCode;
         this.responseText = responseText;
         this.responseXML = responseXML;
 

diff --git a/api/src/client/typescript/faces/impl/xhrCore/EventData.ts b/api/src/client/typescript/faces/impl/xhrCore/EventData.ts
@@ -20,7 +20,7 @@ export class EventData implements IEventData{
     type: string;
     status: string;
     source: any;
-    responseCode: string;
+    responseCode: number;
     responseText: string;
     responseXML: Document;
 
@@ -40,7 +40,7 @@ export class EventData implements IEventData{
         }
 
         if (name !== BEGIN) {
-            eventData.responseCode = request?.status?.toString();
+            eventData.responseCode = request?.status;
             eventData.responseText = request?.responseText;
             eventData.responseXML = request?.responseXML;
         }

diff --git a/api/src/client/typescript/faces/test/xhrCore/RequestTest_23.spec.ts b/api/src/client/typescript/faces/test/xhrCore/RequestTest_23.spec.ts
@@ -338,6 +338,7 @@ describe('Tests after core when it hits response', function () {
                     expect(!!error.errorMessage).to.eq(true);
                     expect(!!error.source).to.eq(true);
                     expect(!!error.responseCode).to.eq(true);
+                    expect(typeof error.responseCode).to.eq("number");
                     expect(!!error.responseText).to.eq(true);
                     expect(!error.responseXML).to.eq(true);
                     done();