dx | 683 fix breaking test cases

README.md

@@ -20,7 +20,7 @@ $ npm install -g @contentstack/apps-cli
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/apps-cli/1.3.1 darwin-arm64 node-v18.20.2
+@contentstack/apps-cli/1.3.2 darwin-arm64 node-v18.20.2
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND
@@ -69,7 +69,7 @@ EXAMPLES
   $ csdx app:update
 ```
 
-_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/index.ts)_
+_See code: [src/commands/app/index.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/index.ts)_
 
 ## `csdx app:create`
 
@@ -109,7 +109,7 @@ EXAMPLES
   $ csdx app:create --name App-4 --app-type organization --org <UID> --boilerplate <Ecommerce App Boilerplate>
 ```
 
-_See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/create.ts)_
+_See code: [src/commands/app/create.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/create.ts)_
 
 ## `csdx app:delete`
 
@@ -134,7 +134,7 @@ EXAMPLES
   $ csdx app:delete --app-uid <value> --org <value> -d ./boilerplate
 ```
 
-_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/delete.ts)_
+_See code: [src/commands/app/delete.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/delete.ts)_
 
 ## `csdx app:deploy`
 
@@ -172,7 +172,7 @@ EXAMPLES
   $ csdx app:deploy --org <UID> --app-uid <APP-UID-1> --hosting-type <Hosting with Launch> --launch-project <new> --config <config-path>
 ```
 
-_See code: [src/commands/app/deploy.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/deploy.ts)_
+_See code: [src/commands/app/deploy.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/deploy.ts)_
 
 ## `csdx app:get`
 
@@ -202,7 +202,7 @@ EXAMPLES
   $ csdx app:get --org <value> --app-uid <value> --app-type organization
 ```
 
-_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/get.ts)_
+_See code: [src/commands/app/get.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/get.ts)_
 
 ## `csdx app:install`
 
@@ -228,7 +228,7 @@ EXAMPLES
   $ csdx app:install --org <UID> --app-uid <APP-UID-1> --stack-api-key <STACK-API-KEY-1>
 ```
 
-_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/install.ts)_
+_See code: [src/commands/app/install.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/install.ts)_
 
 ## `csdx app:reinstall`
 
@@ -254,7 +254,7 @@ EXAMPLES
   $ csdx app:reinstall --org <UID> --app-uid <APP-UID-1> --stack-api-key <STACK-API-KEY-1>
 ```
 
-_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/reinstall.ts)_
+_See code: [src/commands/app/reinstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/reinstall.ts)_
 
 ## `csdx app:uninstall`
 
@@ -281,7 +281,7 @@ EXAMPLES
   $ csdx app:uninstall --org <UID> --app-uid <APP-UID-1> --installation-uid <INSTALLATION-UID-1>
 ```
 
-_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/uninstall.ts)_
+_See code: [src/commands/app/uninstall.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/uninstall.ts)_
 
 ## `csdx app:update`
 
@@ -304,5 +304,5 @@ EXAMPLES
   $ csdx app:update --app-manifest ./boilerplate/manifest.json
 ```
 
-_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.3.1/src/commands/app/update.ts)_
+_See code: [src/commands/app/update.ts](https://github.com/contentstack/apps-cli/blob/v1.3.2/src/commands/app/update.ts)_
 <!-- commandsstop -->

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contentstack/apps-cli",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "App ClI",
   "author": "Contentstack CLI",
   "homepage": "https://github.com/contentstack/contentstack-apps-cli",

src/commands/app/create.ts

@@ -108,6 +108,15 @@ export default class Create extends BaseCommand<typeof Create> {
       ) {
         await this.boilerplateFlow();
       } else {
+        if(this.sharedConfig.folderPath === undefined) {
+          const dataDir = this.flags["data-dir"] ?? process.cwd();
+          let targetPath = resolve(dataDir, this.sharedConfig.defaultAppName);
+          if (existsSync(targetPath)) {
+            this.log(this.messages.DIR_EXIST, "warn");
+            targetPath = await getDirName(targetPath);
+          }
+          this.sharedConfig.folderPath = targetPath;
+        }
         this.manageManifestToggeling();
         await this.registerTheAppOnDeveloperHub(false);
       }

src/commands/app/reinstall.ts

@@ -118,7 +118,7 @@ export default class Reinstall extends AppCLIBaseCommand {
       this.displayStackUrl();
     } catch (error: any) {
       this.log(error?.errorMessage || error?.message || error, "error");
-      process.exit(1);
+      this.exit(1);
     }
   }
 

test/unit/commands/app/create.test.ts

@@ -12,6 +12,7 @@ import config from "../../../../src/config";
 import messages from "../../../../src/messages";
 import * as mock from "../../mock/common.mock.json";
 import manifestData from "../../../../src/config/manifest.json";
+import orgManifestData from "../../../unit/config/org_manifest.json";
 import { getDeveloperHubUrl } from "../../../../src/util/inquirer";
 
 const { origin, pathname } = new URL(config.appBoilerplateGithubUrl);
@@ -64,7 +65,13 @@ describe("app:create", () => {
             data: { ...manifestData, name: "test-app", version: 1 },
           })
       )
-      .command(["app:create", "--data-dir", process.cwd()])
+      .command([
+        "app:create",
+        "--name",
+        "test-app",
+        "--data-dir",
+        process.cwd(),
+      ])
       .do(({ stdout }) =>
         expect(stdout).to.contain(messages.APP_CREATION_SUCCESS)
       )
@@ -106,16 +113,23 @@ describe("app:create", () => {
       .nock(`https://${developerHubBaseUrl}`, (api) =>
         api
           .post("/manifests", {
-            ...manifestData,
+            ...orgManifestData,
             name: "test-app",
             target_type: "organization",
           })
+
           .reply(200, {
-            data: { ...manifestData, name: "test-app", version: 1 },
+            data: {
+              ...orgManifestData,
+              name: "test-app",
+              version: 1,
+            },
           })
       )
       .command([
         "app:create",
+        "--name",
+        "test-app",
         "--data-dir",
         process.cwd(),
         "--app-type",
@@ -127,14 +141,14 @@ describe("app:create", () => {
       .it("should create a organization level app");
   });
 
-  describe("Creating a app without boilerplate", () => {
+  describe("Creating an app without boilerplate", () => {
     test
       .stdout({ print: process.env.PRINT === "true" || false })
       .stub(ux.action, "stop", () => {})
       .stub(ux.action, "start", () => {})
       .stub(fs, "renameSync", () => new PassThrough())
       .stub(fs, "writeFileSync", () => new PassThrough())
-      .stub(cliux, "inquire", async (...args: any) => {
+      .stub(cliux, "inquire", async (...args) => {
         const [prompt]: any = args;
         const cases = {
           appName: "test-app",
@@ -151,12 +165,20 @@ describe("app:create", () => {
       )
       .nock(`https://${developerHubBaseUrl}`, (api) =>
         api
-          .post("/manifests", { ...manifestData, name: "test-app" })
+          .post("/manifests", (body) => {
+            return body.name === "test-app" && body.target_type === "stack";
+          })
           .reply(200, {
             data: { ...manifestData, name: "test-app", version: 1 },
           })
       )
-      .command(["app:create", "--data-dir", process.cwd()])
+      .command([
+        "app:create",
+        "--name",
+        "test-app",
+        "--data-dir",
+        process.cwd(),
+      ])
       .do(({ stdout }) =>
         expect(stdout).to.contain(messages.APP_CREATION_SUCCESS)
       )
@@ -216,7 +238,6 @@ describe("app:create", () => {
           cloneBoilerplate: false,
           Organization: "test org 1",
         };
-
         return (cases as Record<string, any>)[prompt.name];
       })
       .nock(region.cma, (api) =>
@@ -225,14 +246,20 @@ describe("app:create", () => {
           .reply(200, { organizations: mock.organizations })
       )
       .nock(`https://${developerHubBaseUrl}`, (api) =>
-        api.post("/manifests", { ...manifestData, name: "test-app" }).reply(400)
+        api
+          .post("/manifests", (body) => {
+            return body.name === "test-app" && body.target_type === "stack";
+          })
+          .reply(400, {
+            errorMessage: "App creation failed due to constraints.",
+          })
       )
       .command(["app:create", "--data-dir", process.cwd()])
       .exit(1)
-      .do(({ stdout }) =>
-        expect(stdout).to.contain(messages.APP_CREATION_CONSTRAINT_FAILURE)
-      )
-      .it("App creation should fail!");
+      .do(({ stdout }) => {
+        expect(stdout).to.contain(messages.APP_CREATION_CONSTRAINT_FAILURE);
+      })
+      .it("App creation should fail and rollback");
   });
 
   describe("Pass external config using '--config' flag", () => {
@@ -256,7 +283,13 @@ describe("app:create", () => {
           .reply(200, { organizations: mock.organizations })
       )
       .nock(`https://${developerHubBaseUrl}`, (api) =>
-        api.post("/manifests", { ...manifestData, name: "test-app" }).reply(400)
+        api
+          .post("/manifests", (body) => {
+            return body.name === "test-app" && body.target_type === "stack";
+          })
+          .reply(400, {
+            errorMessage: "App creation failed due to constraints.",
+          })
       )
       .command([
         "app:create",
@@ -266,9 +299,10 @@ describe("app:create", () => {
         resolve(process.cwd(), "test", "unit", "mock", "config.json"),
       ])
       .exit(1)
-      .do(({ stdout }) =>
-        expect(stdout).to.contain(messages.APP_CREATION_CONSTRAINT_FAILURE)
-      )
+      .do(({ stdout }) => {
+        // Ensure the error message is what you expect
+        expect(stdout).to.contain(messages.APP_CREATION_CONSTRAINT_FAILURE);
+      })
       .it("App creation should fail!");
   });
 
@@ -286,7 +320,7 @@ describe("app:create", () => {
       .stub(fs, "writeFileSync", () => new PassThrough())
       .stub(fs, "createWriteStream", () => new PassThrough())
       .stub(tmp, "fileSync", () => ({ name: zipPath }))
-      .stub(cliux, "inquire", async (...args: any) => {
+      .stub(cliux, "inquire", async (...args) => {
         const [prompt]: any = args;
         const cases = {
           appName: "test-app",
@@ -306,12 +340,20 @@ describe("app:create", () => {
       )
       .nock(`https://${developerHubBaseUrl}`, (api) =>
         api
-          .post("/manifests", { ...manifestData, name: "test-app" })
+          .post("/manifests", (body) => {
+            return body.name === "test-app" && body.target_type === "stack";
+          })
           .reply(200, {
             data: { ...manifestData, name: "test-app", version: 1 },
           })
       )
-      .command(["app:create", "--data-dir", process.cwd()])
+      .command([
+        "app:create",
+        "--name",
+        "test-app",
+        "--data-dir",
+        process.cwd(),
+      ])
       .exit(1)
       .do(({ stdout }) =>
         expect(stdout).to.contain("Dependency installation failed.!")

test/unit/commands/app/reinstall.test.ts

@@ -2,7 +2,7 @@ import { ux, cliux, configHandler } from "@contentstack/cli-utilities";
 import { expect, test } from "@oclif/test";
 import * as mock from "../../mock/common.mock.json";
 import messages, { $t } from "../../../../src/messages";
-import { getDeveloperHubUrl } from "../../../../lib/util/inquirer";
+import { getDeveloperHubUrl } from "../../../../src/util/inquirer";
 
 const region: { cma: string; cda: string; name: string } =
   configHandler.get("region");
@@ -235,6 +235,7 @@ describe("app:reinstall", () => {
         const cases = {
           App: mock.apps[1].name,
           Organization: mock.organizations[0].name,
+          Stack: mock.stacks[0].name,
         };
 
         return (cases as Record<string, any>)[prompt.name];
@@ -245,25 +246,23 @@ describe("app:reinstall", () => {
           .reply(200, { organizations: mock.organizations })
       )
       .nock(`https://${developerHubBaseUrl}`, (api) =>
-        api
-          .get("/manifests?limit=50&asc=name&include_count=true&skip=0")
-          .reply(200, {
-            data: mock.apps,
-          })
+        api.get(`/manifests/${mock.apps[1].uid}`).reply(200, {
+          data: mock.apps[1],
+        })
       )
       .nock(`https://${developerHubBaseUrl}`, (api) =>
         api
-          .put(`/manifests/${mock.apps[1].uid}/install`, {
+          .put(`/manifests/${mock.apps[1].uid}/reinstall`, {
             target_type: mock.apps[1].target_type,
-            target_uid: mock.stacks[0].uid,
+            target_uid: mock.organizations[0].uid,
           })
           .replyWithError({
             status: 400,
             message: "You are already using the latest version.",
             error: "Bad Request",
           })
       )
-      .command(["app:install"])
+      .command(["app:reinstall", "--app-uid", mock.apps[1].uid])
       .exit(1)
       .do(({ stdout }) => {
         expect(stdout).to.contain("You are already using the latest version.");