e2e-test: get containers and red test working

docker/tests/container-util.js

@@ -1,30 +1,19 @@
 import { writeFile } from 'fs/promises';
 import { GenericContainer, Wait } from 'testcontainers';
 
-/**
- * Add a log consumer to container which captures and logs events.
- * @param {GenericContainer} container
- * @param {string} logPrefix
- * @returns {GenericContainer}
- */
-export function consumeLogsWithPrefix(container, logPrefix) {
-  return container.withLogConsumer((stream) => {
-    stream.on('data', (line) => console.log(logPrefix + line));
-    stream.on('err', (line) => console.error(logPrefix + line));
-    stream.on('end', () => console.log(logPrefix + 'Stream closed'));
-  });
+
+export async function buildActionServer(buildContextPath) {
+  return  GenericContainer.fromDockerfile(buildContextPath).build();
 }
 
 /**
  * Start an `actual-server` instance from the local Dockerfile.
+ * @param {GenericContainer} newContainer
  * @returns {Promise<import('testcontainers').StartedTestContainer>}
  */
-export async function startActualContainer() {
-  let newContainer = new GenericContainer('../../Dockerfile')
-    .withExposedPorts(5006)
-    .withWaitStrategy(Wait.forListeningPorts());
-
-  newContainer = consumeLogsWithPrefix(newContainer, 'ActualServer: ');
+export async function startActualContainer(newContainer) {
+  newContainer = newContainer.withExposedPorts(5006)
+                             .withWaitStrategy(Wait.forListeningPorts());
 
   return newContainer.start();
 }
@@ -37,9 +26,9 @@ export async function startActualContainer() {
  * @returns {Promise<import('testcontainers').StartedTestContainer>}
  */
 export async function startCaddyContainer(actualServerPort) {
-  let caddyContainer = new GenericContainer('caddyContainer:latest')
+  let caddyContainer = new GenericContainer('caddy:latest')
     .withExposedPorts(80)
-    .withWaitStrategy(Wait.forListeningPorts());
+    .withWaitStrategy(Wait.forHttp('/', 80).forStatusCode(200));
 
   await writeFile(
     './Caddyfile',

docker/tests/reverse-proxies.test.js

@@ -1,6 +1,6 @@
 import { unlink } from 'fs/promises';
-import { request } from 'http';
-import { startActualContainer, startCaddyContainer } from './container-util.js';
+import request from 'supertest';
+import { buildActionServer, startActualContainer, startCaddyContainer } from './container-util.js';
 
 // Requires testcontainers:
 // `yarn add -D testcontainers`
@@ -24,32 +24,30 @@ import { startActualContainer, startCaddyContainer } from './container-util.js';
 // DEBUG=testcontainers* DOCKER_HOST=unix:///var/run/docker.sock yarn run e2e-test
 // https://node.testcontainers.org/configuration/
 
+let newActualServerBuild = await buildActionServer('./');
 describe('Actual Server with Caddy', () => {
   let actualServerContainer;
   let caddyContainer;
 
   beforeAll(async () => {
-    actualServerContainer = await startActualContainer();
+    actualServerContainer = await startActualContainer(newActualServerBuild);
     caddyContainer = await startCaddyContainer(
       actualServerContainer.getMappedPort(5006),
     );
-  }, 61 * 1000);
+  }, 66 * 1000);
 
-  it('should work with default config', async () => {
-    const host = caddyContainer.getHost();
-    console.log('Caddy host: ' + host);
-    request(
-      {
-        hostname: host,
-        port: caddyContainer.getMappedPort(80),
-        method: 'get',
-        path: '/health',
-      },
-      (res) => {
-        expect(res.statusCode).toBe(200);
-      },
-    );
-  }, 30000);
+  it('should not allow login with no password', async () => {
+    const hostname = caddyContainer.getHost();
+    const port = caddyContainer.getMappedPort(80);
+    const caddyHost = `${hostname}:${port}`;
+    console.log('Caddy host: ' + caddyHost);
+
+    const caddyRequest = request(caddyHost);
+
+    caddyRequest.post('/account/login').expect({"status":"error","reason":"invalid-password"}, (err) => {
+      throw err;
+    });
+  });
 
   afterAll(async () => {
     if (caddyContainer) await caddyContainer.stop();