@heroku/heroku-cli-util 9.0.1-beta.2 → 9.0.2

package/dist/index.d.ts

@@ -1,5 +1,3 @@
-import { initCliTest } from './test-helpers/init';
-import { restoreStdoutStderr, setupStdoutStderr, stderr, stdout } from './test-helpers/stub-output';
 import { AmbiguousError } from './types/errors/ambiguous';
 import { NotFound } from './types/errors/not-found';
 import { AddOnAttachmentWithConfigVarsAndPlan, AddOnWithRelatedData, Link } from './types/pg/data-api';
@@ -14,15 +12,6 @@ import { styledJSON } from './ux/styled-json';
 import { styledObject } from './ux/styled-object';
 import { table } from './ux/table';
 import { wait } from './ux/wait';
-export declare const testHelpers: {
-    expectOutput: (actual: string, expected: string) => Chai.Assertion;
-    initCliTest: typeof initCliTest;
-    restoreStdoutStderr: typeof restoreStdoutStderr;
-    runCommand: (Cmd: import("./test-helpers/run-command").GenericCmd, args?: string[], printStd?: boolean) => Promise<any>;
-    setupStdoutStderr: typeof setupStdoutStderr;
-    stderr: typeof stderr;
-    stdout: typeof stdout;
-};
 export declare const types: {
     errors: {
         AmbiguousError: typeof AmbiguousError;

package/dist/index.js

@@ -1,10 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hux = exports.utils = exports.types = exports.testHelpers = void 0;
-const expect_output_1 = require("./test-helpers/expect-output");
-const init_1 = require("./test-helpers/init");
-const run_command_1 = require("./test-helpers/run-command");
-const stub_output_1 = require("./test-helpers/stub-output");
+exports.hux = exports.utils = exports.types = void 0;
 const ambiguous_1 = require("./types/errors/ambiguous");
 const not_found_1 = require("./types/errors/not-found");
 const databases_1 = require("./utils/pg/databases");
@@ -17,15 +13,6 @@ const styled_json_1 = require("./ux/styled-json");
 const styled_object_1 = require("./ux/styled-object");
 const table_1 = require("./ux/table");
 const wait_1 = require("./ux/wait");
-exports.testHelpers = {
-    expectOutput: expect_output_1.default,
-    initCliTest: init_1.initCliTest,
-    restoreStdoutStderr: stub_output_1.restoreStdoutStderr,
-    runCommand: run_command_1.runCommand,
-    setupStdoutStderr: stub_output_1.setupStdoutStderr,
-    stderr: stub_output_1.stderr,
-    stdout: stub_output_1.stdout,
-};
 exports.types = {
     errors: {
         AmbiguousError: ambiguous_1.AmbiguousError,

package/package.json

@@ -1,7 +1,7 @@
 {
   "type": "commonjs",
   "name": "@heroku/heroku-cli-util",
-  "version": "9.0.1-beta.2",
+  "version": "9.0.2",
   "description": "Set of helpful CLI utilities",
   "author": "Heroku",
   "license": "ISC",
@@ -11,6 +11,7 @@
     "dist"
   ],
   "devDependencies": {
+    "@heroku-cli/test-utils": "0.1.1",
     "@heroku-cli/schema": "^2.0.0",
     "@types/chai": "^4.3.13",
     "@types/chai-as-promised": "^8.0.2",
@@ -27,8 +28,10 @@
     "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-mocha": "^10.4.3",
     "mocha": "^10.8.2",
+    "nock": "^13.2.9",
     "nyc": "^17.1.0",
     "sinon": "^18.0.1",
+    "stdout-stderr": "^0.1.13",
     "strip-ansi": "^6",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
@@ -41,8 +44,6 @@
     "@heroku/http-call": "^5.4.0",
     "@oclif/core": "^2.16.0",
     "debug": "^4.4.0",
-    "nock": "^13.2.9",
-    "stdout-stderr": "^0.1.13",
     "tunnel-ssh": "4.1.6"
   },
   "engines": {
@@ -54,9 +55,6 @@
       "source-map-support/register",
       "test/hooks.ts"
     ],
-    "file": [
-      "src/test-helpers/stub-output.ts"
-    ],
     "watch-extensions": "ts",
     "recursive": true,
     "reporter": "spec",

package/dist/test-helpers/expect-output.d.ts

@@ -1,2 +0,0 @@
-declare const expectOutput: (actual: string, expected: string) => Chai.Assertion;
-export default expectOutput;

package/dist/test-helpers/expect-output.js

@@ -1,16 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const chai_1 = require("chai");
-function stripIndents(str) {
-    str = str.trim().replace(/\s+$/gm, '');
-    const indent = (str.match(/^\s+[^$]/m) || [''])[0].length - 1;
-    const regexp = new RegExp(`^s{${indent}}`, 'mg');
-    return str.replace(regexp, '');
-}
-const expectOutput = function (actual, expected) {
-    // it can be helpful to strip all hyphens & spaces when migrating tests before perfecting
-    // use `.replace(/[\s─]/g, '')` on both actual & expected until tests pass, then remove, and paste actual into expected
-    return (0, chai_1.expect)(actual.trim().replace(/\s+$/gm, ''))
-        .to.equal(stripIndents(expected));
-};
-exports.default = expectOutput;

package/dist/test-helpers/init.d.ts

@@ -1 +0,0 @@
-export declare function initCliTest(): void;

package/dist/test-helpers/init.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.initCliTest = initCliTest;
-const path = require('node:path');
-const { color } = require('@heroku-cli/color');
-const nock = require('nock');
-function initCliTest() {
-    // eslint-disable-next-line no-multi-assign
-    process.env.TS_NODE_PROJECT = path.resolve('test/tsconfig.json');
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    global.columns = '120';
-    color.enabled = false;
-    nock.disableNetConnect();
-    if (process.env.ENABLE_NET_CONNECT === 'true') {
-        nock.enableNetConnect();
-    }
-}

package/dist/test-helpers/run-command.d.ts

@@ -1,9 +0,0 @@
-import { Command } from '@heroku-cli/command';
-import { APIClient } from '@heroku-cli/command';
-import { Config } from '@oclif/core';
-type CmdConstructorParams = ConstructorParameters<typeof Command>;
-export type GenericCmd = new (...args: CmdConstructorParams) => Command;
-export declare const runCommand: (Cmd: GenericCmd, args?: string[], printStd?: boolean) => Promise<any>;
-export declare const getConfig: () => Promise<Config>;
-export declare const getHerokuAPI: () => Promise<APIClient>;
-export {};

package/dist/test-helpers/run-command.js

@@ -1,43 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getHerokuAPI = exports.getConfig = exports.runCommand = void 0;
-const command_1 = require("@heroku-cli/command");
-const core_1 = require("@oclif/core");
-const stdout_stderr_1 = require("stdout-stderr");
-const stopMock = () => {
-    stdout_stderr_1.stdout.stop();
-    stdout_stderr_1.stderr.stop();
-};
-const runCommand = async (Cmd, args = [], printStd = false) => {
-    const conf = await (0, exports.getConfig)();
-    const instance = new Cmd(args, conf);
-    if (printStd) {
-        stdout_stderr_1.stdout.print = true;
-        stdout_stderr_1.stderr.print = true;
-    }
-    stdout_stderr_1.stdout.start();
-    stdout_stderr_1.stderr.start();
-    return instance
-        .run()
-        .then(args => {
-        stopMock();
-        return args;
-    })
-        .catch((error) => {
-        stopMock();
-        throw error;
-    });
-};
-exports.runCommand = runCommand;
-const getConfig = async () => {
-    const pjsonPath = require.resolve('../../package.json');
-    const conf = new core_1.Config({ root: pjsonPath });
-    await conf.load();
-    return conf;
-};
-exports.getConfig = getConfig;
-const getHerokuAPI = async () => {
-    const conf = await (0, exports.getConfig)();
-    return new command_1.APIClient(conf);
-};
-exports.getHerokuAPI = getHerokuAPI;

package/dist/test-helpers/stub-output.d.ts

@@ -1,4 +0,0 @@
-export declare function setupStdoutStderr(): void;
-export declare function restoreStdoutStderr(): void;
-export declare function stdout(): string;
-export declare function stderr(): string;

package/dist/test-helpers/stub-output.js

@@ -1,35 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.setupStdoutStderr = setupStdoutStderr;
-exports.restoreStdoutStderr = restoreStdoutStderr;
-exports.stdout = stdout;
-exports.stderr = stderr;
-const sinon = require("sinon");
-let stdoutWriteStub;
-let stdoutOutput = '';
-let stderrWriteStub;
-let stderrOutput = '';
-function setupStdoutStderr() {
-    stdoutOutput = '';
-    stdoutWriteStub = sinon.stub(process.stdout, 'write').callsFake((str) => {
-        stdoutOutput += str.toString();
-        return true;
-    });
-    stderrOutput = '';
-    stderrWriteStub = sinon.stub(process.stderr, 'write').callsFake((str) => {
-        stderrOutput += str.toString();
-        return true;
-    });
-}
-function restoreStdoutStderr() {
-    stdoutWriteStub.restore();
-    stdoutOutput = '';
-    stderrWriteStub.restore();
-    stderrOutput = '';
-}
-function stdout() {
-    return stdoutOutput;
-}
-function stderr() {
-    return stderrOutput;
-}