more fun with merges

Author: pcoop

__tests__/api/BundleContent/BundleMocked.test.ts

@@ -24,22 +24,6 @@ describe("MockedFilesystemTests", () => {
       const parser = require("xml2json");
     });
 
-    it("should complain if exceptions are thrown during manifest parsing", () => {
-
-      jest.spyOn(JSON, "parse").mockImplementationOnce(() => { throw new Error("Wibble"); });
-
-      let err: Error;
-      try {
-        const bund = new Bundle("__tests__/__resources__/ExampleBundle01", true, true);
-      }
-      catch (error) {
-        err = error;
-      }
-
-      expect(err).toBeDefined();
-      expect(err.message).toContain("Parsing error occurred reading a CICS manifest file: Wibble");
-    });
-
     it("should tolerate META-INF directory not existing", () => {
         // Mocks for the manifest - META-INF exists
         jest.spyOn(fs, "existsSync").mockImplementationOnce(() => ( false ));
@@ -565,4 +549,20 @@ describe("MockedFilesystemTests", () => {
 
         expect(err).toBeUndefined();
     });
+
+    it("should complain if exceptions are thrown during manifest parsing", () => {
+
+      jest.spyOn(JSON, "parse").mockImplementationOnce(() => { throw new Error("Wibble"); });
+
+      let err: Error;
+      try {
+        const bund = new Bundle("__tests__/__resources__/ExampleBundle01", true, true);
+      }
+      catch (error) {
+        err = error;
+      }
+
+      expect(err).toBeDefined();
+      expect(err.message).toContain("Parsing error occurred reading a CICS manifest file: Wibble");
+    });
 });

__tests__/api/BundleDeploy/__snapshots__/BundleDeployer.test.ts.snap

@@ -558,6 +558,6 @@ DEPLOY BUNDLE(12345678)
 "
 `;
 
-exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"DFHDPLOY did not generate any output. Most recent status update: 'Submitting DFHDPLOY JCL'."`;
+exports[`BundleDeployer01 should tolerate empty output from DFHDPLOY 1`] = `"DFHDPLOY did not generate any output. Most recent status update: 'Submitting DFHDPLOY JCL for the DEPLOY action'."`;
 
 exports[`BundleDeployer01 should undeploy successfully 1`] = `"Bundle undeployment successful."`;