Merge pull request #1925 from contentstack/development

Development

Author: harshithad0703

.github/workflows/unit-test.yml

@@ -35,6 +35,10 @@ jobs:
       - name: Run tests for Contentstack Migration
         working-directory: ./packages/contentstack-migration
         run: npm run test
+
+      - name: Run tests for Contentstack Export To CSV
+        working-directory: ./packages/contentstack-export-to-csv
+        run: npm run test:unit
       # - name: Fetch latest references
       #   run: |
       #     git fetch --prune

.talismanrc

@@ -115,5 +115,5 @@ fileignoreconfig:
 - filename: pnpm-lock.yaml
   checksum: fc379207a835de8d851caa256837e2a50e0278c43e0251372f2a5292bee41fac
 - filename: package-lock.json
-  checksum: 0cb373716595912a75e9fd356e7a90a67eb1d2de712c454701231e2d5dd3caf7
-version: ""
+  checksum: 36dd3bdea6ccd75f6198be5bd268181def99a84c5db9ad7a4f8c20c06c6d6592
+version: "1.0"

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-export-to-csv",
   "description": "Export entities to csv",
-  "version": "1.8.0",
+  "version": "1.8.1",
   "author": "Abhinav Gupta @abhinav-from-contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-export-to-csv/package.json

@@ -8,11 +8,16 @@ const { configHandler } = require('@contentstack/cli-utilities');
 const { runCommand } = require('@oclif/test')
 const sinon = require('sinon');
 
-const { cma } = configHandler.get('region');
+const regionConfig = configHandler.get('region') || {};
+const cma = regionConfig.cma || 'https://api.contentstack.io/v3';
 let sandbox;
 
 describe('Export to CSV functionality', () => {
   beforeEach(() => {
+     if (!configHandler.get('authorisationType')) {
+      configHandler.set('authorisationType', 'BASIC');
+      configHandler.set('delete', true);
+    }
     sandbox = sinon.createSandbox()
     sandbox.stub(fs, 'createWriteStream').returns(new PassThrough())
     nock(cma)
@@ -21,6 +26,10 @@ describe('Export to CSV functionality', () => {
   });
 
   afterEach(() => {
+     if (configHandler.get('delete')) {
+      configHandler.delete('delete');
+      configHandler.delete('authorisationType');
+    }
     sandbox.restore();
     nock.cleanAll();
   });
@@ -204,9 +213,17 @@ describe('Export to CSV functionality', () => {
 
 describe("Testing teams support in CLI export-to-csv", () => {
   beforeEach(() => {
+      if (!configHandler.get('authorisationType')) {
+      configHandler.set('authorisationType', 'BASIC');
+      configHandler.set('delete', true);
+    }
     sandbox = sinon.createSandbox();
   });
   afterEach(() => {
+    if (configHandler.get('delete')) {
+      configHandler.delete('delete');
+      configHandler.delete('authorisationType');
+    }
     sandbox.restore();
     nock.cleanAll();
   });

packages/contentstack-export-to-csv/test/unit/commands/export-to-csv.test.js

@@ -1,41 +1,42 @@
-const { fancy } = require('fancy-test');
 const { expect } = require('chai');
-const { runCommand } = require('@oclif/test')
 const inquirer = require('inquirer');
 const sinon = require('sinon');
-const { cliux, configHandler, managementSDKClient } = require('@contentstack/cli-utilities');
+const { configHandler, managementSDKClient } = require('@contentstack/cli-utilities');
 const mockData = require('../mock-data/common.mock.json');
 const { getStacks, chooseBranch } = require('../../src/util/index');
 const nock = require('nock');
-const { cma } = configHandler.get('region');
+const regionConfig = configHandler.get('region') || {};
+const cma = regionConfig.cma || 'https://api.contentstack.io/v3';
 
 describe('common utils', () => {
   let managementSdk;
-  let sandbox
+  let sandbox;
+
   beforeEach(async () => {
     managementSdk = await managementSDKClient({
       host: cma.replace('https://', ''),
     });
-    sandbox = sinon.createSandbox()
+    sandbox = sinon.createSandbox();
   });
+
   afterEach(() => {
     sandbox.restore();
     nock.cleanAll();
   });
 
-  describe('chooseStack', () => {
-    describe('choose stack from list of stacks', async () => {
-      beforeEach(() => {
-        sandbox.stub(inquirer, 'prompt').returns({
-          branch: mockData.stacks[0].name,
-        });
+  describe('getStacks', () => {
+    it('should return a list of stacks for a given organization', async () => {
+      sandbox.stub(inquirer, 'prompt').resolves({
+        stack: mockData.stacks[0].name,
       });
-      it('Returns list of stacks', async () => {
-        nock(cma)
-          .get(`/v3/stacks?&query={"org_uid":"${mockData.organizations[0].uid}"}`)
-          .reply(200, { stacks: mockData.stacks });
-      })
-      await getStacks(managementSdk, mockData.organizations[0].uid);
+
+      nock(cma)
+        .get(`/v3/stacks?query={"org_uid":"${mockData.organizations[0].uid}"}`)
+        .reply(200, { stacks: mockData.stacks });
+
+      const result = await getStacks(managementSdk, mockData.organizations[0].uid);
+
+      expect(result).to.be.an('object');
     });
   });
 
@@ -49,7 +50,7 @@ describe('common utils', () => {
       it('Returns list of stacks', async () => {
         const { branch } = await chooseBranch([mockData.branch]);
         expect(branch).to.equal(mockData.branch.uid);
-      })
+      });
     });
   });
 });

packages/contentstack-export-to-csv/test/util/common-utils.test.js

@@ -14,7 +14,7 @@ const {
   determineUserOrgRole,
 } = require('../../src/util/index');
 const sinon = require('sinon');
-const util = require('../../src/util')
+const util = require('../../src/util');
 
 describe('Test Util functions', () => {
   let managementAPIClientMock;

packages/contentstack-export-to-csv/test/util/index.test.js

@@ -1,7 +1,7 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.21.3",
+  "version": "1.21.4",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {

packages/contentstack-import/package.json

@@ -439,6 +439,7 @@ const config: DefaultConfig = {
   },
   //'taxonomies', 'environments', 'marketplace_apps', workflows, custom-roles --> Add this incase need to extend to the other global modules
   globalModules: ['webhooks'],
+  entriesPublish: true,
 };
 
 export default config;

packages/contentstack-import/src/config/index.ts

@@ -199,4 +199,5 @@ export default interface DefaultConfig {
   globalModules: string[];
   skipAssetsPublish?: boolean;
   skipEntriesPublish?: boolean;
+  entriesPublish: boolean,
 }