Merge branch 'master' into dir-to-uss-encoding

Signed-off-by: Jace Roell <[email protected]>

__tests__/__packages__/cli-test-utils/CHANGELOG.md

@@ -2,7 +2,7 @@
 
 All notable changes to the Zowe CLI test utils package will be documented in this file.
 
-## Recent Changes
+## `8.7.1`
 
 - BugFix: Improved the error message shown on MacOS when `runCliScript` method fails to run script that is missing shebang line. [#2314](https://github.com/zowe/zowe-cli/pull/2314)
 

__tests__/__packages__/cli-test-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zowe/cli-test-utils",
-  "version": "8.7.0",
+  "version": "8.7.1",
   "description": "Test utilities package for Zowe CLI plug-ins",
   "author": "Zowe",
   "license": "EPL-2.0",
@@ -43,7 +43,7 @@
   "devDependencies": {
     "@types/js-yaml": "^4.0.9",
     "@types/uuid": "^10.0.0",
-    "@zowe/imperative": "8.7.0"
+    "@zowe/imperative": "8.7.1"
   },
   "peerDependencies": {
     "@zowe/imperative": "^8.0.0"

__tests__/__packages__/cli-test-utils/src/TestUtils.ts

@@ -61,6 +61,7 @@ export function runCliScript(scriptPath: string, testEnvironment: ITestEnvironme
             env: childEnv,
             encoding: "buffer"
         });
+        // eslint-disable-next-line @typescript-eslint/no-magic-numbers
         if (process.platform === "darwin" && (response.error as ExecFileException)?.errno === -8) {
             throw new Error(`The script file ${path.basename(scriptPath)} failed to execute. Check that it starts with a shebang line.`);
         }

__tests__/__packages__/cli-test-utils/src/environment/TestEnvironment.ts

@@ -114,7 +114,7 @@ export class TestEnvironment {
     public static createUniqueTestDataDir(testName: string): string {
         const app = uuidv4() + "_" + testName + "/";
         const path = nodePath.resolve(TEST_RESULT_DATA_DIR + "/" + app);
-        IO.mkdirp(path);
+        IO.createDirSync(path);
         return path;
     }
 

lerna.json

@@ -1,5 +1,5 @@
 {
-  "version": "8.7.0",
+  "version": "8.7.1",
   "command": {
     "publish": {
       "ignoreChanges": [

packages/cli/__tests__/auth/__system__/__scripts__/auth_login_apiml_show_token.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 HOST=$1

packages/cli/__tests__/auth/__system__/__scripts__/auth_login_apiml_show_token_rfj.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 HOST=$1

packages/cli/__tests__/auth/__system__/__scripts__/auth_logout_apiml_show_token.sh

@@ -1,3 +1,4 @@
+#!/bin/bash
 set -e
 
 HOST=$1

packages/cli/__tests__/zosjobs/__system__/download/cli.zos-jobs.download.output.system.test.ts

@@ -14,8 +14,6 @@ import { ITestEnvironment } from "../../../../../../__tests__/__src__/environmen
 import { runCliScript } from "@zowe/cli-test-utils";
 import { ITestPropertiesSchema } from "../../../../../../__tests__/__src__/properties/ITestPropertiesSchema";
 import * as fs from "fs";
-import { Session } from "@zowe/imperative";
-import { GetJobs } from "@zowe/zos-jobs-for-zowe-sdk";
 
 // Test Environment populated in the beforeAll();
 let TEST_ENVIRONMENT: ITestEnvironment<ITestPropertiesSchema>;
@@ -49,14 +47,14 @@ describe("zos-jobs download output command", () => {
         it("should download a job and wait for it to reach output status", async () => {
             const response = runCliScript(__dirname + "/__scripts__/download-output/download_job_wait_for_output.sh",
                 TEST_ENVIRONMENT, [IEFBR14_JCL]);
-                expect(response.stderr.toString()).toBe("");
-                expect(response.status).toBe(0);
+            expect(response.stderr.toString()).toBe("");
+            expect(response.status).toBe(0);
         });
         it("should download a job and wait for it to reach active status", async () => {
             const response = runCliScript(__dirname + "/__scripts__/download-output/download_job_wait_for_active.sh",
                 TEST_ENVIRONMENT, [IEFBR14_JCL]);
-                expect(response.stderr.toString()).toBe("");
-                expect(response.status).toBe(0);
+            expect(response.stderr.toString()).toBe("");
+            expect(response.status).toBe(0);
         });
     });
     describe("output", () => {