reapply merge conflict resolutions that got lost

Chriscbr · Chriscbr · commit 6a6bf917c483 · 2022-05-20T12:26:44.000-07:00
diff --git a/packages/@aws-cdk/core/test/synthesis.test.ts b/packages/@aws-cdk/core/test/synthesis.test.ts
@@ -113,13 +113,19 @@ describe('synthesis', () => {
     const stack = new cdk.Stack(app, 'one-stack');
 
     class MyConstruct extends Construct {
-      protected synthesize(s: cdk.ISynthesisSession) {
-        writeJson(s.assembly.outdir, 'foo.json', { bar: 123 });
-        s.assembly.addArtifact('my-random-construct', {
-          type: cxschema.ArtifactType.AWS_CLOUDFORMATION_STACK,
-          environment: 'aws://12345/bar',
-          properties: {
-            templateFile: 'foo.json',
+      constructor(scope: Construct, id: string) {
+        super(scope, id);
+
+        cdk.attachCustomSynthesis(this, {
+          onSynthesize(s: cdk.ISynthesisSession) {
+            writeJson(s.assembly.outdir, 'foo.json', { bar: 123 });
+            s.assembly.addArtifact('my-random-construct', {
+              type: cxschema.ArtifactType.AWS_CLOUDFORMATION_STACK,
+              environment: 'aws://12345/bar',
+              properties: {
+                templateFile: 'foo.json',
+              },
+            });
           },
         });
       }
@@ -137,7 +143,7 @@ describe('synthesis', () => {
     expect(readJson(session.directory, 'foo.json')).toEqual({ bar: 123 });
     expect(session.manifest).toEqual({
       version: cxschema.Manifest.version(),
-      artifacts: {
+      artifacts: expect.objectContaining({
         'Tree': {
           type: 'cdk:tree',
           properties: { file: 'tree.json' },
@@ -147,16 +153,16 @@ describe('synthesis', () => {
           environment: 'aws://12345/bar',
           properties: { templateFile: 'foo.json' },
         },
-        'one-stack': {
+        'one-stack': expect.objectContaining({
           type: 'aws:cloudformation:stack',
           environment: 'aws://unknown-account/unknown-region',
-          properties: {
+          properties: expect.objectContaining({
             templateFile: 'one-stack.template.json',
             validateOnSynth: false,
-          },
+          }),
           displayName: 'one-stack',
-        },
-      },
+        }),
+      }),
     });
   });
 
