Re-enable docker-compose-js and types unit tests

packages/docker-compose-js/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@terascope/docker-compose-js",
     "displayName": "Docker Compose Js",
-    "version": "1.4.2",
+    "version": "1.4.3",
     "description": "Node.js driver for controlling docker-compose testing environments.",
     "keywords": [
         "docker",
@@ -48,7 +48,7 @@
     },
     "srcMain": "src/index.ts",
     "terascope": {
-        "testSuite": "disabled",
+        "testSuite": "unit",
         "enableTypedoc": true
     }
 }

packages/docker-compose-js/src/index.ts

@@ -86,17 +86,20 @@ export class Compose {
                 });
                 cmd.on('close', (code) => {
                     debug('close with code', code);
-                    /// Do not throw an error if 'docker compose' fails
-                    if (code !== 0 && sCommand !== 'docker') {
+                    // In the scenario that the 'docker' command exists but the 'compose' arg is
+                    // invalid try 'docker-compose' command instead
+                    if (code === 125 && a[0] === 'compose') {
+                        runCommand('docker-compose', args);
+                    } else if (code !== 0) {
                         const error = new Error(`Command exited: ${code}\n${stderr}`);
                         // @ts-expect-error
                         error.stdout = stdout;
                         reject(error);
-                    /// In the senario that the docker command exists but the compose arg is invalid
-                    } else if (code === 125 && a[0] === 'compose') {
-                        runCommand('docker-compose', args);
                     } else {
-                        resolve(stdout);
+                        // sometimes a command is successful (no error), but prints a failure of
+                        // some kind to stderr. If no stdout, return stderr instead.
+                        const msg = stdout !== '' ? stdout : stderr;
+                        resolve(msg);
                     }
                 });
             }

packages/docker-compose-js/test/docker-compose-spec.ts

@@ -1,4 +1,5 @@
 import 'jest-extended';
+import { jest } from '@jest/globals';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { Compose } from '../src/index.js';
@@ -25,37 +26,42 @@ describe('compose', () => {
     it('should be able to call compose.version()', async () => {
         const result = await compose.version();
         expect(result).not.toBeNil();
-        expect(result).toContain('docker-compose version');
+        expect(result).toContain('Docker Compose version');
     });
 
     describe('when the cluster is up', () => {
-        beforeAll(() => compose.up({
-            timeout: 1,
-            'force-recreate': ''
-        }));
+        beforeAll(async () => {
+            await compose.up({
+                timeout: 1,
+                'force-recreate': ''
+            });
+        });
 
         afterAll(() => compose.down({
             timeout: 1,
             '--volumes': '',
             '--remove-orphans': ''
         }));
 
-        it('should be able to call rm on the service', () => {
-            expect(() => compose.rm('test')).not.toThrow();
+        it('should be able to call rm on the service', async () => {
+            const result = await compose.rm('test');
+            expect(result).toContain('No stopped containers');
         });
 
-        it('should be able to call port', () => {
+        it('should be able to call port on the service', () => {
             expect(() => compose.port('test', '40230')).not.toThrow();
         });
 
-        it('should be able to call pause and unpause the service', async () => {
-            await expect(async () => {
-                await compose.pause('test');
-                await compose.unpause('test');
-            }).resolves.not.toThrow();
+        it('should be able to call pause and unpause on the service', async () => {
+            await expect(
+                (async () => {
+                    await compose.pause('test');
+                    await compose.unpause('test');
+                })()
+            ).resolves.not.toThrow();
         });
 
-        it('should be able to call start, ps and stop the service', async () => {
+        it('should be able to call start, ps and stop on the service', async () => {
             await compose.start('test');
 
             const result = await compose.ps();
@@ -67,11 +73,13 @@ describe('compose', () => {
             });
         });
 
-        it('should be able to call restart and kill the service', async () => {
-            await expect(async () => {
-                await compose.restart('test', { '--timeout': 1 });
-                await compose.kill('test');
-            }).resolves.not.toThrow();
+        it('should be able to call restart and kill on the service', async () => {
+            await expect(
+                (async () => {
+                    await compose.restart('test', { '--timeout': 1 });
+                    await compose.kill('test');
+                })()
+            ).resolves.not.toThrow();
         });
 
         it('should return a rejection when passing in incorrect options', async () => {
@@ -80,7 +88,7 @@ describe('compose', () => {
                 await compose.start('something wrong');
             } catch (err) {
                 expect(err.message).toContain('Command exited: 1');
-                expect(err.message).toContain('No such service: something wrong');
+                expect(err.message).toContain('no such service: something wrong');
                 expect(err.stdout).toBeDefined();
             }
         });

packages/docker-compose-js/test/fixtures/example.yaml

@@ -1,4 +1,3 @@
-version: '2'
 services:
   test:
     image: 'bash:3.2.57'

packages/types/package.json

@@ -37,7 +37,7 @@
     },
     "srcMain": "src/index.ts",
     "terascope": {
-        "testSuite": "disabled",
+        "testSuite": "unit",
         "enableTypedoc": true
     }
 }