fix(executor): fix generateContents method (#149)

CircleCI-Public · Oct 12, 2022 · 29299f2 · 29299f2
1 parent c1ebea3
commit 29299f2
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 3 deletions.
diff --git a/src/lib/Components/Executors/exports/DockerExecutor.ts b/src/lib/Components/Executors/exports/DockerExecutor.ts
@@ -49,9 +49,7 @@ export class DockerExecutor extends Executor {
    */
   generateContents(): DockerExecutorContentsShape {
     const imagesArray: DockerImage[] = [this.image];
-    imagesArray.concat(this.serviceImages);
-
-    return imagesArray;
+    return imagesArray.concat(this.serviceImages);
   }
 
   get generableType(): GenerableType {

diff --git a/tests/Executor.test.ts b/tests/Executor.test.ts
@@ -34,6 +34,30 @@ describe('Instantiate Docker Executor', () => {
     expect(docker instanceof CircleCI.executors.Executor).toBeTruthy();
   });
 
+  const dockerWithMultipleImage = new CircleCI.executors.DockerExecutor(
+    'cimg/node:lts',
+  );
+  dockerWithMultipleImage.addServiceImage({
+    image: 'cimg/mysql:5.7',
+  });
+  const expectedShapeWithMultipleImage = {
+    docker: [
+      {
+        image: 'cimg/node:lts',
+      },
+      {
+        image: 'cimg/mysql:5.7',
+      },
+    ],
+    resource_class: 'medium',
+  };
+
+  it('Should match the expected outputh with two images', () => {
+    expect(dockerWithMultipleImage.generate()).toEqual(
+      expectedShapeWithMultipleImage,
+    );
+  });
+
   const reusableExecutor = new CircleCI.reusable.ReusableExecutor(
     'default',
     docker,