re-add e2e

Author: clegginabox

.github/workflows/tests.yaml

@@ -59,43 +59,40 @@ jobs:
           project-token: ${{ secrets.CODACY_PROJECT_TOKEN }}
           coverage-reports: clover.xml
 
-#  e2e:
-#    runs-on: ubuntu-latest
-#    name: E2E Tests
-#
-#    steps:
-#      - uses: actions/checkout@v4
-#
-#      - name: Build and start services
-#        run: docker compose up -d --build php redis
-#
-#      - name: Install PHP dependencies
-#        run: docker compose exec -T php composer install --no-interaction --prefer-dist --ignore-platform-req=ext-zookeeper --ignore-platform-req=ext-memcached
-#
-#      - name: Start worker
-#        run: docker compose up -d worker
-#
-#      - name: Wait for services to be ready
-#        run: |
-#          echo "Waiting for services..."
-#          sleep 5
-#          docker compose ps
-#
-#      - name: Run e2e tests
-#        run: docker compose run --rm e2e
-#
-#      - name: Show worker logs on failure
-#        if: failure()
-#        run: docker compose logs worker
-#
-#      - name: Upload test artifacts
-#        if: failure()
-#        uses: actions/upload-artifact@v4
-#        with:
-#          name: playwright-report
-#          path: e2e/test-results/
-#          retention-days: 7
-#
-#      - name: Stop services
-#        if: always()
-#        run: docker compose down
+  e2e:
+    runs-on: ubuntu-latest
+    name: E2E Tests
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Build and start services
+        run: docker compose up -d --build php redis
+
+      - name: Install PHP dependencies
+        run: docker compose exec -T php composer install --no-interaction --prefer-dist --ignore-platform-req=ext-zookeeper --ignore-platform-req=ext-memcached
+
+      - name: Wait for services to be ready
+        run: |
+          echo "Waiting for services..."
+          sleep 5
+          docker compose ps
+
+      - name: Run e2e tests
+        run: docker compose run --rm e2e
+
+      - name: Show worker logs on failure
+        if: failure()
+        run: docker compose logs worker
+
+      - name: Upload test artifacts
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-report
+          path: e2e/test-results/
+          retention-days: 7
+
+      - name: Stop services
+        if: always()
+        run: docker compose down

e2e/tests/01-lock.spec.ts

@@ -24,10 +24,9 @@ test.describe.serial('01-global-lock - Double-Click Protection', () => {
 
     // Should show submitting, then running
     await expect(page.locator('#status')).toContainText('Processing');
-    await expect(page.locator('#status')).toHaveClass(/wait/);
 
     // Wait for completion (5s work + buffer)
-    await expect(page.locator('#status')).toContainText('Done', {timeout: 4000});
+    await expect(page.locator('#status')).toContainText('Done', {timeout: 5000});
     await expect(page.locator('#status')).toHaveClass(/ok/);
   });
 
@@ -55,7 +54,7 @@ test.describe.serial('01-global-lock - Double-Click Protection', () => {
       // First user starts action
       await page1.goto('/global-lock/');
       await page1.locator('#go').click();
-      await expect(page1.locator('#status')).toContainText('Submitting');
+      await expect(page1.locator('#status')).toContainText('Processing');
 
       // Second user tries to start - should be instantly blocked
       await page2.goto('/global-lock/');
@@ -68,7 +67,7 @@ test.describe.serial('01-global-lock - Double-Click Protection', () => {
 
       // Second user can now start
       await page2.locator('#go').click();
-      await expect(page2.locator('#status')).toContainText('Submitting');
+      await expect(page2.locator('#status')).toContainText('Processing');
     } finally {
       await context1.close();
       await context2.close();

examples/src/GlobalLock/GlobalLockService.php

@@ -5,18 +5,12 @@
 namespace App\GlobalLock;
 
 use App\Factory\AirlockFactory;
-use App\Infrastructure\JobQueue;
-use App\Infrastructure\StatusStore;
 use Clegginabox\Airlock\EntryResult;
+use Clegginabox\Airlock\Seal\SealToken;
 
 final readonly class GlobalLockService
 {
-    public function __construct(
-        private AirlockFactory $airlockFactory,
-        private JobQueue $jobs,
-        private StatusStore $statusStore
-    ) {
-    }
+    public function __construct(private AirlockFactory $airlockFactory) {}
 
     public function start(string $clientId, int $durationSeconds = 10): EntryResult
     {
@@ -29,35 +23,18 @@ public function start(string $clientId, int $durationSeconds = 10): EntryResult
 
         $result = $airlock->enter($clientId);
 
-        if (!$result->isAdmitted()) {
-            return $result;
-        }
+        if ($result->isAdmitted()) {
+            $token = $result->getToken();
+            assert($token instanceof SealToken);
 
-        $token = $result->getToken();
-        if ($token === null) {
-            return EntryResult::queued(-1, '');
+            try {
+                // Do a long running task here
+                sleep($durationSeconds);
+            } finally {
+                $airlock->release($token);
+            }
         }
 
-        $this->jobs->enqueue(GlobalLock::NAME->value, [
-            'clientId' => $clientId,
-            'durationSeconds' => $durationSeconds,
-            'serializedKey' => (string) $token,
-        ]);
-
         return $result;
     }
-
-    public function status(string $clientId): array
-    {
-        $status = $this->statusStore->get(GlobalLock::NAME->value, $clientId);
-
-        if ($status !== null) {
-            return $status;
-        }
-
-        return [
-            'state' => 'pending',
-            'message' => 'Waiting for worker...',
-        ];
-    }
 }

examples/src/GlobalLock/Handler.php

@@ -1,32 +1,8 @@
 const status = document.getElementById('status');
 const button = document.getElementById('go');
 
-async function pollStatus(clientId) {
-    const url = `./global-lock/status?clientId=${encodeURIComponent(clientId)}`;
-
-    while (true) {
-        const res = await fetch(url);
-        const data = await res.json();
-
-        status.textContent = data.message || data.state;
-        status.className = 'status';
-
-        if (data.state === 'running') {
-            status.classList.add('wait');
-        } else if (data.state === 'done') {
-            status.classList.add('ok');
-            return;
-        } else if (data.state === 'blocked') {
-            status.classList.add('error');
-            return;
-        }
-
-        await new Promise(r => setTimeout(r, 1000));
-    }
-}
-
 button.onclick = async () => {
-    status.textContent = 'Submitting...';
+    status.textContent = 'Processing...';
     status.className = 'status';
 
     try {
@@ -36,10 +12,11 @@ button.onclick = async () => {
         if (!res.ok || !data.ok) {
             status.textContent = data.error || 'Failed to start';
             status.classList.add('error');
-            return;
+        } else {
+            status.textContent = 'Done!';
+            status.classList.remove('error');
+            status.classList.add('ok');
         }
-
-        await pollStatus(data.clientId);
     } catch (err) {
         status.textContent = 'Error: ' + err.message;
         status.classList.add('error');