Import fork updates and Cypress setup from JackDeveloper1122

.github/workflows/tests.yml

@@ -8,18 +8,38 @@ on:
             - main
 
 jobs:
+    prepare-matrix:
+        name: Prepare test matrix
+        runs-on: ubuntu-24.04
+        outputs:
+            wordpress: ${{ steps.wordpress-matrix.outputs.wordpress }}
+        steps:
+            - name: Checkout plugin
+              uses: actions/checkout@v6
+              with:
+                  persist-credentials: false
+
+            - name: Build dynamic WordPress matrix
+              id: wordpress-matrix
+              shell: bash
+              run: |
+                  set -euo pipefail
+                  wordpress_versions="$(python3 scripts/get-wordpress-matrix.py)"
+                  echo "Using WordPress versions: ${wordpress_versions}"
+                  echo "wordpress=${wordpress_versions}" >> "$GITHUB_OUTPUT"
+
     e2e:
+        needs: prepare-matrix
         name: PHP ${{ matrix.php }} - WP ${{ matrix.wordpress }}
         runs-on: ubuntu-24.04
         strategy:
             fail-fast: false
             matrix:
-                php: ["8.2", "8.3", "8.4"]
-                wordpress: ["6.7", "6.8"]
-                exclude:
-                    # Exclude older PHP versions with newer WordPress
-                    - php: "7.4"
-                      wordpress: "6.5.3"
+                # php: ["8.2", "8.3", "8.4"]
+                # wordpress: ${{ fromJSON(needs.prepare-matrix.outputs.wordpress) }}
+                # Temporarily pinned while fixing browser test stability.
+                php: ["8.4"]
+                wordpress: ["6.9.4"]
 
         services:
             mysql:
@@ -187,7 +207,7 @@ jobs:
               run: composer install -q --no-ansi --no-interaction --no-scripts --no-progress --prefer-dist
 
             - name: Run Pest tests
-              run: ./vendor/bin/pest -v --ci --bail --colors=always
+              run: ./vendor/bin/pest -v --ci --colors=always
 
             - name: Upload test results
               if: always()

.gitignore

@@ -2,6 +2,8 @@
 build
 vendor/
 node_modules/
+package-lock.json
+test-results/
 .phpunit.result.cache
 var
 drivers

config.json

@@ -1,4 +1,4 @@
 {
   "TESTED_UP_TO": "6.9.4",
-  "STABLE_TAG": "1.105"
+  "STABLE_TAG": "1.104"
 }

cypress.config.js

@@ -0,0 +1,9 @@
+const { defineConfig } = require("cypress");
+
+module.exports = defineConfig({
+  e2e: {
+    // Set TEST_BASE_URL in CI/local; defaults to local WordPress.
+    baseUrl: process.env.TEST_BASE_URL || 'http://localhost:8100',
+    supportFile: false,
+  },
+});

cypress/e2e/plugin-core.cy.js

@@ -0,0 +1,41 @@
+describe('Simple Analytics Final Verification', () => {
+
+  beforeEach(() => {
+    // Phase 2: Handle login to ensure stability and avoid 403 errors
+    cy.visit('/wp-login.php');
+    cy.get('#user_login').type('admin'); 
+    cy.get('#user_pass').type('kQuWVcpdEFU'); 
+    cy.get('#wp-submit').click();
+  });
+
+  it('Verifies Phase 1: All Bug Fixes and UI', () => {
+    // 1. Navigate directly to the plugin settings
+    cy.visit('/wp-admin/admin.php?page=simpleanalytics');
+
+    // 2. Success Criteria: Verify UI Clarity (Issue #8)
+    // We check for the specific privacy text you added to simple-analytics.php
+    cy.get('body').should('contain', 'Simple Analytics');
+    cy.contains('GDPR-compliant').should('be.visible');
+
+    // 3. Success Criteria: Verify Saving Settings
+    // We use a broader selector for the input to ensure it finds it
+    cy.get('input').filter('[name*="custom_domain"]').should('exist').clear().type('scripts.example.com');
+    cy.get('button[type="submit"]').first().click();
+
+    // 4. Verification of successful save
+    cy.get('body').should('contain', 'Settings saved');
+  });
+
+  it('Verifies Phase 1: Script Injection Quality', () => {
+    cy.visit('/');
+
+    // Issue #6: Verify the data-platform attribute is correctly injected
+    cy.get('script[data-platform="wordpress"]').should('exist');
+
+    // Issue #11: Verify identifying comment prefix
+    cy.document().then((doc) => {
+      const html = doc.documentElement.innerHTML;
+      expect(html).to.contain('');
+    });
+  });
+});

cypress/fixtures/example.json

@@ -0,0 +1,5 @@
+{
+  "name": "Using fixtures to represent data",
+  "email": "hello@cypress.io",
+  "body": "Fixtures are a great way to mock data for responses to routes"
+}

cypress/support/commands.js

@@ -0,0 +1,25 @@
+// ***********************************************
+// This example commands.js shows you how to
+// create various custom commands and overwrite
+// existing commands.
+//
+// For more comprehensive examples of custom
+// commands please read more here:
+// https://on.cypress.io/custom-commands
+// ***********************************************
+//
+//
+// -- This is a parent command --
+// Cypress.Commands.add('login', (email, password) => { ... })
+//
+//
+// -- This is a child command --
+// Cypress.Commands.add('drag', { prevSubject: 'element'}, (subject, options) => { ... })
+//
+//
+// -- This is a dual command --
+// Cypress.Commands.add('dismiss', { prevSubject: 'optional'}, (subject, options) => { ... })
+//
+//
+// -- This will overwrite an existing command --
+// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })

cypress/support/e2e.js

@@ -0,0 +1,17 @@
+// ***********************************************************
+// This example support/e2e.js is processed and
+// loaded automatically before your test files.
+//
+// This is a great place to put global configuration and
+// behavior that modifies Cypress.
+//
+// You can change the location of this file or turn off
+// automatically serving support files with the
+// 'supportFile' configuration option.
+//
+// You can read more here:
+// https://on.cypress.io/configuration
+// ***********************************************************
+
+// Import commands.js using ES2015 syntax:
+import './commands'

package.json

@@ -3,12 +3,14 @@
   "scripts": {
     "dev": "tailwindcss -i resources/css/settings.css -o build/css/settings.css --watch",
     "build": "tailwindcss build -i resources/css/settings.css -o build/css/settings.css",
-    "tests:install": "playwright install --with-deps chromium",
-    "tests": "playwright test"
+    "tests:install": "playwright install --with-deps chromium && cypress install",
+    "tests": "vendor/bin/pest",
+    "tests:cypress": "cypress run --headless"
   },
   "devDependencies": {
     "@tailwindcss/forms": "^0.5.11",
     "@types/node": "^22.19.17",
+    "cypress": "^15.14.1",
     "playwright": "^1.59.1",
     "tailwindcss": "^3.4.19"
   }