Merge branch 'develop' into bugfix/elementor-bg-images

Author: gabriel-detassigny

.env.example

@@ -0,0 +1,9 @@
+# Copy to `.env` and fill in real values. `.env` is gitignored.
+#
+# Used by Playwright (tests/e2e/playwright.config.js) at e2e startup.
+
+# Cloudinary connection string consumed by the wizard e2e spec
+# (tests/e2e/wizard-setup.spec.js). Use a dedicated test account —
+# never production credentials. See README "End-to-end testing" for
+# why this is named CLOUDINARY_E2E_URL rather than CLOUDINARY_URL.
+CLOUDINARY_E2E_URL=cloudinary://API_KEY:API_SECRET@CLOUD_NAME

.github/workflows/ci.yml

@@ -2,6 +2,7 @@ name: CI
 
 on:
   push:
+  pull_request:
 
 jobs:
   build:
@@ -41,3 +42,45 @@ jobs:
 
       - name: Run build
         run: npm run build
+
+  e2e:
+    name: E2E (Playwright)
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v4
+
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: '22'
+          cache: 'npm'
+
+      - name: Install dependencies
+        run: npm ci
+
+      - name: Install Playwright browsers
+        run: npx playwright install --with-deps chromium
+
+      - name: Build assets
+        run: npm run build
+
+      - name: Start wp-env
+        run: npm run env:start
+
+      - name: Run E2E tests
+        env:
+          CLOUDINARY_E2E_URL: ${{ secrets.CLOUDINARY_E2E_URL }}
+        run: npm run test:e2e
+
+      - name: Stop wp-env
+        if: always()
+        run: npm run env:stop
+
+      - name: Upload Playwright artifacts
+        if: failure()
+        uses: actions/upload-artifact@v4
+        with:
+          name: playwright-artifacts
+          path: artifacts/
+          retention-days: 7

.gitignore

@@ -36,6 +36,9 @@ js/*.map
 tests/data/
 tests/includes/
 coverage/html/
+/artifacts/
+/playwright-report/
+/test-results/
 
 # ENV files
 .env

README.md

@@ -117,6 +117,59 @@ Files included in the release package are defined in the `gruntfile.js` under th
 
 3. Run `npm run deploy-assets` to deploy just the WP.org plugin assets such as screenshots, icons and banners.
 
+## End-to-end testing
+
+E2E tests run against a wp-env site using Playwright.
+
+### One-time setup
+
+```bash
+npm install
+npx playwright install --with-deps chromium
+npm run env:start
+```
+
+### Running the tests
+
+```bash
+npm run test:e2e
+```
+
+### Wizard test credentials
+
+`tests/e2e/wizard-setup.spec.js` exercises the live Cloudinary connection flow, so it needs a real connection string. Provide one of two ways:
+
+**Option 1 — `.env` file (recommended for sustained local development).** Copy `.env.example` to `.env` and fill in the value. `.env` is gitignored. Playwright loads it automatically at startup.
+
+```bash
+cp .env.example .env
+# edit .env, set CLOUDINARY_E2E_URL=cloudinary://...
+npm run test:e2e
+```
+
+**Option 2 — shell export (good for one-off runs and CI).**
+
+```bash
+export CLOUDINARY_E2E_URL='cloudinary://API_KEY:API_SECRET@CLOUD_NAME'
+npm run test:e2e
+```
+
+A real shell env var takes precedence over the `.env` file.
+
+The variable is intentionally named `CLOUDINARY_E2E_URL` (not `CLOUDINARY_URL`) so it cannot be confused with the Cloudinary SDK convention or with anything you might define in `.wp-env.override.json` for local dev. Use a dedicated test Cloudinary account — never production credentials.
+
+> **Note:** Do **not** set `CLOUDINARY_URL` or `CLOUDINARY_CONNECTION_STRING` as PHP constants via `.wp-env.override.json` while running this spec. The plugin treats a constant-defined connection string as already-configured and hides the wizard's connection input, which makes the test impossible.
+
+CI will provide `CLOUDINARY_E2E_URL` via a GitHub Actions secret (wired separately under WPP-1195's CI subtask).
+
+### Debugging a failing e2e test
+
+```bash
+npm run test:e2e:debug -- wizard-setup
+```
+
+This opens Playwright's UI runner where you can step through actions, inspect the DOM, and view the network panel.
+
 ## License
 
 Released under the GPL license.

css/cloudinary.css

@@ -38,7 +38,9 @@
     "release": "release-it --no-increment",
     "release:ci": "release-it --ci",
     "release:dry": "release-it --dry-run",
-    "prepare": "husky"
+    "prepare": "husky",
+    "test:e2e": "playwright test --config tests/e2e/playwright.config.js",
+    "test:e2e:debug": "playwright test --config tests/e2e/playwright.config.js --ui"
   },
   "lint-staged": {
     "*.php": [
@@ -67,6 +69,7 @@
     "tippy.js": "^6.3.1"
   },
   "devDependencies": {
+    "@playwright/test": "^1.59.1",
     "@release-it/bumper": "^7.0.5",
     "@typescript-eslint/eslint-plugin": "^8.46.3",
     "@wordpress/api-fetch": "^7.34.0",
@@ -75,6 +78,7 @@
     "@wordpress/browserslist-config": "^6.34.0",
     "@wordpress/components": "^30.7.0",
     "@wordpress/data": "^10.34.0",
+    "@wordpress/e2e-test-utils-playwright": "^1.44.0",
     "@wordpress/element": "^6.34.0",
     "@wordpress/env": "^10.12.0",
     "@wordpress/eslint-plugin": "^22.20.0",
@@ -85,6 +89,7 @@
     "css-minimizer-webpack-plugin": "^7.0.2",
     "css-unicode-loader": "^1.0.3",
     "cssnano": "^7.1.2",
+    "dotenv": "^17.3.1",
     "eslint": "^8.57.1",
     "eslint-plugin-jest": "^29.0.1",
     "eslint-plugin-react-hooks": "^7.0.1",

js/cloudinary.js

@@ -447,7 +447,13 @@ function ( $a ) {
 	public function history( $days = 1 ) {
 		$return  = array();
 		$history = get_option( self::META_KEYS['history'], array() );
-		$plan    = ! empty( $this->usage['plan'] ) ? $this->usage['plan'] : $this->credentials['cloud_name'];
+		// Stored option can be a non-array if it was corrupted by a previous
+		// failed write. Reset to empty array to avoid string-offset fatals.
+		if ( ! is_array( $history ) ) {
+			$history = array();
+		}
+		$plan_source = is_array( $this->usage ) && ! empty( $this->usage['plan'] ) ? $this->usage['plan'] : '';
+		$plan        = '' !== $plan_source ? $plan_source : ( isset( $this->credentials['cloud_name'] ) ? $this->credentials['cloud_name'] : '' );
 		for ( $i = 1; $i <= $days; $i++ ) {
 			$date = date_i18n( 'd-m-Y', strtotime( '- ' . $i . ' days' ) );
 			if ( ! isset( $history[ $plan ][ $date ] ) || is_wp_error( $history[ $plan ][ $date ] ) ) {
@@ -720,9 +726,14 @@ public function usage_stats( $refresh = false ) {
 			$last_usage = $this->settings->get_setting( 'last_usage' );
 			// Get users plan.
 			$stats = $this->api->usage();
-			if ( ! is_wp_error( $stats ) && ! empty( $stats['media_limits'] ) ) {
-				$stats['max_image_size'] = $stats['media_limits']['image_max_size_bytes'];
-				$stats['max_video_size'] = $stats['media_limits']['video_max_size_bytes'];
+			if (
+				! is_wp_error( $stats )
+				&& is_array( $stats )
+				&& isset( $stats['media_limits'] )
+				&& is_array( $stats['media_limits'] )
+			) {
+				$stats['max_image_size'] = isset( $stats['media_limits']['image_max_size_bytes'] ) ? $stats['media_limits']['image_max_size_bytes'] : 0;
+				$stats['max_video_size'] = isset( $stats['media_limits']['video_max_size_bytes'] ) ? $stats['media_limits']['video_max_size_bytes'] : 0;
 				$last_usage->save_value( $stats );// Save the last successful call to prevgent crashing.
 			} else {
 				// Handle error by logging and fetching the last success.

package-lock.json

@@ -203,8 +203,15 @@ public function rest_endpoints( $endpoints ) {
 	 */
 	protected function load_schedule() {
 		$this->schedule = get_option( self::CRON_META_KEY, array() );
+		// Guard against a corrupted option (e.g. a string was previously
+		// stored) so the foreach below cannot fatal on PHP 8.x.
+		if ( ! is_array( $this->schedule ) ) {
+			$this->schedule = array();
+		}
 		foreach ( $this->schedule as &$item ) {
-			$item['active'] = false;
+			if ( is_array( $item ) ) {
+				$item['active'] = false;
+			}
 		}
 	}