@redocly/cli 1.0.0-beta.128 → 1.0.0-beta.129

package/lib/__tests__/commands/build-docs.test.js

@@ -53,7 +53,7 @@ describe('build-docs', () => {
             templateOptions: {},
             theme: { openapi: {} },
             api: '../some-path/openapi.yaml',
-        });
+        }, {});
         expect(redoc_1.loadAndBundleSpec).toBeCalledTimes(1);
         expect(utils_2.getFallbackApisOrExit).toBeCalledTimes(1);
         expect(processExitMock).toBeCalledTimes(0);

package/lib/__tests__/commands/bundle.test.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const openapi_core_1 = require("@redocly/openapi-core");
 const bundle_1 = require("../../commands/bundle");
 const utils_1 = require("../../utils");
+const wrapper_1 = require("../../wrapper");
 jest.mock('@redocly/openapi-core');
 jest.mock('../../utils');
 openapi_core_1.getMergedConfig.mockImplementation((config) => config);
@@ -33,22 +34,22 @@ describe('bundle', () => {
     });
     it('bundles definitions w/o linting', () => __awaiter(void 0, void 0, void 0, function* () {
         const apis = ['foo.yaml', 'bar.yaml'];
-        yield bundle_1.handleBundle({
+        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
-        }, '1.0.0');
+        });
         expect(openapi_core_1.lint).toBeCalledTimes(0);
         expect(openapi_core_1.bundle).toBeCalledTimes(apis.length);
     }));
     it('exits with code 0 when bundles definitions', () => __awaiter(void 0, void 0, void 0, function* () {
         const apis = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
-        yield bundle_1.handleBundle({
+        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
-        }, '1.0.0');
-        exitCb === null || exitCb === void 0 ? void 0 : exitCb();
+        });
+        yield (exitCb === null || exitCb === void 0 ? void 0 : exitCb());
         expect(processExitMock).toHaveBeenCalledWith(0);
     }));
     it('bundles definitions w/ linting', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -58,24 +59,24 @@ describe('bundle', () => {
             warnings: 0,
             ignored: 0,
         });
-        yield bundle_1.handleBundle({
+        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
             lint: true,
-        }, '1.0.0');
+        });
         expect(openapi_core_1.lint).toBeCalledTimes(apis.length);
         expect(openapi_core_1.bundle).toBeCalledTimes(apis.length);
     }));
     it('exits with code 0 when bundles definitions w/linting w/o errors', () => __awaiter(void 0, void 0, void 0, function* () {
         const apis = ['foo.yaml', 'bar.yaml', 'foobar.yaml'];
-        yield bundle_1.handleBundle({
+        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
             lint: true,
-        }, '1.0.0');
-        exitCb === null || exitCb === void 0 ? void 0 : exitCb();
+        });
+        yield (exitCb === null || exitCb === void 0 ? void 0 : exitCb());
         expect(processExitMock).toHaveBeenCalledWith(0);
     }));
     it('exits with code 1 when bundles definitions w/linting w/errors', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -85,14 +86,14 @@ describe('bundle', () => {
             warnings: 0,
             ignored: 0,
         });
-        yield bundle_1.handleBundle({
+        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
             lint: true,
-        }, '1.0.0');
+        });
         expect(openapi_core_1.lint).toBeCalledTimes(apis.length);
-        exitCb === null || exitCb === void 0 ? void 0 : exitCb();
+        yield (exitCb === null || exitCb === void 0 ? void 0 : exitCb());
         expect(processExitMock).toHaveBeenCalledWith(1);
     }));
     it('handleError is called when bundles an invalid definition', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -100,12 +101,12 @@ describe('bundle', () => {
         openapi_core_1.bundle.mockImplementationOnce(() => {
             throw new Error('Invalid definition');
         });
-        yield bundle_1.handleBundle({
+        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
             apis,
             ext: 'json',
             format: 'codeframe',
             lint: false,
-        }, '1.0.0');
+        });
         expect(utils_1.handleError).toHaveBeenCalledTimes(1);
         expect(utils_1.handleError).toHaveBeenCalledWith(new Error('Invalid definition'), 'invalid.json');
     }));
@@ -116,12 +117,12 @@ describe('bundle', () => {
             warnings: 0,
             ignored: 0,
         });
-        yield bundle_1.handleBundle({
+        yield wrapper_1.commandWrapper(bundle_1.handleBundle)({
             apis,
             ext: 'yaml',
             format: 'codeframe',
             lint: false,
-        }, '1.0.0');
+        });
         expect(utils_1.handleError).toHaveBeenCalledTimes(0);
     }));
 });

package/lib/__tests__/commands/join.test.js

@@ -14,13 +14,14 @@ const utils_1 = require("../../utils");
 const colorette_1 = require("colorette");
 const openapi_core_1 = require("@redocly/openapi-core");
 const openapi_core_2 = require("../../__mocks__/@redocly/openapi-core");
+const config_1 = require("../fixtures/config");
 jest.mock('../../utils');
 jest.mock('colorette');
 describe('handleJoin fails', () => {
     const colloreteYellowMock = colorette_1.yellow;
     colloreteYellowMock.mockImplementation((string) => string);
     it('should call exitWithError because only one entrypoint', () => __awaiter(void 0, void 0, void 0, function* () {
-        yield join_1.handleJoin({ apis: ['first.yaml'] }, 'cli-version');
+        yield join_1.handleJoin({ apis: ['first.yaml'] }, {}, 'cli-version');
         expect(utils_1.exitWithError).toHaveBeenCalledWith(`At least 2 apis should be provided. \n\n`);
     }));
     it('should call exitWithError because passed all 3 options for tags', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -29,7 +30,7 @@ describe('handleJoin fails', () => {
             'prefix-tags-with-info-prop': 'something',
             'without-x-tag-groups': true,
             'prefix-tags-with-filename': true,
-        }, 'cli-version');
+        }, {}, 'cli-version');
         expect(utils_1.exitWithError).toHaveBeenCalledWith(`You use prefix-tags-with-filename, prefix-tags-with-info-prop, without-x-tag-groups together.\nPlease choose only one! \n\n`);
     }));
     it('should call exitWithError because passed all 2 options for tags', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -37,20 +38,20 @@ describe('handleJoin fails', () => {
             apis: ['first.yaml', 'second.yaml'],
             'without-x-tag-groups': true,
             'prefix-tags-with-filename': true,
-        }, 'cli-version');
+        }, {}, 'cli-version');
         expect(utils_1.exitWithError).toHaveBeenCalledWith(`You use prefix-tags-with-filename, without-x-tag-groups together.\nPlease choose only one! \n\n`);
     }));
     it('should call exitWithError because Only OpenAPI 3 is supported', () => __awaiter(void 0, void 0, void 0, function* () {
         yield join_1.handleJoin({
             apis: ['first.yaml', 'second.yaml'],
-        }, 'cli-version');
+        }, config_1.ConfigFixture, 'cli-version');
         expect(utils_1.exitWithError).toHaveBeenCalledWith('Only OpenAPI 3 is supported: undefined \n\n');
     }));
     it('should call writeYaml function', () => __awaiter(void 0, void 0, void 0, function* () {
         openapi_core_1.detectOpenAPI.mockReturnValue('oas3_0');
         yield join_1.handleJoin({
             apis: ['first.yaml', 'second.yaml'],
-        }, 'cli-version');
+        }, config_1.ConfigFixture, 'cli-version');
         expect(utils_1.writeYaml).toHaveBeenCalledWith(expect.any(Object), 'openapi.yaml', expect.any(Boolean));
     }));
     it('should call writeYaml function with custom output file', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -58,14 +59,14 @@ describe('handleJoin fails', () => {
         yield join_1.handleJoin({
             apis: ['first.yaml', 'second.yaml'],
             output: 'output.yml',
-        }, 'cli-version');
+        }, config_1.ConfigFixture, 'cli-version');
         expect(utils_1.writeYaml).toHaveBeenCalledWith(expect.any(Object), 'output.yml', expect.any(Boolean));
     }));
     it('should call skipDecorators and skipPreprocessors', () => __awaiter(void 0, void 0, void 0, function* () {
         openapi_core_1.detectOpenAPI.mockReturnValue('oas3_0');
         yield join_1.handleJoin({
             apis: ['first.yaml', 'second.yaml'],
-        }, 'cli-version');
+        }, config_1.ConfigFixture, 'cli-version');
         const config = openapi_core_2.loadConfig();
         expect(config.styleguide.skipDecorators).toHaveBeenCalled();
         expect(config.styleguide.skipPreprocessors).toHaveBeenCalled();
@@ -76,7 +77,7 @@ describe('handleJoin fails', () => {
             apis: ['first.yaml', 'second.yaml'],
             decorate: true,
             preprocess: true,
-        }, 'cli-version');
+        }, config_1.ConfigFixture, 'cli-version');
         const config = openapi_core_2.loadConfig();
         expect(config.styleguide.skipDecorators).not.toHaveBeenCalled();
         expect(config.styleguide.skipPreprocessors).not.toHaveBeenCalled();

package/lib/__tests__/commands/lint.test.js

@@ -14,15 +14,19 @@ const openapi_core_1 = require("@redocly/openapi-core");
 const utils_1 = require("../../utils");
 const config_1 = require("../fixtures/config");
 const perf_hooks_1 = require("perf_hooks");
+const wrapper_1 = require("../../wrapper");
+const colorette_1 = require("colorette");
 jest.mock('@redocly/openapi-core');
 jest.mock('../../utils');
 jest.mock('perf_hooks');
+jest.mock('../../update-version-notifier', () => ({
+    version: '1.0.0',
+}));
 const argvMock = {
     apis: ['openapi.yaml'],
     'lint-config': 'off',
     format: 'codeframe',
 };
-const versionMock = '1.0.0';
 describe('handleLint', () => {
     let processExitMock;
     let exitCb;
@@ -43,12 +47,11 @@ describe('handleLint', () => {
     });
     describe('loadConfig and getEnrtypoints stage', () => {
         it('should fail if config file does not exist', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { config: 'config.yaml' }), versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { config: 'config.yaml' }));
             expect(utils_1.exitWithError).toHaveBeenCalledWith('Please, provide valid path to the configuration file');
-            expect(utils_1.loadConfigAndHandleErrors).toHaveBeenCalledTimes(0);
         }));
         it('should call loadConfigAndHandleErrors and getFallbackApisOrExit', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield lint_1.handleLint(argvMock, versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
             expect(utils_1.loadConfigAndHandleErrors).toHaveBeenCalledWith({
                 configPath: undefined,
                 customExtends: undefined,
@@ -57,7 +60,7 @@ describe('handleLint', () => {
             expect(utils_1.getFallbackApisOrExit).toHaveBeenCalled();
         }));
         it('should call loadConfig with args if such exist', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { config: 'redocly.yaml', extends: ['some/path'] }), versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { config: 'redocly.yaml', extends: ['some/path'] }));
             expect(utils_1.loadConfigAndHandleErrors).toHaveBeenCalledWith({
                 configPath: 'redocly.yaml',
                 customExtends: ['some/path'],
@@ -65,65 +68,82 @@ describe('handleLint', () => {
             });
         }));
         it('should call mergedConfig with clear ignore if `generate-ignore-file` argv', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { 'generate-ignore-file': true }), versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { 'generate-ignore-file': true }));
             expect(getMergedConfigMock).toHaveBeenCalled();
         }));
         it('should check if ruleset exist', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield lint_1.handleLint(argvMock, versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
             expect(utils_1.checkIfRulesetExist).toHaveBeenCalledTimes(1);
         }));
         it('should fail if apis not provided', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { apis: [] }), versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { apis: [] }));
             expect(utils_1.getFallbackApisOrExit).toHaveBeenCalledTimes(1);
             expect(utils_1.exitWithError).toHaveBeenCalledWith('No APIs were provided');
         }));
     });
-    describe('loop through entrypints and lint stage', () => {
+    describe('loop through entrypoints and lint stage', () => {
         it('should call getMergedConfig and lint ', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield lint_1.handleLint(argvMock, versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
             expect(perf_hooks_1.performance.now).toHaveBeenCalled();
             expect(getMergedConfigMock).toHaveBeenCalled();
             expect(openapi_core_1.lint).toHaveBeenCalled();
         }));
         it('should call skipRules,skipPreprocessors and addIgnore with argv', () => __awaiter(void 0, void 0, void 0, function* () {
             openapi_core_1.lint.mockResolvedValueOnce(['problem']);
-            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { 'skip-preprocessor': ['preprocessor'], 'skip-rule': ['rule'], 'generate-ignore-file': true }), versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { 'skip-preprocessor': ['preprocessor'], 'skip-rule': ['rule'], 'generate-ignore-file': true }));
             expect(config_1.ConfigFixture.styleguide.skipRules).toHaveBeenCalledWith(['rule']);
             expect(config_1.ConfigFixture.styleguide.skipPreprocessors).toHaveBeenCalledWith(['preprocessor']);
         }));
         it('should call formatProblems and getExecutionTime with argv', () => __awaiter(void 0, void 0, void 0, function* () {
             openapi_core_1.lint.mockResolvedValueOnce(['problem']);
-            yield lint_1.handleLint(Object.assign(Object.assign({}, argvMock), { 'max-problems': 2, format: 'stylish' }), versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(Object.assign(Object.assign({}, argvMock), { 'max-problems': 2, format: 'stylish' }));
             expect(openapi_core_1.getTotals).toHaveBeenCalledWith(['problem']);
             expect(openapi_core_1.formatProblems).toHaveBeenCalledWith(['problem'], {
                 format: 'stylish',
                 maxProblems: 2,
                 totals: { errors: 0 },
-                version: versionMock,
+                version: '1.0.0',
             });
             expect(utils_1.getExecutionTime).toHaveBeenCalledWith(42);
         }));
         it('should catch error in handleError if something fails', () => __awaiter(void 0, void 0, void 0, function* () {
             openapi_core_1.lint.mockRejectedValueOnce('error');
-            yield lint_1.handleLint(argvMock, versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
             expect(utils_1.handleError).toHaveBeenCalledWith('error', 'openapi.yaml');
         }));
     });
     describe('erros and warning handle after lint stage', () => {
         it('should call printLintTotals and printLintTotals', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield lint_1.handleLint(argvMock, versionMock);
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
             expect(utils_1.printUnusedWarnings).toHaveBeenCalled();
         }));
         it('should call exit with 0 if no errors', () => __awaiter(void 0, void 0, void 0, function* () {
-            yield lint_1.handleLint(argvMock, versionMock);
-            exitCb === null || exitCb === void 0 ? void 0 : exitCb();
+            utils_1.loadConfigAndHandleErrors.mockImplementation(() => {
+                return Object.assign({}, config_1.ConfigFixture);
+            });
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            yield (exitCb === null || exitCb === void 0 ? void 0 : exitCb());
             expect(processExitMock).toHaveBeenCalledWith(0);
         }));
-        it('should exit with 1 if tootals error > 0', () => __awaiter(void 0, void 0, void 0, function* () {
+        it('should exit with 1 if total errors > 0', () => __awaiter(void 0, void 0, void 0, function* () {
             openapi_core_1.getTotals.mockReturnValueOnce({ errors: 1 });
-            yield lint_1.handleLint(argvMock, versionMock);
-            exitCb === null || exitCb === void 0 ? void 0 : exitCb();
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            yield (exitCb === null || exitCb === void 0 ? void 0 : exitCb());
             expect(processExitMock).toHaveBeenCalledWith(1);
         }));
+        it('should use recommended fallback if no config', () => __awaiter(void 0, void 0, void 0, function* () {
+            openapi_core_1.getMergedConfig.mockImplementation(() => {
+                return {
+                    styleguide: {
+                        recommendedFallback: true,
+                        rules: {},
+                        skipRules: jest.fn(),
+                        skipPreprocessors: jest.fn(),
+                    },
+                };
+            });
+            yield wrapper_1.commandWrapper(lint_1.handleLint)(argvMock);
+            expect(process.stderr.write).toHaveBeenCalledWith(`No configurations were provided -- using built in ${colorette_1.blue('recommended')} configuration by default.\n\n`);
+        }));
     });
 });

package/lib/__tests__/commands/push-region.test.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const openapi_core_1 = require("@redocly/openapi-core");
 const push_1 = require("../../commands/push");
 const login_1 = require("../../commands/login");
+const config_1 = require("../fixtures/config");
 jest.mock('fs');
 jest.mock('node-fetch', () => ({
     default: jest.fn(() => ({
@@ -37,7 +38,7 @@ describe('push-with-region', () => {
             api: 'spec.json',
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
-        });
+        }, config_1.ConfigFixture);
         expect(mockPromptClientToken).toBeCalledTimes(1);
         expect(mockPromptClientToken).toHaveBeenCalledWith(redoclyClient.domain);
     }));
@@ -48,7 +49,7 @@ describe('push-with-region', () => {
             api: 'spec.json',
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
-        });
+        }, config_1.ConfigFixture);
         expect(mockPromptClientToken).toBeCalledTimes(1);
         expect(mockPromptClientToken).toHaveBeenCalledWith(redoclyClient.domain);
     }));

package/lib/__tests__/commands/push.test.js

@@ -37,9 +37,9 @@ describe('push', () => {
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
             public: true,
-            'batch-id': '123',
+            'job-id': '123',
             'batch-size': 2,
-        });
+        }, config_1.ConfigFixture);
         expect(redoclyClient.registryApi.prepareFileUpload).toBeCalledTimes(1);
         expect(redoclyClient.registryApi.pushApi).toBeCalledTimes(1);
         expect(redoclyClient.registryApi.pushApi).toHaveBeenLastCalledWith({
@@ -55,16 +55,16 @@ describe('push', () => {
             batchSize: 2,
         });
     }));
-    it('fails if batchId value is an empty string', () => __awaiter(void 0, void 0, void 0, function* () {
+    it('fails if jobId value is an empty string', () => __awaiter(void 0, void 0, void 0, function* () {
         yield push_1.handlePush({
             upsert: true,
             api: 'spec.json',
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
             public: true,
-            'batch-id': ' ',
+            'job-id': ' ',
             'batch-size': 2,
-        });
+        }, config_1.ConfigFixture);
         expect(utils_1.exitWithError).toBeCalledTimes(1);
     }));
     it('fails if batchSize value is less than 2', () => __awaiter(void 0, void 0, void 0, function* () {
@@ -74,16 +74,13 @@ describe('push', () => {
             destination: '@org/my-api@1.0.0',
             branchName: 'test',
             public: true,
-            'batch-id': '123',
+            'job-id': '123',
             'batch-size': 1,
-        });
+        }, config_1.ConfigFixture);
         expect(utils_1.exitWithError).toBeCalledTimes(1);
     }));
     it('push with --files', () => __awaiter(void 0, void 0, void 0, function* () {
-        utils_1.loadConfigAndHandleErrors.mockImplementation(({ files }) => {
-            return Object.assign(Object.assign({}, config_1.ConfigFixture), { files });
-        });
-        //@ts-ignore
+        const mockConfig = Object.assign(Object.assign({}, config_1.ConfigFixture), { files: ['./resouces/1.md', './resouces/2.md'] });
         fs.statSync.mockImplementation(() => {
             return { isDirectory: () => false, size: 10 };
         });
@@ -93,7 +90,7 @@ describe('push', () => {
             destination: '@org/my-api@1.0.0',
             public: true,
             files: ['./resouces/1.md', './resouces/2.md'],
-        });
+        }, mockConfig);
         expect(redoclyClient.registryApi.pushApi).toHaveBeenLastCalledWith({
             filePaths: ['filePath', 'filePath', 'filePath'],
             isUpsert: true,
@@ -112,25 +109,23 @@ describe('push', () => {
             destination: 'test@v1',
             branchName: 'test',
             public: true,
-            'batch-id': '123',
+            'job-id': '123',
             'batch-size': 2,
-        });
+        }, config_1.ConfigFixture);
         expect(utils_1.exitWithError).toBeCalledTimes(1);
-        expect(utils_1.exitWithError).toBeCalledWith(`No organization provided, please use the right format: ${colorette_1.yellow('<@organization-id/api-name@api-version>')} or specify the 'organization' field in the config file.`);
+        expect(utils_1.exitWithError).toBeCalledWith(`No organization provided, please use --organization option or specify the 'organization' field in the config file.`);
     }));
     it('push should work with organization in config', () => __awaiter(void 0, void 0, void 0, function* () {
-        utils_1.loadConfigAndHandleErrors.mockImplementation(() => {
-            return Object.assign(Object.assign({}, config_1.ConfigFixture), { organization: 'test_org' });
-        });
+        const mockConfig = Object.assign(Object.assign({}, config_1.ConfigFixture), { organization: 'test_org' });
         yield push_1.handlePush({
             upsert: true,
             api: 'spec.json',
             destination: 'my-api@1.0.0',
             branchName: 'test',
             public: true,
-            'batch-id': '123',
+            'job-id': '123',
             'batch-size': 2,
-        });
+        }, mockConfig);
         expect(redoclyClient.registryApi.pushApi).toBeCalledTimes(1);
         expect(redoclyClient.registryApi.pushApi).toHaveBeenLastCalledWith({
             branch: 'test',
@@ -145,47 +140,65 @@ describe('push', () => {
             batchSize: 2,
         });
     }));
-    it('push should work if destination not provided and api in config is provided', () => __awaiter(void 0, void 0, void 0, function* () {
-        utils_1.loadConfigAndHandleErrors.mockImplementation(() => {
-            return Object.assign(Object.assign({}, config_1.ConfigFixture), { organization: 'test_org', apis: { 'my-api@1.0.0': { root: 'path' } } });
-        });
+    it('push should work if destination not provided but api in config is provided', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockConfig = Object.assign(Object.assign({}, config_1.ConfigFixture), { organization: 'test_org', apis: { 'my-api@1.0.0': { root: 'path' } } });
         yield push_1.handlePush({
             upsert: true,
-            api: 'spec.json',
             branchName: 'test',
             public: true,
-            'batch-id': '123',
+            'job-id': '123',
             'batch-size': 2,
-        });
+        }, mockConfig);
         expect(redoclyClient.registryApi.pushApi).toBeCalledTimes(1);
     }));
-    it('push should fail if destination and apis not provided', () => __awaiter(void 0, void 0, void 0, function* () {
-        utils_1.loadConfigAndHandleErrors.mockImplementation(() => {
-            return { organization: 'test_org', apis: {} };
-        });
+    it('push should fail if apis not provided', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockConfig = { organization: 'test_org', apis: {} };
         yield push_1.handlePush({
             upsert: true,
             branchName: 'test',
             public: true,
-            'batch-id': '123',
+            'job-id': '123',
             'batch-size': 2,
-        });
+        }, mockConfig);
         expect(utils_1.exitWithError).toBeCalledTimes(1);
         expect(utils_1.exitWithError).toHaveBeenLastCalledWith('Api not found. Please make sure you have provided the correct data in the config file.');
     }));
+    it('push should fail if destination not provided', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockConfig = { organization: 'test_org', apis: {} };
+        yield push_1.handlePush({
+            upsert: true,
+            api: 'api.yaml',
+            branchName: 'test',
+            public: true,
+            'job-id': '123',
+            'batch-size': 2,
+        }, mockConfig);
+        expect(utils_1.exitWithError).toBeCalledTimes(1);
+        expect(utils_1.exitWithError).toHaveBeenLastCalledWith('No destination provided, please use --destination option to provide destination.');
+    }));
+    it('push should fail if destination format is not valid', () => __awaiter(void 0, void 0, void 0, function* () {
+        const mockConfig = { organization: 'test_org', apis: {} };
+        yield push_1.handlePush({
+            upsert: true,
+            destination: 'name/v1',
+            branchName: 'test',
+            public: true,
+            'job-id': '123',
+            'batch-size': 2,
+        }, mockConfig);
+        expect(utils_1.exitWithError).toHaveBeenCalledWith(`Destination argument value is not valid, please use the right format: ${colorette_1.yellow('<api-name@api-version>')}`);
+    }));
     it('push should work and encode name with spaces', () => __awaiter(void 0, void 0, void 0, function* () {
         const encodeURIComponentSpy = jest.spyOn(global, 'encodeURIComponent');
-        utils_1.loadConfigAndHandleErrors.mockImplementation(() => {
-            return Object.assign(Object.assign({}, config_1.ConfigFixture), { organization: 'test_org', apis: { 'my test api@v1': { root: 'path' } } });
-        });
+        const mockConfig = Object.assign(Object.assign({}, config_1.ConfigFixture), { organization: 'test_org', apis: { 'my test api@v1': { root: 'path' } } });
         yield push_1.handlePush({
             upsert: true,
             destination: 'my test api@v1',
             branchName: 'test',
             public: true,
-            'batch-id': '123',
+            'job-id': '123',
             'batch-size': 2,
-        });
+        }, mockConfig);
         expect(encodeURIComponentSpy).toHaveReturnedWith('my%20test%20api');
         expect(redoclyClient.registryApi.pushApi).toBeCalledTimes(1);
     }));
@@ -194,65 +207,91 @@ describe('transformPush', () => {
     it('should adapt the existing syntax', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeApiOrDestination: 'openapi.yaml',
+            api: 'openapi.yaml',
             maybeDestination: '@testing_org/main@v1',
-        });
+        }, {});
         expect(cb).toBeCalledWith({
             api: 'openapi.yaml',
             destination: '@testing_org/main@v1',
-        });
+        }, {});
     });
     it('should adapt the existing syntax (including branchName)', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeApiOrDestination: 'openapi.yaml',
+            api: 'openapi.yaml',
             maybeDestination: '@testing_org/main@v1',
             maybeBranchName: 'other',
-        });
+        }, {});
         expect(cb).toBeCalledWith({
             api: 'openapi.yaml',
             destination: '@testing_org/main@v1',
             branchName: 'other',
-        });
+        }, {});
     });
     it('should use --branch option firstly', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeApiOrDestination: 'openapi.yaml',
+            api: 'openapi.yaml',
             maybeDestination: '@testing_org/main@v1',
             maybeBranchName: 'other',
             branch: 'priority-branch',
-        });
+        }, {});
         expect(cb).toBeCalledWith({
             api: 'openapi.yaml',
             destination: '@testing_org/main@v1',
             branchName: 'priority-branch',
-        });
+        }, {});
     });
     it('should work for a destination only', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeApiOrDestination: '@testing_org/main@v1',
-        });
+            api: '@testing_org/main@v1',
+        }, {});
         expect(cb).toBeCalledWith({
             destination: '@testing_org/main@v1',
-        });
+        }, {});
+    });
+    it('should work for a api only', () => {
+        const cb = jest.fn();
+        push_1.transformPush(cb)({
+            api: 'test.yaml',
+        }, {});
+        expect(cb).toBeCalledWith({
+            api: 'test.yaml',
+        }, {});
     });
     it('should accept aliases for the old syntax', () => {
         const cb = jest.fn();
         push_1.transformPush(cb)({
-            maybeApiOrDestination: 'alias',
+            api: 'alias',
             maybeDestination: '@testing_org/main@v1',
-        });
+        }, {});
         expect(cb).toBeCalledWith({
             destination: '@testing_org/main@v1',
             api: 'alias',
-        });
+        }, {});
+    });
+    it('should use --job-id option firstly', () => {
+        const cb = jest.fn();
+        push_1.transformPush(cb)({
+            'batch-id': 'b-123',
+            'job-id': 'j-123',
+            api: 'test',
+            maybeDestination: 'main@v1',
+            branch: 'test',
+            destination: 'main@v1',
+        }, {});
+        expect(cb).toBeCalledWith({
+            'job-id': 'j-123',
+            api: 'test',
+            branchName: 'test',
+            destination: 'main@v1',
+        }, {});
     });
     it('should accept no arguments at all', () => {
         const cb = jest.fn();
-        push_1.transformPush(cb)({});
-        expect(cb).toBeCalledWith({});
+        push_1.transformPush(cb)({}, {});
+        expect(cb).toBeCalledWith({}, {});
     });
 });
 describe('getDestinationProps', () => {