Merge pull request #42 from contentstack/hotfix/test_cases

Hotfix/test cases

Author: cs-raj

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2024 Contentstack
+Copyright (c) 2025 Contentstack
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

src/sdk/utils.ts

@@ -39,14 +39,19 @@ export const initializeContentstackSdk = ({
         host: host,
         branch: branch,
       });
-    } else {
+    } else if (regionVal) {
       Stack = Contentstack.stack({
         apiKey: apiKey,
         deliveryToken: token,
         environment,
         region: regionVal,
         branch: branch,
       });
+    } else {
+      throw {
+        type: "validation",
+        error_message: `The region "${region}" is not supported and no host is provided for a custom region.`,
+      };
     }
 
     return Stack;

tests/integration/generateTS/generateTS.test.ts

@@ -22,7 +22,7 @@ describe("generateTS function", () => {
 
     expect(generatedTS).toEqual(expect.stringContaining("interface")); // Check for Output is not undefined
     expect(generatedTS).toEqual(expect.stringContaining("Dishes")); // Check for whether typeDef of Content type is included
-    expect(generatedTS).toMatch(/\/\*\*.*\*\/\n\s*(export)/); // Check for is Documentation Generated
+    expect(generatedTS).toMatch(/\/\*\*[\s\S]*?\*\/\s*(export)/); // Check for Documentation Generated with export
   });
 
   it("generates type definitions without Documentation", async () => {
@@ -137,7 +137,9 @@ describe("generateTS function with errors", () => {
         branch,
       });
     } catch (err: any) {
-      expect(err.error_message).toEqual("Something went wrong");
+      expect(err.error_message).toEqual(
+        "Something went wrong while initializing Contentstack SDK."
+      );
     }
   });
 

tests/unit/generateTS/generateTS.test.ts

@@ -174,12 +174,12 @@ describe("generateTS function with errors", () => {
   });
 
   it("Check for Invalid region", async () => {
-    const token = "your-token";
-    const apiKey = "your-api-key";
-    const environment = "development";
-    const region = "demo" as unknown as any;
-    const tokenType = "delivery";
-    const branch = "main";
+    const token = process.env.TOKEN as unknown as any;
+    const apiKey = process.env.APIKEY as unknown as any;
+    const environment = process.env.ENVIRONMENT as unknown as any;
+    const region = "wrong" as unknown as any;
+    const tokenType = process.env.TOKENTYPE as unknown as any;
+    const branch = process.env.BRANCH as unknown as any;
 
     try {
       await generateTS({
@@ -191,7 +191,9 @@ describe("generateTS function with errors", () => {
         branch,
       });
     } catch (err: any) {
-      expect(err.error_message).toEqual("Something went wrong");
+      expect(err.error_message).toEqual(
+        "Something went wrong while initializing Contentstack SDK."
+      );
     }
   });
 
@@ -230,7 +232,9 @@ describe("generateTS function with errors", () => {
     const tokenType = "delivery";
     const branch = "main";
 
-    mockClient.onGet(`/content_types`).reply(401);
+    mockClient.onGet(`/content_types`).reply(401, {
+      status: 401,
+    });
 
     try {
       await generateTS({
@@ -256,7 +260,9 @@ describe("generateTS function with errors", () => {
     const tokenType = "delivery";
     const branch = "main";
 
-    mockClient.onGet(`/content_types`).reply(401);
+    mockClient.onGet(`/content_types`).reply(401, {
+      status: 401,
+    });
 
     try {
       await generateTS({
@@ -342,7 +348,9 @@ describe("generateTS function with errors", () => {
 
     mockClient.onGet(`/content_types`).reply(200, contentTypes);
 
-    mockClient.onGet(`/global_fields`).reply(401);
+    mockClient.onGet(`/global_fields`).reply(401, {
+      status: 401,
+    });
 
     try {
       await generateTS({

tests/unit/tsgen/boolean.ct.js

@@ -3,7 +3,7 @@ const builtinBoolean = {
   updated_at: "2020-07-12T14:37:02.250Z",
   title: "Boolean",
   uid: "boolean",
-  _version: 2,
+  _version: "number",
   inbuilt_class: false,
   schema: [
     {

tests/unit/tsgen/boolean.test.ts

@@ -25,7 +25,7 @@ describe("builtin boolean field", () => {
       "export interface IBoolean
       {
       /** Version */
-      _version:  2 ;
+      _version: number;
       title: string  ;
       boolean?: boolean  ;
       }"

tests/unit/tsgen/defaults.ct.js

@@ -3,7 +3,7 @@ const defaultSingleContentBlock = {
   updated_at: "2020-07-12T13:40:36.124Z",
   title: "Metadata Single Content Block",
   uid: "metadata_single_content_block",
-  _version: 2,
+  _version: "number",
   inbuilt_class: false,
   schema: [
     {

tests/unit/tsgen/defaults.test.ts

@@ -18,7 +18,7 @@ describe("default single content block", () => {
       "export interface IMetadataSingleContentBlock
       {
       /** Version */
-      _version:  2 ;
+      _version: number;
       title: string  ;
       }"
     `);
@@ -44,7 +44,7 @@ describe("default single webpage", () => {
       "export interface IMetadataSingleWebpage
       {
       /** Version */
-      _version:  2 ;
+      _version: number;
       title: string  ;
       url: string  ;
       }"

tests/unit/tsgen/global.fields.ct.js

@@ -3,7 +3,7 @@ const globalFields = {
   updated_at: "2020-07-12T15:48:52.343Z",
   title: "Global Fields",
   uid: "global_fields",
-  _version: 2,
+  _version: "number",
   inbuilt_class: false,
   schema: [
     {

tests/unit/tsgen/global.fields.test.ts

@@ -25,7 +25,7 @@ describe("global fields", () => {
       "export interface ISeo
       {
       /** Version */
-      _version:   ;
+      _version: number;
       keywords?: string  ;
       description?: string  ;
       }"
@@ -37,7 +37,7 @@ describe("global fields", () => {
       "export interface IGlobalFields
       {
       /** Version */
-      _version:  2 ;
+      _version: number;
       title: string  ;
       seo?: ISeo  ;
       }"