Fixed stan + e2e

Author: slischka

.github/workflows/test.yml

@@ -59,20 +59,33 @@ jobs:
       - name: Wait for WordPress
         run: |
           for i in $(seq 1 60); do
-            if curl -sf -o /dev/null http://localhost:8071/; then
-              echo "WordPress ready"
+            if curl -sf -o /dev/null --connect-timeout 2 http://127.0.0.1:8071/; then
+              echo "WordPress responding"
               break
             fi
             if [ $i -eq 60 ]; then exit 1; fi
             sleep 5
           done
+          sleep 5
 
       - name: Install WordPress
         run: |
           docker compose exec -T wordpress bash -c 'cd /var/www/html && \
-            curl -sO https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && chmod +x wp-cli.phar && mv wp-cli.phar /usr/local/bin/wp && \
-            wp core install --url=http://localhost:8071 --title=Test --admin_user=test --admin_password=asdf123jkl --admin_email=test@test.test --skip-email --allow-root 2>/dev/null || true && \
+            (command -v wp >/dev/null 2>&1 || (curl -sO https://raw.githubusercontent.com/wp-cli/builds/gh-pages/phar/wp-cli.phar && chmod +x wp-cli.phar && mv wp-cli.phar /usr/local/bin/wp)) && \
+            wp core install --url=http://127.0.0.1:8071 --title=Test --admin_user=test --admin_password=asdf123jkl --admin_email=test@test.test --skip-email --allow-root 2>/dev/null || true && \
             wp plugin activate fapi-signals --allow-root 2>/dev/null || true'
+          sleep 3
+
+      - name: Wait for wp-admin
+        run: |
+          for i in $(seq 1 24); do
+            if curl -sf -o /dev/null -w "%{http_code}" --connect-timeout 2 http://127.0.0.1:8071/wp-admin/ | grep -qE '200|302'; then
+              echo "wp-admin ready"
+              break
+            fi
+            if [ $i -eq 24 ]; then echo "wp-admin timeout"; exit 1; fi
+            sleep 5
+          done
 
       - name: Setup Node
         uses: actions/setup-node@v4
@@ -88,7 +101,8 @@ jobs:
 
       - name: Playwright E2E
         env:
-          WP_BASE_URL: http://localhost:8071
+          CI: true
+          WP_BASE_URL: http://127.0.0.1:8071
           WP_ADMIN_USER: test
           WP_ADMIN_PASS: asdf123jkl
         run: npm run test:e2e

README.md

@@ -76,6 +76,10 @@ Backend generuje payloady v `PayloadBuilder` a odesila je pres `wp_remote_post`.
 
 Poznamka: testy pouzivaji REST reset endpoint `wp-json/fapi-signals/v1/reset`.
 
+**Lokálně vs. GitHub Actions CI**
+- **Lokálně**: Musí běžet Docker (`make dc-up`). WordPress už máš nainstalovaný a plugin aktivovaný. Všechny 3 E2E testy (včetně CookieYes) běží, pokud máš nainstalovaný plugin CookieYes (cookie-law-info).
+- **CI**: Workflow sám spustí `docker compose up -d`, počká na odpověď, nainstaluje WP přes wp-cli a aktivuje plugin. Test „cookieyes CMP“ se v CI přeskočí (`CI=true`), protože plugin CookieYes v kontejneru není. Ostatní dva E2E testy ověřují injekci pixelů a konverzí.
+
 ### PHPUnit
 Pokud mas nainstalovane dependencies:
 - `php vendor/bin/phpunit`

e2e/cmp-cookieyes.spec.js

@@ -58,7 +58,14 @@ async function fillInput(page, name, value) {
   }
 }
 
+async function saveSettings(page) {
+  await page.locator('form[action="options.php"]').waitFor({ state: 'visible', timeout: 30000 });
+  await page.getByRole('button', { name: /Uložit|Save changes/i }).click();
+  await page.waitForURL(/settings-updated=true/, { timeout: 15000 });
+}
+
 test('cookieyes CMP triggers injection after consent', async ({ page }) => {
+  test.skip(!!process.env.CI, 'CookieYes plugin not installed in CI');
   test.setTimeout(120000);
   await loginIfNeeded(page);
   await resetPlugin(page);
@@ -71,8 +78,7 @@ test('cookieyes CMP triggers injection after consent', async ({ page }) => {
   await setCheckbox(page, 'fapi_signals_settings[fapi_js_enabled]');
   await setCheckbox(page, 'fapi_signals_settings[rewards_script_enabled]');
 
-  await page.click('#submit');
-  await page.waitForURL(/settings-updated=true/);
+  await saveSettings(page);
 
   await page.goto(pageUrl);
 

e2e/consent-ignore.spec.js

@@ -36,6 +36,12 @@ async function fillInput(page, name, value) {
   }
 }
 
+async function saveSettings(page) {
+  await page.locator('form[action="options.php"]').waitFor({ state: 'visible', timeout: 30000 });
+  await page.getByRole('button', { name: /Uložit|Save changes/i }).click();
+  await page.waitForURL(/settings-updated=true/, { timeout: 15000 });
+}
+
 test('injects scripts for all tools when consent ignored', async ({ page, request }) => {
   await loginIfNeeded(page);
   await resetPlugin(page);
@@ -84,8 +90,7 @@ test('injects scripts for all tools when consent ignored', async ({ page, reques
   await setCheckbox(page, 'fapi_signals_settings[fapi_js_enabled]');
   await setCheckbox(page, 'fapi_signals_settings[rewards_script_enabled]');
 
-  await page.click('#submit');
-  await page.waitForURL(/settings-updated=true/);
+  await saveSettings(page);
 
   const response = await request.get(pageUrl);
   const html = await response.text();

e2e/consent-wait.spec.js

@@ -36,6 +36,12 @@ async function fillInput(page, name, value) {
   }
 }
 
+async function saveSettings(page) {
+  await page.locator('form[action="options.php"]').waitFor({ state: 'visible', timeout: 30000 });
+  await page.getByRole('button', { name: /Uložit|Save changes/i }).click();
+  await page.waitForURL(/settings-updated=true/, { timeout: 15000 });
+}
+
 test('does not inject scripts when consent waiting and no CMP', async ({ page, request }) => {
   await loginIfNeeded(page);
   await resetPlugin(page);
@@ -47,8 +53,7 @@ test('does not inject scripts when consent waiting and no CMP', async ({ page, r
   await setCheckbox(page, 'fapi_signals_settings[fapi_js_enabled]');
   await setCheckbox(page, 'fapi_signals_settings[rewards_script_enabled]');
 
-  await page.click('#submit');
-  await page.waitForURL(/settings-updated=true/);
+  await saveSettings(page);
 
   await page.goto(pageUrl);
 

phpstan.neon

@@ -13,6 +13,6 @@ parameters:
     - src
     - tests
   excludePaths:
-    - vendor
-    - wporg
-    - node_modules
+    - vendor (?)
+    - wporg (?)
+    - node_modules (?)