Skip to content

Commit e593630

Browse files
Merge branch 'dev' into fix/dep
2 parents 3c25429 + f9e8b35 commit e593630

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

__tests__/api/BundlePush/BundlePusher.test.ts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -787,7 +787,7 @@ describe("BundlePusher01", () => {
787787
await runPushTest("__tests__/__resources__/ExampleBundle01", true,
788788
"PUSH operation completed");
789789

790-
expect(consoleText).not.toContain("WARNING: No .zosAttributes file found in the bundle directory, default values will be applied.");
790+
expect(consoleText).not.toContain("WARNING: No .zosattributes file found in the bundle directory, default values will be applied.");
791791
expect(zosMFSpy).toHaveBeenCalledTimes(1);
792792
expect(sshSpy).toHaveBeenCalledTimes(1);
793793
expect(createSpy).toHaveBeenCalledTimes(1);
@@ -802,7 +802,7 @@ describe("BundlePusher01", () => {
802802
await runPushTest("__tests__/__resources__/ExampleBundle01", true,
803803
"PUSH operation completed");
804804

805-
expect(consoleText).toContain("WARNING: No .zosAttributes file found in the bundle directory, default values will be applied.");
805+
expect(consoleText).toContain("WARNING: No .zosattributes file found in the bundle directory, default values will be applied.");
806806
expect(zosMFSpy).toHaveBeenCalledTimes(1);
807807
expect(sshSpy).toHaveBeenCalledTimes(1);
808808
expect(createSpy).toHaveBeenCalledTimes(1);
@@ -1132,7 +1132,7 @@ describe("BundlePusher01", () => {
11321132
expect(consoleText).toContain("Making remote bundle directory '/u/ThisDoesNotExist/12345678'");
11331133
expect(consoleText).toContain("Accessing contents of remote bundle directory");
11341134
expect(consoleText).toContain("Uploading bundle contents to remote directory");
1135-
expect(consoleText).toContain("WARNING: No .zosAttributes file found in the bundle directory, default values will be applied");
1135+
expect(consoleText).toContain("WARNING: No .zosattributes file found in the bundle directory, default values will be applied");
11361136
expect(consoleText).toContain("Running 'npm install' in '/u/ThisDoesNotExist/12345678'");
11371137
expect(consoleText).toContain("Injected stdout shell message");
11381138
expect(consoleText).toContain("Deploying bundle '12345678' to CICS");
@@ -1172,7 +1172,7 @@ describe("BundlePusher01", () => {
11721172
expect(consoleText).toContain("Removing contents of remote bundle directory");
11731173
expect(consoleText).toContain("Issuing SSH command 'if [ \"$(ls)\" ]; then rm -r *; fi' in remote directory '/u/ThisDoesNotExist/12345678'");
11741174
expect(consoleText).toContain("Uploading bundle contents to remote directory");
1175-
expect(consoleText).toContain("WARNING: No .zosAttributes file found in the bundle directory, default values will be applied");
1175+
expect(consoleText).toContain("WARNING: No .zosattributes file found in the bundle directory, default values will be applied");
11761176
expect(consoleText).toContain("Running 'npm install' in '/u/ThisDoesNotExist/12345678'");
11771177
expect(consoleText).toContain("Injected stdout shell message");
11781178
expect(consoleText).toContain("Deploying bundle '12345678' to CICS");
@@ -1282,7 +1282,7 @@ describe("BundlePusher01", () => {
12821282
expect(consoleText).toContain("Making remote bundle directory '/u/ThisDoesNotExist/12345678'");
12831283
expect(consoleText).toContain("Accessing contents of remote bundle directory");
12841284
expect(consoleText).toContain("Uploading bundle contents to remote directory");
1285-
expect(consoleText).toContain("WARNING: No .zosAttributes file found in the bundle directory, default values will be applied");
1285+
expect(consoleText).toContain("WARNING: No .zosattributes file found in the bundle directory, default values will be applied");
12861286
expect(consoleText).toContain("Deploying bundle '12345678' to CICS");
12871287
expect(consoleText).toContain("Deploy complete");
12881288
expect(consoleText).toContain("Gathering scope information");
@@ -1335,7 +1335,7 @@ describe("BundlePusher01", () => {
13351335
expect(consoleText).toContain("Making remote bundle directory '/u/ThisDoesNotExist/12345678'");
13361336
expect(consoleText).toContain("Accessing contents of remote bundle directory");
13371337
expect(consoleText).toContain("Uploading bundle contents to remote directory");
1338-
expect(consoleText).toContain("WARNING: No .zosAttributes file found in the bundle directory, default values will be applied");
1338+
expect(consoleText).toContain("WARNING: No .zosattributes file found in the bundle directory, default values will be applied");
13391339
expect(consoleText).toContain("Deploying bundle '12345678' to CICS");
13401340
expect(consoleText).toContain("Deploy ended with errors");
13411341
expect(consoleText).toContain("Gathering scope information");

src/api/BundlePush/BundlePusher.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ export class BundlePusher {
586586
}
587587

588588
// A project specific .zosattributes has not been found, so use a default
589-
this.issueWarning("No .zosAttributes file found in the bundle directory, default values will be applied.");
589+
this.issueWarning("No .zosattributes file found in the bundle directory, default values will be applied.");
590590
return new ZosFilesAttributes(Bundle.getTemplateZosAttributesFile());
591591
}
592592

0 commit comments

Comments
 (0)