Skip to content

Commit 01161d2

Browse files
Merge pull request #2056 from contentstack/staging
Staging back merge to development
2 parents f961082 + fe4bde8 commit 01161d2

File tree

11 files changed

+344
-231
lines changed

11 files changed

+344
-231
lines changed

.github/workflows/unit-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ jobs:
5252
working-directory: ./packages/contentstack-auth
5353
run: npm run test
5454

55-
- name: Run tests for Contentstack Import Setup
56-
working-directory: ./packages/contentstack-import-setup
57-
run: npm run test:unit
55+
# - name: Run tests for Contentstack Import Setup
56+
# working-directory: ./packages/contentstack-import-setup
57+
# run: npm run test:unit
5858

5959

6060
- name: Run tests for Contentstack Bulk Publish

.talismanrc

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,38 @@
11
fileignoreconfig:
22
- filename: package-lock.json
3-
checksum: 72a462b8cacd9977871d7e5c6c15ba8be8c217930955667cb543ad93a41c1989
3+
checksum: c73d080bfbbf03bc2597891f956367bfd71f5f2f8d03525175426015265edc91
4+
- filename: pnpm-lock.yaml
5+
checksum: 0ca85066946c49994a4353c9f64b8f380d5d2050194e3e57ad7ccd7faa030d36
6+
- filename: packages/contentstack-import-setup/test/unit/backup-handler.test.ts
7+
checksum: 0582d62b88834554cf12951c8690a73ef3ddbb78b82d2804d994cf4148e1ef93
8+
- filename: packages/contentstack-import-setup/test/config.json
9+
checksum: 187fd202d00e7d2c3d8b00f983ff21d8535e0fdb76cebec3f39c400258c88d05
10+
- filename: packages/contentstack-command/test/config.json
11+
checksum: 7c15663b3a6562b99d3082ead5035932b0276e4fd53774b3f838372a19b291ef
12+
- filename: packages/contentstack-import-setup/test/unit/modules/content-types.test.ts
13+
checksum: ce8772281171927e7dee7d6a761a029c902393b808e2696624fdcf0f5b80ea5c
14+
- filename: packages/contentstack-import-setup/test/unit/modules/entries.test.ts
15+
checksum: 17652bfc125879bb37facf8ea9f54dc4f97627ca625ec148c9d551a20196d85b
16+
- filename: packages/contentstack-import-setup/test/unit/modules/extensions.test.ts
17+
checksum: eaafdf39fc8a947aa490232bfc7da950c882bd69b5b27a0362ef2bee21f6a177
18+
- filename: packages/contentstack-import-setup/test/unit/modules/global-fields.test.ts
19+
checksum: fd49cfab6d374254c0c6eb4c7e7ee8ff4fe6c2b46e7b0d7f7437cbe665d1ce8b
20+
- filename: packages/contentstack-import-setup/test/unit/modules/marketplace-apps.test.ts
21+
checksum: c35dfe96d685fb12427de4b77c9240b34b9bee5e158ad7489acaa0d061ad562e
22+
- filename: packages/contentstack-import-setup/test/unit/modules/taxonomies.test.ts
23+
checksum: 3868ff9e8833a670350590f070c6f635807f2a1f534accba677af4709fab0e4a
24+
- filename: packages/contentstack-import-setup/test/unit/import-config-handler.test.ts
25+
checksum: f2f2c994543c388f2eecaf8128f789eab2895f1f78d659e58ef9491972c6f9a8
26+
- filename: packages/contentstack-import-setup/test/unit/common-helper.test.ts
27+
checksum: a0c98c6f0ee88a398e3f1bd80cac0a6cc0ede7eee01957cf7d6e1f199f3da643
28+
- filename: packages/contentstack-import-setup/test/unit/modules/base-setup.test.ts
29+
checksum: 862c52e2bbd1975b963f45ce3e89c243d047858cdbe7339918395ce2fc52bf89
30+
- filename: packages/contentstack-import-setup/test/unit/import-setup.test.ts
31+
checksum: 1eee4f461fa5b115894d1806a14af6f45336cbe6c0392f16078bd2877fadff67
32+
- filename: packages/contentstack-import-setup/test/unit/login-handler.test.ts
33+
checksum: e549f9ca3a9aae0d93b7284f7e771d55c0610725ddcb4333612df2f215e92769
34+
- filename: packages/contentstack/README.md
35+
checksum: c09f6dc93702caff3adf689b501ec32586a16c865c1fe3a63b53ae645ca22349
36+
- filename: packages/contentstack-import-setup/test/unit/modules/assets.test.ts
37+
checksum: 449a5e3383631a6f78d1291aa3c28c91681879289398f0a933158fba5c5d5acf
438
version: "1.0"

package-lock.json

Lines changed: 265 additions & 195 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

packages/contentstack-audit/.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ dependabot.yml
1818
.editorconfig
1919
oclif.manifest.json
2020
*.env
21-
.vscode/
21+
.vscode/
22+
audit-report

packages/contentstack-audit/test/unit/modules/content-types.test.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,25 @@ describe('Content types', () => {
2525
let constructorParam: ModuleConstructorParam & CtConstructorParam;
2626

2727
class AuditTempClass extends ContentType {
28-
constructor(public missingRefs: Record<string, any> = {}) {
28+
public missingRefs: Record<string, any>;
29+
30+
constructor(missingRefs: Record<string, any> = {}) {
2931
super(constructorParam);
3032
this.currentUid = 'audit';
3133
this.currentTitle = 'Audit';
34+
this.missingRefs = missingRefs;
3235
this.missingRefs['audit'] = [];
3336
}
3437
}
3538

3639
class AuditFixTempClass extends ContentType {
37-
constructor(public missingRefs: Record<string, any> = {}) {
40+
public missingRefs: Record<string, any>;
41+
42+
constructor(missingRefs: Record<string, any> = {}) {
3843
super({ ...constructorParam, fix: true, moduleName: undefined });
3944
this.currentUid = 'audit-fix';
4045
this.currentTitle = 'Audit fix';
46+
this.missingRefs = missingRefs;
4147
this.missingRefs['audit-fix'] = [];
4248
}
4349
}

packages/contentstack-audit/test/unit/modules/field-rules.test.ts

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,19 +18,25 @@ describe('Field Rules', () => {
1818
let constructorParam: ModuleConstructorParam & CtConstructorParam;
1919

2020
class AuditTempClass extends FieldRule {
21-
constructor(public missingRefs: Record<string, any> = {}) {
21+
public missingRefs: Record<string, any>;
22+
23+
constructor(missingRefs: Record<string, any> = {}) {
2224
super(constructorParam);
2325
this.currentUid = 'audit';
2426
this.currentTitle = 'Audit';
27+
this.missingRefs = missingRefs;
2528
this.missingRefs['audit'] = [];
2629
}
2730
}
2831

2932
class AuditFixTempClass extends FieldRule {
30-
constructor(public missingRefs: Record<string, any> = {}) {
33+
public missingRefs: Record<string, any>;
34+
35+
constructor(missingRefs: Record<string, any> = {}) {
3136
super({ ...constructorParam, fix: true, moduleName: undefined });
3237
this.currentUid = 'audit-fix';
3338
this.currentTitle = 'Audit fix';
39+
this.missingRefs = missingRefs;
3440
this.missingRefs['audit-fix'] = [];
3541
}
3642
}

packages/contentstack-audit/test/unit/modules/global-field.test.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,13 @@ describe('Global Fields', () => {
1515
let constructorParam: ModuleConstructorParam & CtConstructorParam;
1616

1717
class AuditFixTempClass extends GlobalField {
18-
constructor(public missingRefs: Record<string, any> = {}) {
18+
public missingRefs: Record<string, any>;
19+
20+
constructor(missingRefs: Record<string, any> = {}) {
1921
super({ ...constructorParam, fix: true, moduleName: 'global-fields' });
2022
this.currentUid = 'audit-fix';
2123
this.currentTitle = 'Audit fix';
24+
this.missingRefs = missingRefs;
2225
this.missingRefs['audit-fix'] = [];
2326
}
2427
}

packages/contentstack-auth/test/run.test.ts

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
import { join, resolve } from "path";
22
import { existsSync, readdirSync } from "fs";
3-
import {
4-
IS_TS,
5-
UNIT_EXECUTION_ORDER,
6-
INTEGRATION_EXECUTION_ORDER,
7-
// @ts-ignore
8-
} from "./config.json";
3+
import config from "./config.json" with { type: "json" };
4+
import filter from "lodash/filter.js";
5+
import forEach from "lodash/forEach.js";
6+
import isEmpty from "lodash/isEmpty.js";
7+
import isArray from "lodash/isArray.js";
8+
import includes from "lodash/includes.js";
9+
import dotenv from 'dotenv';
910

1011
// NOTE init env variables
11-
require('dotenv').config()
12+
dotenv.config();
1213

13-
const filter = require("lodash/filter");
14-
const forEach = require("lodash/forEach");
15-
const isEmpty = require("lodash/isEmpty");
16-
const isArray = require("lodash/isArray");
17-
const includes = require("lodash/includes");
14+
const { IS_TS, UNIT_EXECUTION_ORDER, INTEGRATION_EXECUTION_ORDER } = config;
1815

1916
const testFileExtension = IS_TS ? ".ts" : ".js";
2017
process.env.TS_NODE_PROJECT = resolve("test/tsconfig.json");

packages/contentstack-auth/test/unit/message-handler.test.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { expect } from 'chai';
2-
import { messageHandler } from '@contentstack/cli-utilities';
2+
import pkg from '@contentstack/cli-utilities';
3+
const { messageHandler } = pkg;
34

45
describe('Message Handler', () => {
56
it('parse with invalid message key, returns the key itself', function () {

packages/contentstack-config/test/integration/config.test.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import { expect } from 'chai';
2-
import * as sinon from 'sinon';
32
import { spawnSync } from 'child_process';
4-
import { cliux } from '@contentstack/cli-utilities';
53

64
describe('ContentStack-Config Plugin Tests', () => {
75
it("Should execute 'config:set:region --AZURE-NA'", () => {

0 commit comments

Comments
 (0)