Add DB fixtures for data model, and simple E2E test for the AST builder.

Author: apognu

.github/workflows/playground.yaml

@@ -9,10 +9,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
       - uses: pnpm/action-setup@v4
+      - uses: actions/setup-node@v4
+        with:
+          cache: pnpm
       - run: pnpm install --frozen-lockfile
-      - run: pnpm --filter tests exec playwright install
+      - run: pnpm --filter tests exec playwright install chromium-headless-shell
       - run: pnpm --filter tests run test
       - uses: actions/upload-artifact@v4
         if: ${{ !cancelled() }}

packages/tests/e2e/custom-lists.spec.ts

@@ -4,7 +4,7 @@ import { waitForThen } from 'tests/common/utils';
 
 test('Create new list', async ({ page }) => {
   await page.goto('/lists');
-
+  
   const listName = crypto.randomUUID();
   const values = Array.from({ length: 5 }, () => crypto.randomUUID());
 
@@ -21,9 +21,10 @@ test('Create new list', async ({ page }) => {
   await page.waitForURL('/lists/**');
   await page.waitForLoadState();
 
+  
   for (const value of values) {
     await waitForThen(page, page.getByRole('button', { name: 'New value' }), async (button) =>
-      button.click(),
+      await button.click(),
     );
 
     await waitForThen(

packages/tests/e2e/fixtures.ts

@@ -0,0 +1,69 @@
+import knex from 'knex';
+import crypto from 'crypto';
+
+interface Org { id: string; }
+
+interface Table {
+  table: string;
+  fields: { [key: string]: string};
+}
+
+const TABLES: Table[] = [
+  {
+    table: 'transactions',
+    fields: {
+      'beneficiary': 'String',
+      'amount': 'Float',
+    }
+  }
+]
+
+export const setupFixtures = async (dsn: string, apiUrl: string) => {
+  const sql = knex({ client: 'pg', connection: dsn });
+  const org = await sql<Org>('organizations').select('id').where('name', 'Zorg').first();
+  const apiKey = crypto.randomUUID();
+
+  const hash = crypto.createHash('sha256').update(apiKey).digest();
+
+  await sql('api_keys').insert({
+    'org_id': org!.id,
+    'role': 4,
+    'prefix': apiKey.substring(0, 3),
+    'key_hash': hash,
+  });
+
+  apiUrl = `http://localhost:${apiUrl}`;
+
+  for (const spec of TABLES) {
+    createTable(apiUrl, apiKey, spec);
+  }
+};
+
+const createTable = async (apiUrl: string, apiKey: string, table: Table) => {
+  const tableResponse = await fetch(`${apiUrl}/data-model/tables`, {
+    method: 'POST',
+    headers: {
+      'x-api-key': apiKey,
+    },
+    body: JSON.stringify({ 'name': table.table, 'description': 'Lorem ipsum.' })
+  });
+
+  if (tableResponse.status != 200) throw new Error('failed to create data model table');
+
+  const tableId = (await tableResponse.json() as { id: string; }).id;
+
+  for (const [fieldName, fieldType] of Object.entries(table.fields)) {
+    const fieldResponse = await fetch(`${apiUrl}/data-model/tables/${tableId}/fields`, {
+      method: 'POST',
+      headers: {
+        'x-api-key': apiKey,
+      },
+      body: JSON.stringify({
+        'name': fieldName,
+        'type': fieldType,
+      }),
+    });
+
+    if (fieldResponse.status != 200) throw new Error('failed to create data model table field');
+  }
+}

packages/tests/e2e/scenarios.spec.ts

@@ -0,0 +1,76 @@
+import { test, expect } from '@playwright/test';
+import crypto from 'crypto';
+import { waitForThen } from 'tests/common/utils';
+
+test('Create a simple scenario', async ({ page }) => {
+  await page.goto('/scenarios');
+  
+  const scenarioName = crypto.randomUUID();
+
+  await page.getByRole('button', { name: 'New Scenario' }).click();
+
+  await waitForThen(
+    page,
+    page.getByRole('textbox', { name: 'Name' }),
+    async (field) => await field.fill(scenarioName), 
+  );
+
+  await page.getByRole('textbox', { name: 'Description' }).fill('DESC');
+
+  await waitForThen(
+    page,
+    page.getByRole('combobox'),
+    async (box) => await box.click(),
+  );
+
+  await page.waitForTimeout(200);
+
+  await waitForThen(
+    page,
+    page.getByRole('option', { name: 'transactions' }),
+    async (option) => await option.click(),
+  );
+
+  await page.getByRole('button', { name: 'Save' }).click();
+
+  await waitForThen(
+    page,
+    page.getByRole('button', { name: 'Add trigger condition' }),
+    async (button) => await button.click(),
+  );
+
+  await page.getByRole('button', { name: 'Condition', exact: true }).click();
+  await page.getByRole('button', { name: 'Select an operand...' }).first().click();
+  await page.getByRole('option', { name: 'transactions' }).hover();
+  await page.getByText('amount').click();
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: '>' }).click();
+  await page.getByRole('button', { name: 'Select an operand...' }).click();
+  await page.getByRole('combobox', { name: 'Select or create an operand' }).fill('100');
+  await page.getByRole('combobox', { name: 'Select or create an operand' }).press('Enter');
+  await page.getByRole('button', { name: 'Save' }).click();
+  await page.getByRole('link', { name: 'Rules' }).click();
+  await page.getByRole('button', { name: 'Add' }).click();
+  await page.getByRole('button', { name: 'Add a Rule Add a rule to the' }).click();
+  await page.getByRole('button', { name: 'Group', exact: true }).click();
+  await page.getByRole('button', { name: 'Select an operand...' }).first().click();
+  await page.getByRole('option', { name: 'transactions' }).hover();
+  await page.getByText('amount').click();
+  await page.getByRole('combobox').click();
+  await page.getByRole('option', { name: '>' }).click();
+  await page.getByRole('button', { name: 'Select an operand...' }).click();
+  await page.getByRole('combobox', { name: 'Select or create an operand' }).fill('9000');
+  await page.getByRole('combobox', { name: 'Select or create an operand' }).press('Enter');
+  await page.getByRole('button', { name: 'Save' }).click();
+
+  await page.getByRole('listitem').filter({ hasText: 'Scenarios' }).getByRole('link').click();
+
+  await expect(page.getByRole('link', { name: `${scenarioName} DESC`})).toBeVisible();
+
+  await page.getByRole('link', { name: `${scenarioName} DESC` }).click();
+  await page.getByRole('link', { name: 'draft' }).click();
+
+  await expect(page.getByRole('button', { name: 'edit_operand.operator_type.' })).toHaveText('amount');
+  await expect(page.getByRole('combobox')).toHaveText('>');
+  await expect(page.getByRole('button', { name: 'Number 100' })).toBeVisible();
+});

packages/tests/e2e/setup.ts

@@ -1,5 +1,7 @@
 import { GenericContainer, Network, Wait } from 'testcontainers';
 
+import { setupFixtures } from './fixtures';
+
 async function globalSetup() {
   if (process.env['PW_SETUP_DONE']) return;
 
@@ -17,6 +19,9 @@ async function globalSetup() {
     .withDefaultLogDriver()
     .start();
 
+  const dsn = 'postgres://postgres:marble@db/marble?sslmode=disable';
+  const externalDsn = `postgres://postgres:marble@${db.getIpAddress(net.getName())}/marble?sslmode=disable`;
+
   const firebase = await new GenericContainer(
     'europe-west1-docker.pkg.dev/marble-infra/marble/firebase-emulator:latest',
   )
@@ -31,45 +36,46 @@ async function globalSetup() {
     .withPlatform('linux/x86_64')
     .withNetwork(net)
     .withEnvironment({
-      PG_CONNECTION_STRING: `postgres://postgres:marble@db/marble?sslmode=disable`,
+      PG_CONNECTION_STRING: dsn,
     })
     .withCommand(['-migrations'])
     .withWaitStrategy(Wait.forLogMessage('successfully migrated'))
     .withDefaultLogDriver()
     .start();
 
+
   const api = await new GenericContainer(
     'europe-west1-docker.pkg.dev/marble-infra/marble/marble-backend',
   )
     .withPlatform('linux/x86_64')
     .withNetwork(net)
     .withNetworkAliases('api')
     .withEnvironment({
-      PG_CONNECTION_STRING: `postgres://postgres:marble@db/marble?sslmode=disable`,
+      PG_CONNECTION_STRING: dsn,
       MARBLE_APP_URL: 'http://localhost:3000',
       FIREBASE_AUTH_EMULATOR_HOST: `firebase:9099`,
       GOOGLE_CLOUD_PROJECT: 'test-project',
       CREATE_GLOBAL_ADMIN_EMAIL: 'admin@checkmarble.com',
       CREATE_ORG_NAME: 'Zorg',
       CREATE_ORG_ADMIN_EMAIL: 'jbe@zorg.com',
-      AUTHENTICATION_JWT_SIGNING_KEY:
-        '-----BEGIN RSA PRIVATE KEY-----\nMIIEpAIBAAKCAQEAs+6r50m7qqLHHy7CvfmJPnAi+t/tubi7DPSM2jvA1etT1jEX\nrwbFbmooOu9LTgmjmxOq01p+XwkW1f7iPZViKrf7dEDEuqmpqYG9jPX4G/7xFcci\nGn1iSOiNx9awIKSYZa1wodlMCRM081DGqFNDMf1PScWIyM40nIwaGqLZht4HcOAq\nLbKDa15bxubBqZ9o/YnE1KmyBfq1tTnk0KzAb12Axt0xN4qB2zktsV/LLds+szMk\n/gRHjann1+fCZvxw1JzzRPtgeHLLYzn4ks3mwzy67RO3q/663KPZCsuYhlNCsMqp\n/HAbrF5PaihqzCZqLTDoIXXciCFFgwtLwm951wIDAQABAoIBAQCpb60tJX+1VYeQ\n06XK43rb8xjdiZUA+PYbYwZoUzBpwSq3Xo9g4E12hjzQEpqlJ+qKk+CfGm457AM3\nDMfbGhrRA2Oku4EGDdKYrnXikZVMN6yqx1RUAZJV+bfZYU+Fzbk8tjCEGG3DdfS8\n02nfBFkYb+MEIyGFhriAWmYSgxu4JTN0XRTyPqBytoSLqVCFbv0/yV2oJQDaXW08\nWAA8JtWhzqxACbFnPYe0hYUnrCA71t0v1P/N5uB4kKxI0tulGtW84noSyWA2LSdn\nJlKQW5WsyeMulGBMnIpj/OQJtQErupoITsh1TNi+6ffGgmuMCT1za70DHXVq9Ihu\nkpKBe0wRAoGBAOSarLfNvsS2lTH/8zPyhWBddCS5CfQAeUFLD5xWhQ7/6SenYzYY\n+oiiH2uL7d8grkobX5QLVvJ5ZXziYWoKgJe3SlrvRuNJZCAxvuynUCahhCT+chwW\nGz7ihXh3bGD0gtO6iogGBfrAkvRQnorkdSmVEZd1PsJV/lXp8LKgxJ91AoGBAMl+\ny/6NbzVHt9oQsrVrG/sCAOlqlfTt5KW6pI1WC4LoKBaGe+hy4emZ0G/M2feAJEPR\n92QrPRkVF5bVCjalJj42/7gQIl6r+DQ4+08gLB1MSpWua2M3UtEi/2gsMcQff/wg\n6kmNZObW5Jcnqpp6u72zQTQwF4H29XucV/Yw93abAoGADGvfIKmcSQIGv03CADuY\nRbEuQ2SOhuSTshmLApqs5jC/kXkF6gWXb18nx+c1iJ80+S/dlKS9F7XC7vM6CdIC\nRLwf3SsNNgJh32H0ltVMhJzYGk59EsuctWEHkZEjoW0HwstrBZMWNhbKpV3QD4n0\nV8sSxqEHRPX5ON/aRUp5BJUCgYEAlsymr2P6js2V80X7+Xqn/juJoyd6A0znioEd\nFgoHo3lMR09u/JC+Mq5DKOkPWAQ3H+rMU9NobpUyilf2xN7kuDtBNugcUO4zXCIp\nMxbI7URjrZJUHHUTLiIbNEOfG0DX8EJSFaoUkg7SFa5CKEsipt65Ne2oKkRBhLmF\nu2L6UXECgYBH1bpi0R6j7lIADtZtIJII/TezQbp+VK2R9qoNgkTnHoDjkRVR7v3m\n75wReMvTy1h0Qx/ROtStZz8d5uQuhdeJvbQPQR8KGFUFZDmVWxU+y15WI2H39FMA\nMireKxzCfGGtTsZnhDqYl9NuRPcAGYt5jvoERXlz7b69rkqQUrfy+Q==\n-----END RSA PRIVATE KEY-----',
-      SEGMENT_WRITE_KEY: 'UgkImFmHmBZAWh5fxIKBY3QtvlcBrhqQ',
     })
     .withExposedPorts(8080)
     .withCommand(['-server'])
     .withWaitStrategy(Wait.forHttp('/liveness', 8080, { abortOnContainerExit: true }))
     .withDefaultLogDriver()
     .start();
 
+    
   process.env['API_PORT'] = api.getFirstMappedPort().toString();
   process.env['FIREBASE_PORT'] = firebase.getFirstMappedPort().toString();
 
-  process.on('exit', () => {
-    api.stop();
-    firebase.stop();
-    db.stop();
-    net.stop();
+  await setupFixtures(externalDsn, process.env['API_PORT']);
+
+  process.on('exit', async () => {
+    await api.stop({ timeout: 1 });
+    await firebase.stop({ timeout: 1 });
+    await db.stop({ timeout: 1 });
+    await net.stop();
   });
 
   process.env['PW_SETUP_DONE'] = 'true';

packages/tests/package.json

@@ -15,6 +15,8 @@
   "devDependencies": {
     "@playwright/test": "^1.51.0",
     "@types/node": "22.7.7",
+    "knex": "^3.1.0",
+    "pg": "^8.13.3",
     "playwright": "^1.51.0",
     "testcontainers": "^10.18.0"
   }

packages/tests/playwright.config.ts

@@ -6,13 +6,17 @@ await setup();
 
 export default defineConfig({
   testDir: './e2e',
-  fullyParallel: true,
   reporter: 'html',
+  fullyParallel: true,
+  workers: 4,
   use: {
     headless: !process.env['PW_DEBUG'],
     baseURL: 'http://localhost:3000',
     trace: 'retain-on-failure',
     screenshot: 'only-on-failure',
+    launchOptions: {
+      slowMo: 250,
+    }
   },
   projects: [
     {